tplus-components-touch 3.33.13 → 3.33.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/components/settlement/index.js +9 -0
  2. package/dist/components/settlement/index.js.map +1 -1
  3. package/dist/components/settlement/settlement.js +1 -9
  4. package/dist/components/settlement/settlement.js.map +1 -1
  5. package/dist/components/settlement/settlementStore.js +16 -20
  6. package/dist/components/settlement/settlementStore.js.map +1 -1
  7. package/package.json +1 -1
package/dist/components/settlement/settlementStore.js CHANGED
@@ -1079,13 +1079,6 @@ var SettlementStore = (_class = function () {
1079
1079
  var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1080
1080
  PayStyle = _enumController$getEn12.PayStyle;
1081
1081
 
1082
- var hasThirdPay = this.paymode.thePaymodes.filter(function (v) {
1083
- return !!v.thridPayment && v.value > 0;
1084
- }) || [];
1085
- if (hasThirdPay && hasThirdPay.length > 0) {
1086
- _message2.default.warn('二开支付目前仅支持单一结算。');
1087
- return;
1088
- }
1089
1082
  var pos = this.paymode.thePaymodes.length;
1090
1083
  if (type == PayStyle.hyczk) {
1091
1084
  var index = (0, _findLastIndex3.default)(this.paymode.thePaymodes, function (m) {
@@ -1174,7 +1167,7 @@ var SettlementStore = (_class = function () {
1174
1167
  status = this.type;
1175
1168
  _context4.prev = 4;
1176
1169
  paylist = this.paymode.thePaymodes.filter(function (v) {
1177
- return !!v.thridPayment && v.value > 0;
1170
+ return !!v.thridPayment && Math.abs(v.value) > 0;
1178
1171
  }) || [];
1179
1172
 
1180
1173
  if (!(paylist && paylist.length > 1)) {
@@ -1646,7 +1639,7 @@ var SettlementStore = (_class = function () {
1646
1639
  return _context7.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
1647
1640
 
1648
1641
  case 14:
1649
- if (!(status == '00')) {
1642
+ if (!(trade == '00')) {
1650
1643
  _context7.next = 20;
1651
1644
  break;
1652
1645
  }
@@ -1655,13 +1648,13 @@ var SettlementStore = (_class = function () {
1655
1648
 
1656
1649
  if (vType == 1) {
1657
1650
  dto.RetailPaymentDetails.forEach(function (v) {
1658
- if (v.ThirdPaymentInfo != null) {
1651
+ if (v.ThirdPaymentInfo != null && Math.abs(v.Amount) > 0) {
1659
1652
  v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
1660
1653
  }
1661
1654
  });
1662
1655
  } else if (vType == 2) {
1663
1656
  dto.StorageMutiSettleDetails.forEach(function (v) {
1664
- if (v.ThirdPaymentInfo != null) {
1657
+ if (v.ThirdPaymentInfo != null && Math.abs(v.StorageAmount) > 0) {
1665
1658
  v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
1666
1659
  }
1667
1660
  });
@@ -1669,7 +1662,7 @@ var SettlementStore = (_class = function () {
1669
1662
  return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
1670
1663
 
1671
1664
  case 20:
1672
- if (!(status == '02')) {
1665
+ if (!(trade == '02')) {
1673
1666
  _context7.next = 22;
1674
1667
  break;
1675
1668
  }
@@ -1683,7 +1676,7 @@ var SettlementStore = (_class = function () {
1683
1676
  case 24:
1684
1677
  _context7.prev = 24;
1685
1678
  _context7.t0 = _context7['catch'](0);
1686
- return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0 });
1679
+ return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0, code: '9999' });
1687
1680
 
1688
1681
  case 27:
1689
1682
  case 'end':
@@ -2486,29 +2479,32 @@ var PayMode = exports.PayMode = (_class3 = function () {
2486
2479
  var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
2487
2480
  var _this19 = this;
2488
2481
 
2489
- var _ref32, isHorizontalPad, isHorizontalSunMi, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2482
+ var _ref32, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2490
2483
 
2491
2484
  return _regenerator2.default.wrap(function _callee15$(_context15) {
2492
2485
  while (1) {
2493
2486
  switch (_context15.prev = _context15.next) {
2494
2487
  case 0:
2488
+ // 是否移动端判断
2495
2489
  _ref32 = _mutantsUtil.platform || {}, isHorizontalPad = _ref32.isHorizontalPad, isHorizontalSunMi = _ref32.isHorizontalSunMi;
2490
+ isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
2496
2491
  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
2497
2492
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
2498
2493
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
2499
- _context15.next = 6;
2494
+ _context15.next = 7;
2500
2495
  return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
2501
2496
 
2502
- case 6:
2497
+ case 7:
2503
2498
  modes = _context15.sent;
2504
2499
 
2505
- modes = !(!!isHorizontalPad || !!isHorizontalSunMi) ? modes : modes.filter(function (v) {
2506
- return !!v.ThirdPaymentInfo;
2507
- });
2508
2500
  if (modes) {
2509
2501
  (0, _mobx.runInAction)(function () {
2510
2502
  var paymodes = [];
2511
- (0, _each3.default)(modes.SettleStyles, function (mode, index) {
2503
+ var settleLists = modes.SettleStyles;
2504
+ settleLists = isMobileEnvironment ? settleLists.filter(function (v) {
2505
+ return !v.ThirdPaymentInfo;
2506
+ }) : settleLists;
2507
+ (0, _each3.default)(settleLists, function (mode, index) {
2512
2508
  //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡" tuzha by 2020-07-08
2513
2509
  if (mode.Code == PayStyle.hyczk) {
2514
2510
  mode.Name = '储值卡';