tplus-components-touch 3.27.34 → 3.27.38

package/dist/components/settlement/settlementStore.js

@@ -917,10 +917,20 @@ var SettlementStore = (_class = function () {
                     }
                 }
 
+                //积分抵现不包含运费
+                var BuyerPayFreight = this.dto.BuyerPayFreight;
+                var DistributionMode = this.dto.DistributionMode;
+                var value = 0;
+                if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0) {
+                    value = (0, _utils.getFixedNumber)(Math.Minus(this.paymode.amount, BuyerPayFreight));
+                } else {
+                    value = this.paymode.amount;
+                }
+
                 (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
                         Idmember: this.paymode.currentMode.memberId,
-                        TotalTaxAmount: this.paymode.amount,
-                        BalanceTaxAmount: this.paymode.amount
+                        TotalTaxAmount: value,
+                        BalanceTaxAmount: value
                     } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
                     _this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
                     _this8.updateEvent();
@@ -1013,7 +1023,7 @@ var SettlementStore = (_class = function () {
                     var BuyerPayFreight = _this9.dto.BuyerPayFreight;
                     var DistributionMode = _this9.dto.DistributionMode;
                     var value = 0;
-                    if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0) {
+                    if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 && type != PayStyle.jfdx) {
                         value = (0, _utils.getFixedNumber)(parseFloat(_this9.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
                     } else {
                         value = _this9.context.viewModel.getViewItem('Voucher').availableAmount;
@@ -1369,7 +1379,7 @@ var SettlementStore = (_class = function () {
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
                                 if (!isNewRetailBCPos) {
-                                    _context4.next = 24;
+                                    _context4.next = 23;
                                     break;
                                 }
 
@@ -1392,40 +1402,32 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.PrepaidAmount = prepaidAmount;
                                     });
                                 }
-                                this.dto.RetailDetails.forEach(function (o) {
-                                    if (o.BaseQuantity != o.Quantity && !o.Idunit2) {
-                                        (0, _mobx.runInAction)(function () {
-                                            o.BaseQuantity = o.Quantity;
-                                        });
-                                        _tplusComponentsTouch.ModalWraper.confirm({ content: '请回想该订单下单时的操作步骤，复现退货时提示"退货数量大于可退数量的问题"，联系赵录方' });
-                                    }
-                                });
                                 _context4.t1 = this.dto.IdbusiType == 37;
 
                                 if (!_context4.t1) {
-                                    _context4.next = 17;
+                                    _context4.next = 16;
                                     break;
                                 }
 
-                                _context4.next = 16;
+                                _context4.next = 15;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 16:
+                            case 15:
                                 _context4.t1 = _context4.sent;
 
-                            case 17:
+                            case 16:
                                 _context4.t0 = _context4.t1;
 
                                 if (_context4.t0) {
-                                    _context4.next = 20;
+                                    _context4.next = 19;
                                     break;
                                 }
 
                                 _context4.t0 = this.dto.IdbusiType != 37;
 
-                            case 20:
+                            case 19:
                                 if (!_context4.t0) {
-                                    _context4.next = 22;
+                                    _context4.next = 21;
                                     break;
                                 }
 
@@ -1435,17 +1437,17 @@ var SettlementStore = (_class = function () {
                                     _this11.billID = resp.ID;
                                 }));
 
-                            case 22:
-                                _context4.next = 25;
+                            case 21:
+                                _context4.next = 24;
                                 break;
 
-                            case 24:
+                            case 23:
                                 return _context4.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
                                     _this11.setDtoID(resp.ID);
                                     _this11.billID = resp.ID;
                                 }));
 
-                            case 25:
+                            case 24:
                             case 'end':
                                 return _context4.stop();
                         }