tplus-components-touch 3.27.32 → 3.27.36

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;
@@ -1384,9 +1394,9 @@ var SettlementStore = (_class = function () {
                                 _ref15 = this.dto || {}, IdbusiType = _ref15.IdbusiType, DistributionMode = _ref15.DistributionMode;
 
                                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-                                    prepaidAmount = this.dto.RetailPaymentDetails.reduce(function (c, item) {
+                                    prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
                                         return c + (item.Amount || 0);
-                                    }, 0);
+                                    }, 0));
 
                                     (0, _mobx.runInAction)(function () {
                                         _this11.dto.PrepaidAmount = prepaidAmount;