tplus-components-touch 3.39.2 → 3.40.1

package/dist/components/settlement/settlementStore.js

@@ -161,7 +161,7 @@ function _initializerWarningHelper(descriptor, context) {
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
 var SettlementStore = (_class = function () {
-    // 预售都是全款；预订是否全款，在点击确认支付时计算订金和商品金额计算得出
+    //type==2
     function SettlementStore() {
         var _this2 = this;
 
@@ -176,8 +176,6 @@ var SettlementStore = (_class = function () {
 
         _initDefineProp(this, 'newStyle', _descriptor, this);
 
-        this.isFull = true;
-
         _initDefineProp(this, 'setNewStyle', _descriptor2, this);
 
         _initDefineProp(this, 'queryPwd', _descriptor3, this);
@@ -278,7 +276,7 @@ var SettlementStore = (_class = function () {
                     }
                     detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
                     detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
-                    //}
+                    //} 
                     detailDTO.taxRate = item.TaxRate;
                     detailDTO.quantity = item.Quantity;
 
@@ -347,10 +345,6 @@ var SettlementStore = (_class = function () {
             return (0, _tplusApi.ccApi)({}, '/marketingtool/paygift/executeRightsForPos/' + _this2.billID, false, false, { method: 'get', timeout_skip: true });
         };
 
-        this.getRefWareHouseList = function () {
-            return (0, _tplusApi.ccApi)({}, '/retail/RetailPos/getRefWareHouseList', false, false);
-        };
-
         this.checkCoupon = function () {
             var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
                 var _ref3, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
@@ -504,8 +498,7 @@ var SettlementStore = (_class = function () {
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
         this.setNewStyle();
-    } //type==2
-
+    }
 
     (0, _createClass3.default)(SettlementStore, [{
         key: 'initPaymodes',
@@ -545,45 +538,7 @@ var SettlementStore = (_class = function () {
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
                 this.member = this.dto.Member; //stores.selectMemberStore.selectMemberInfo;
-
-                this.paymode.isNotFullBook = false;
-                this.paymode.isNotFullOnlyBook = false;
-                //预订按比例收取订金处理
-                var value = this.dto.TotalTaxAmount;
-
-                var _getLoginInfo = this.getLoginInfo(),
-                    PreSellOrBook = _getLoginInfo.PreSellOrBook,
-                    PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
-
-                var _ref5 = this.dto || {},
-                    IdbusiType = _ref5.IdbusiType,
-                    DistributionMode = _ref5.DistributionMode;
-
-                if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-                    this.paymode.bookMaxValue = value;
-                    this.paymode.isNotFullBook = true;
-                    this.paymode.isNotFullOnlyBook = true;
-                    value = value * PercentageWhenBook / 100;
-                }
-                if (IdbusiType == 38 && PreSellOrBook == 'BOOK') {
-                    (0, _mobx.runInAction)(function () {
-                        _this3.dto.PrepaidAmount = value;
-                    });
-                }
-                //预订计算快递或同城配送运费
-                if (IdbusiType == 38 && PreSellOrBook != 'DISABLED' && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                    value += this.dto.BuyerPayFreight || 0;
-                }
-                //预订取货应补款金额
-                if (IdbusiType == 39) {
-                    value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
-                    if (_mutantsMicrofx.stores.drawerStore.totalWaitPaidAmount > 0) {
-                        this.paymode.isNotFullBook = true;
-                        this.paymode.bookMaxValue = _mutantsMicrofx.stores.drawerStore.totalWaitPaidAmount;
-                    }
-                }
-
-                this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
+                this.brefund = this.paymode.setAmount(this.dto.TotalTaxAmount, this.dto.OnlinePaymentAmount);
             } else {
                 this.brefund = this.paymode.setAmount(amount, 0);
                 this.dto = data;
@@ -631,8 +586,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn5.PayStyle;
 
-            var _ref6 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref6.isNewRetailBCPos;
+            var _ref5 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
@@ -658,14 +613,14 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                var _ref7 = djq || {},
-                                    displayText = _ref7.displayText,
-                                    promoRuleId = _ref7.promoRuleId,
-                                    dateMount = _ref7.dateMount,
-                                    promoMethodEnum = _ref7.promoMethodEnum,
-                                    discountPct = _ref7.discountPct,
-                                    promoId = _ref7.promoId,
-                                    id = _ref7.id;
+                                var _ref6 = djq || {},
+                                    displayText = _ref6.displayText,
+                                    promoRuleId = _ref6.promoRuleId,
+                                    dateMount = _ref6.dateMount,
+                                    promoMethodEnum = _ref6.promoMethodEnum,
+                                    discountPct = _ref6.discountPct,
+                                    promoId = _ref6.promoId,
+                                    id = _ref6.id;
 
                                 _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
@@ -708,7 +663,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'quickSettle',
         value: function quickSettle(key) {
-            this.addPay(key, null, true);
+            this.addPay(key, true);
         }
 
         //outer call
@@ -716,7 +671,7 @@ var SettlementStore = (_class = function () {
 
     }, {
         key: 'changeFocusAndAddPay',
-        value: function changeFocusAndAddPay(type, bookType) {
+        value: function changeFocusAndAddPay(type) {
             var _this6 = this;
 
             var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
@@ -748,7 +703,7 @@ var SettlementStore = (_class = function () {
                     this.addPayDirectly(this.paymode.currentMode);
                 }
             } else {
-                this.addPay(type, bookType);
+                this.addPay(type);
             }
         }
 
@@ -773,15 +728,15 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref7 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
                 address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
-                    var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
+                    var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
                         var data, m;
                         return _regenerator2.default.wrap(function _callee3$(_context3) {
                             while (1) {
@@ -856,7 +811,7 @@ var SettlementStore = (_class = function () {
                     }));
 
                     return function (_x2) {
-                        return _ref9.apply(this, arguments);
+                        return _ref8.apply(this, arguments);
                     };
                 }()
                 // result.data.forEach((m) => {
@@ -966,29 +921,10 @@ var SettlementStore = (_class = function () {
                     }
                 }
 
-                //积分抵现不包含运费
-                var BuyerPayFreight = this.dto.BuyerPayFreight;
-                var DistributionMode = this.dto.DistributionMode;
-                var IdbusiType = this.dto.IdbusiType;
-
-                var _getLoginInfo2 = this.getLoginInfo(),
-                    PreSellOrBook = _getLoginInfo2.PreSellOrBook,
-                    PercentageWhenBook = _getLoginInfo2.PercentageWhenBook;
-
-                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 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-                    //预订场景下：现场提货，且订金比例非100%时，积分抵现按全款计算（因为只有全款才能使用积分抵现）
-                    value = this.paymode.bookMaxValue;
-                } else {
-                    value = this.paymode.amount;
-                }
-
                 (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
                         Idmember: this.paymode.currentMode.memberId,
-                        TotalTaxAmount: value,
-                        BalanceTaxAmount: value
+                        TotalTaxAmount: this.paymode.amount,
+                        BalanceTaxAmount: this.paymode.amount
                     } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
                     _this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
                     _this8.updateEvent();
@@ -1032,8 +968,7 @@ var SettlementStore = (_class = function () {
                 authCode: '',
                 steadCashIntegral: null,
                 errinfo: '',
-                maxamount: this.paymode.amount,
-                virtualPay: themode.virtualPay
+                maxamount: this.paymode.amount
             });
             if (type == PayStyle.hyczk) {
                 if (!mode.storageCardNo) {
@@ -1077,17 +1012,7 @@ var SettlementStore = (_class = function () {
 
             this.amountHandler && this.amountHandler(type).then(function () {
                 (0, _mobx.runInAction)(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 && type == PayStyle.hyczk) {
-                        value = (0, _utils.getFixedNumber)(parseFloat(_this9.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
-                    } else {
-                        value = _this9.context.viewModel.getViewItem('Voucher').availableAmount;
-                    }
-                    mode.maxamount = (0, _utils.getFixedNumber)(Math.Minus(value, sum));
+                    mode.maxamount = (0, _utils.getFixedNumber)(Math.Minus(_this9.context.viewModel.getViewItem('Voucher').availableAmount, sum));
                     _this9.updateEvent();
                 });
             });
@@ -1108,12 +1033,12 @@ var SettlementStore = (_class = function () {
                 mode.value = shouldSetValue;
                 mode.value2 = (0, _utils.getFixedNumber)(mode.calDirection == "88" ? shouldSetValue / mode.exchangeRate : shouldSetValue * mode.exchangeRate);
                 mode.value3 = shouldSetValue;
-                this.paymode.calcReserved('bookPay'); //参数multiPay代表复合结算
+                this.paymode.calcReserved();
             }
         }
     }, {
         key: 'changeValue',
-        value: function changeValue(index, value, blur, type) {
+        value: function changeValue(index, value, blur) {
             var mode = (0, _find3.default)(this.paymode.thePaymodes, { 'paymethodId': index });
             var v = blur ? (0, _utils.getFixedNumber)(value) : isNaN(value) && value != '-' ? 0.00 : value;
             if (mode) {
@@ -1129,7 +1054,7 @@ var SettlementStore = (_class = function () {
                     mode.value2 = v;
                 }
 
-                this.paymode.calcReserved(type);
+                this.paymode.calcReserved();
             }
         }
     }, {
@@ -1153,7 +1078,7 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addPay',
-        value: function addPay(type, bookType, isQuick) {
+        value: function addPay(type, isQuick) {
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
 
@@ -1165,11 +1090,11 @@ var SettlementStore = (_class = function () {
                 pos = index == -1 ? pos : index + 1;
             }
             this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
-            this.paymode.calcReserved(bookType);
+            this.paymode.calcReserved();
         }
     }, {
         key: 'delPay',
-        value: function delPay(index, bookType) {
+        value: function delPay(index) {
             var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn13.PayStyle;
 
@@ -1177,7 +1102,7 @@ var SettlementStore = (_class = function () {
                 return mode.paymethodId === index;
             });
             this.paymode.currentFocus = -1;
-            this.paymode.calcReserved(bookType);
+            this.paymode.calcReserved();
         }
 
         // 获取储值是否重复, 在commit方法中使用
@@ -1225,8 +1150,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
-                var status, paylist, ret, _ref11, _ref11$data, code, returnMsg, state, ret1, ret2;
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
+                var status, paylist, ret, _ref10, _ref10$data, code, returnMsg, state, ret1, ret2;
 
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
@@ -1267,9 +1192,9 @@ var SettlementStore = (_class = function () {
 
                             case 12:
                                 ret = _context4.sent;
-                                _ref11 = ret || {}, _ref11$data = _ref11.data;
-                                _ref11$data = _ref11$data === undefined ? {} : _ref11$data;
-                                code = _ref11$data.code, returnMsg = _ref11$data.returnMsg;
+                                _ref10 = ret || {}, _ref10$data = _ref10.data;
+                                _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
+                                code = _ref10$data.code, returnMsg = _ref10$data.returnMsg;
 
                                 if (!(code && code == 10001)) {
                                     _context4.next = 24;
@@ -1351,7 +1276,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x3) {
-                return _ref10.apply(this, arguments);
+                return _ref9.apply(this, arguments);
             }
 
             return commit;
@@ -1365,10 +1290,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'saveMember',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                 var _this11 = this;
 
-                var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref13, type, data, msg, code;
+                var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
@@ -1430,7 +1355,7 @@ var SettlementStore = (_class = function () {
 
                             case 11:
                                 ret = _context5.sent;
-                                _ref13 = ret || {}, type = _ref13.type, data = _ref13.data, msg = _ref13.msg, code = _ref13.code;
+                                _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
 
                                 if (!(type === true)) {
                                     _context5.next = 17;
@@ -1461,7 +1386,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function saveMember() {
-                return _ref12.apply(this, arguments);
+                return _ref11.apply(this, arguments);
             }
 
             return saveMember;
@@ -1469,10 +1394,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                 var _this12 = this;
 
-                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref15, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref16, type, data, msg, code;
+                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, payment, tradeType, ret, _ref14, type, data, msg, code;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
@@ -1571,48 +1496,32 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
-                                _ref15 = this.dto || {}, IdbusiType = _ref15.IdbusiType, DistributionMode = _ref15.DistributionMode;
-
-                                if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-                                    prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
-                                        return c + (item.Amount || 0);
-                                    }, 0));
-                                    fullPayment = (0, _utils.getFixedNumber)(this.dto.RetailDetails.reduce(function (c, item) {
-                                        return c + (item.TaxAmount || 0);
-                                    }, 0));
-
-                                    this.isFull = fullPayment == prepaidAmount; // 是否全款
-                                    (0, _mobx.runInAction)(function () {
-                                        _this12.dto.PrepaidAmount = prepaidAmount;
-                                    });
-                                }
                                 _context6.t1 = this.dto.IdbusiType == 37;
 
                                 if (!_context6.t1) {
-                                    _context6.next = 14;
+                                    _context6.next = 11;
                                     break;
                                 }
 
-                                _context6.next = 13;
+                                _context6.next = 10;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 13:
+                            case 10:
                                 _context6.t1 = _context6.sent;
 
-                            case 14:
+                            case 11:
                                 _context6.t0 = _context6.t1;
 
                                 if (_context6.t0) {
-                                    _context6.next = 17;
+                                    _context6.next = 14;
                                     break;
                                 }
 
                                 _context6.t0 = this.dto.IdbusiType != 37;
 
-                            case 17:
+                            case 14:
                                 if (!_context6.t0) {
-                                    _context6.next = 36;
+                                    _context6.next = 33;
                                     break;
                                 }
 
@@ -1624,45 +1533,45 @@ var SettlementStore = (_class = function () {
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context6.next = 33;
+                                    _context6.next = 30;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context6.next = 25;
+                                _context6.next = 22;
                                 return this.thirdPay(1, payment, tradeType, dtoParams);
 
-                            case 25:
+                            case 22:
                                 ret = _context6.sent;
-                                _ref16 = ret || {}, type = _ref16.type, data = _ref16.data, msg = _ref16.msg, code = _ref16.code;
+                                _ref14 = ret || {}, type = _ref14.type, data = _ref14.data, msg = _ref14.msg, code = _ref14.code;
 
                                 if (!(type === true)) {
-                                    _context6.next = 31;
+                                    _context6.next = 28;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context6.next = 33;
+                                _context6.next = 30;
                                 break;
 
-                            case 31:
+                            case 28:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
                                 return _context6.abrupt('return', false);
 
-                            case 33:
+                            case 30:
                                 this.dtoParams = dtoParams;
                                 console.log('结算信息:', dtoParams);
                                 return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    var _ref17 = resp || {},
-                                        ID = _ref17.ID;
+                                    var _ref15 = resp || {},
+                                        ID = _ref15.ID;
 
                                     _this12.setDtoID(ID);
                                     _this12.billID = ID;
                                     _this12.paymode.checkList = [];
                                 }));
 
-                            case 36:
+                            case 33:
                             case 'end':
                                 return _context6.stop();
                         }
@@ -1671,7 +1580,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref14.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1688,7 +1597,7 @@ var SettlementStore = (_class = function () {
             return data;
         }
 
-        /**
+        /** 
          * 二开支付
          * vType：1零售单、2储值单
          * payment：结算方式
@@ -1699,8 +1608,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'thirdPay',
         value: function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
-                var cto, params, ret, _ref19, Code, _Message, Result, _ref20, ThirdPaymentReturnInfo;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
+                var cto, params, ret, _ref17, Code, _Message, Result, _ref18, ThirdPaymentReturnInfo;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
@@ -1723,7 +1632,7 @@ var SettlementStore = (_class = function () {
 
                                 console.log('刷卡返回信息:', ret);
                                 ret = JSON.parse(ret);
-                                _ref19 = ret || {}, Code = _ref19.Code, _Message = _ref19.Message, Result = _ref19.Result;
+                                _ref17 = ret || {}, Code = _ref17.Code, _Message = _ref17.Message, Result = _ref17.Result;
 
                                 if (!(Code > 0)) {
                                     _context7.next = 14;
@@ -1738,7 +1647,7 @@ var SettlementStore = (_class = function () {
                                     break;
                                 }
 
-                                _ref20 = Result || {}, ThirdPaymentReturnInfo = _ref20.ThirdPaymentReturnInfo;
+                                _ref18 = Result || {}, ThirdPaymentReturnInfo = _ref18.ThirdPaymentReturnInfo;
 
                                 if (vType == 1) {
                                     dto.RetailPaymentDetails.forEach(function (v) {
@@ -1781,7 +1690,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function thirdPay(_x4, _x5, _x6, _x7) {
-                return _ref18.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return thirdPay;
@@ -1792,7 +1701,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'thirdPayRefund',
         value: function () {
-            var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
                 var _this13 = this;
 
                 var dto, pay, payment, _enumController$getEn17, TradeType;
@@ -1814,7 +1723,7 @@ var SettlementStore = (_class = function () {
                                     _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
 
                                     setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-                                        var ret, _ref23, msg;
+                                        var ret, _ref21, msg;
 
                                         return _regenerator2.default.wrap(function _callee8$(_context8) {
                                             while (1) {
@@ -1825,7 +1734,7 @@ var SettlementStore = (_class = function () {
 
                                                     case 2:
                                                         ret = _context8.sent;
-                                                        _ref23 = ret || {}, msg = _ref23.msg;
+                                                        _ref21 = ret || {}, msg = _ref21.msg;
 
                                                         console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
 
@@ -1847,7 +1756,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function thirdPayRefund(_x8) {
-                return _ref21.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             }
 
             return thirdPayRefund;
@@ -1860,7 +1769,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
                 return _regenerator2.default.wrap(function _callee10$(_context10) {
                     while (1) {
                         switch (_context10.prev = _context10.next) {
@@ -1888,7 +1797,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref24.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1914,14 +1823,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
-                var _ref26, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
+                var _ref24, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee11$(_context11) {
                     while (1) {
                         switch (_context11.prev = _context11.next) {
                             case 0:
-                                _ref26 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref26.isNewRetailBCPos;
+                                _ref24 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref24.isNewRetailBCPos;
                                 _context11.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -2038,7 +1947,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x9) {
-                return _ref25.apply(this, arguments);
+                return _ref23.apply(this, arguments);
             }
 
             return validePwd;
@@ -2091,14 +2000,14 @@ var SettlementStore = (_class = function () {
         var _this16 = this;
 
         return function () {
-            var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
-                var _getLoginInfo4, IdStore, StoreCode, resp;
+            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
+                var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
                         switch (_context12.prev = _context12.next) {
                             case 0:
-                                _getLoginInfo4 = _this16.getLoginInfo(), IdStore = _getLoginInfo4.IdStore, StoreCode = _getLoginInfo4.StoreCode;
+                                _getLoginInfo = _this16.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
                                 _context12.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this16.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
@@ -2118,7 +2027,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x10) {
-                return _ref27.apply(this, arguments);
+                return _ref25.apply(this, arguments);
             };
         }();
     }
@@ -2128,7 +2037,7 @@ var SettlementStore = (_class = function () {
         var _this17 = this;
 
         return function () {
-            var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
+            var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
                 var result;
                 return _regenerator2.default.wrap(function _callee13$(_context13) {
                     while (1) {
@@ -2183,7 +2092,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x11) {
-                return _ref28.apply(this, arguments);
+                return _ref26.apply(this, arguments);
             };
         }();
     }
@@ -2218,7 +2127,7 @@ var SettlementStore = (_class = function () {
 }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
 exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
-    //预订场景下，现场提货，且选项设置订金比例非100% or 取货最大补款数大于0时 为 true
+    //应收
     function PayMode() {
         // this.amount=getFixedNumber(amount);
         // this.calcReserved();
@@ -2239,10 +2148,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
 
         _initDefineProp(this, 'thePaymodes', _descriptor11, this);
 
-        this.bookMaxValue = 0;
-        this.isNotFullBook = false;
-        this.isNotFullOnlyBook = false;
-
         _initDefineProp(this, 'storageCardNo', _descriptor12, this);
 
         _initDefineProp(this, 'balance', _descriptor13, this);
@@ -2261,8 +2166,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
         _initDefineProp(this, 'addDjqs', _descriptor16, this);
     }
     // @observable store = null;
-    //只是预订场景下，现场提货，且选项设置订金比例非100%时 为 true
-    //应收
 
 
     (0, _createClass3.default)(PayMode, [{
@@ -2288,25 +2191,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }, {
         key: 'calcReserved',
-        value: function calcReserved(type) {
+        value: function calcReserved() {
             var sum = 0;
             (0, _each3.default)(this.thePaymodes, function (mode) {
                 sum = Math.Add(sum, mode.value == "" ? 0 : mode.value);
             });
             this.received = (0, _utils.getFixedNumber)(sum);
-            if (type === 'bookPay' && this.isNotFullBook) {
-                if (this.amount <= sum && sum <= this.bookMaxValue) {
-                    this.receivable = (0, _utils.getFixedNumber)(0);
-                }
-                if (sum < this.amount) {
-                    this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
-                }
-                if (sum > this.bookMaxValue) {
-                    this.receivable = (0, _utils.getFixedNumber)(this.bookMaxValue - sum);
-                }
-            } else {
-                this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
-            }
+            this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
     }, {
         key: 'updateMemberStorageCardNo',
@@ -2345,9 +2236,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref30 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref30.isNewRetailBCPos;
-
             var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn18.PayStyle,
                 Differentiate = _enumController$getEn18.Differentiate;
@@ -2420,13 +2308,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 // }
                 // else
                 // {
-
                 var bookingQuantity = 0;
                 if (item.BookingQuantity) {
                     bookingQuantity = item.BookingQuantity;
                 }
                 detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
                 detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                //} 
                 detailDTO.taxRate = item.TaxRate;
                 detailDTO.quantity = item.Quantity;
 
@@ -2456,18 +2344,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        var _ref31 = element || {},
-                            couponCode = _ref31.couponCode,
-                            name = _ref31.name,
-                            tieredAmountResult = _ref31.tieredAmountResult,
-                            fromDate = _ref31.fromDate,
-                            dateMount = _ref31.dateMount,
-                            promoMethodEnum = _ref31.promoMethodEnum,
-                            discountPct = _ref31.discountPct,
-                            nominalAmount = _ref31.nominalAmount,
-                            promoId = _ref31.promoId,
-                            id = _ref31.id,
-                            doorsill = _ref31.doorsill;
+                        var _ref28 = element || {},
+                            couponCode = _ref28.couponCode,
+                            name = _ref28.name,
+                            tieredAmountResult = _ref28.tieredAmountResult,
+                            fromDate = _ref28.fromDate,
+                            dateMount = _ref28.dateMount,
+                            promoMethodEnum = _ref28.promoMethodEnum,
+                            discountPct = _ref28.discountPct,
+                            nominalAmount = _ref28.nominalAmount,
+                            promoId = _ref28.promoId,
+                            id = _ref28.id,
+                            doorsill = _ref28.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -2511,9 +2399,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref32 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref32.isNewRetailBCPos;
-
             var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn19.Differentiate;
 
@@ -2602,17 +2487,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref33 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
+            var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
                 var _this20 = this;
 
-                var _ref34, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _ref30, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee15$(_context15) {
                     while (1) {
                         switch (_context15.prev = _context15.next) {
                             case 0:
                                 // 是否移动端判断
-                                _ref34 = _mutantsUtil.platform || {}, isHorizontalPad = _ref34.isHorizontalPad, isHorizontalSunMi = _ref34.isHorizontalSunMi;
+                                _ref30 = _mutantsUtil.platform || {}, isHorizontalPad = _ref30.isHorizontalPad, isHorizontalSunMi = _ref30.isHorizontalSunMi;
                                 isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
                                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
@@ -2647,7 +2532,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
                                                 idCurrency: mode.Currency ? mode.Currency.ID : -1,
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
-                                                virtualPay: mode.VirtualPay,
                                                 thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
@@ -2664,7 +2548,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x12, _x13) {
-                return _ref33.apply(this, arguments);
+                return _ref29.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2796,10 +2680,6 @@ var Member = exports.Member = (_class5 = function () {
             var index = (0, _findIndex3.default)(m.DynamicPropertyKeys, function (key) {
                 return key == 'canusedbalancestorage';
             });
-
-            var _ref35 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref35.isNewRetailBCPos;
-
             (0, _mobx.runInAction)(function () {
                 _this24.cardNo = m.CardCode;
                 if (index >= 0) {