tplus-components-touch 3.27.20 → 3.27.24

package/dist/components/settlement/settlementStore.js

@@ -470,6 +470,8 @@ var SettlementStore = (_class = function () {
                     this.paymode.bookMaxValue = value;
                     this.paymode.isNotFullBook = true;
                     value = value * PercentageWhenBook / 100;
+                }
+                if (IdbusiType == 38 && PreSellOrBook == 'BOOK') {
                     (0, _mobx.runInAction)(function () {
                         _this3.dto.PrepaidAmount = value;
                     });
@@ -605,7 +607,7 @@ var SettlementStore = (_class = function () {
 
     }, {
         key: 'changeFocusAndAddPay',
-        value: function changeFocusAndAddPay(type) {
+        value: function changeFocusAndAddPay(type, bookType) {
             var _this6 = this;
 
             var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
@@ -637,7 +639,7 @@ var SettlementStore = (_class = function () {
                     this.addPayDirectly(this.paymode.currentMode);
                 }
             } else {
-                this.addPay(type);
+                this.addPay(type, bookType);
             }
         }
 
@@ -866,7 +868,8 @@ var SettlementStore = (_class = function () {
                 authCode: '',
                 steadCashIntegral: null,
                 errinfo: '',
-                maxamount: this.paymode.amount
+                maxamount: this.paymode.amount,
+                virtualPay: themode.virtualPay
             });
             if (type == PayStyle.hyczk) {
                 if (!mode.member.id || !mode.member.StorageCardNo) {
@@ -940,12 +943,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();
+                this.paymode.calcReserved('bookPay'); //参数multiPay代表复合结算
             }
         }
     }, {
         key: 'changeValue',
-        value: function changeValue(index, value, blur) {
+        value: function changeValue(index, value, blur, type) {
             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) {
@@ -961,7 +964,7 @@ var SettlementStore = (_class = function () {
                     mode.value2 = v;
                 }
 
-                this.paymode.calcReserved(true);
+                this.paymode.calcReserved(type);
             }
         }
     }, {
@@ -985,7 +988,7 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addPay',
-        value: function addPay(type) {
+        value: function addPay(type, bookType) {
             var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn11.PayStyle;
 
@@ -998,11 +1001,11 @@ var SettlementStore = (_class = function () {
             }
             // this.paymode.thePaymodes.push(this.genNewMode(type) );
             this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
-            this.paymode.calcReserved();
+            this.paymode.calcReserved(bookType);
         }
     }, {
         key: 'delPay',
-        value: function delPay(index) {
+        value: function delPay(index, bookType) {
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
 
@@ -1010,7 +1013,7 @@ var SettlementStore = (_class = function () {
                 return mode.paymethodId === index;
             });
             this.paymode.currentFocus = -1;
-            this.paymode.calcReserved();
+            this.paymode.calcReserved(bookType);
         }
     }, {
         key: 'commit',
@@ -1149,7 +1152,7 @@ var SettlementStore = (_class = function () {
             var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum, _getLoginInfo2, PreSellOrBook, PercentageWhenBook, _ref16, IdbusiType, DistributionMode, prepaidAmount;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1269,7 +1272,7 @@ var SettlementStore = (_class = function () {
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
                                 if (!isNewRetailBCPos) {
-                                    _context3.next = 20;
+                                    _context3.next = 23;
                                     break;
                                 }
 
@@ -1280,32 +1283,44 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
+                                _getLoginInfo2 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo2.PreSellOrBook, PercentageWhenBook = _getLoginInfo2.PercentageWhenBook;
+                                _ref16 = this.dto || {}, IdbusiType = _ref16.IdbusiType, DistributionMode = _ref16.DistributionMode;
+
+                                if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
+                                    prepaidAmount = this.dto.RetailPaymentDetails.reduce(function (c, item) {
+                                        return c + (item.Amount || 0);
+                                    }, 0);
+
+                                    (0, _mobx.runInAction)(function () {
+                                        _this11.dto.PrepaidAmount = prepaidAmount;
+                                    });
+                                }
                                 _context3.t1 = this.dto.IdbusiType == 37;
 
                                 if (!_context3.t1) {
-                                    _context3.next = 13;
+                                    _context3.next = 16;
                                     break;
                                 }
 
-                                _context3.next = 12;
+                                _context3.next = 15;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 12:
+                            case 15:
                                 _context3.t1 = _context3.sent;
 
-                            case 13:
+                            case 16:
                                 _context3.t0 = _context3.t1;
 
                                 if (_context3.t0) {
-                                    _context3.next = 16;
+                                    _context3.next = 19;
                                     break;
                                 }
 
                                 _context3.t0 = this.dto.IdbusiType != 37;
 
-                            case 16:
+                            case 19:
                                 if (!_context3.t0) {
-                                    _context3.next = 18;
+                                    _context3.next = 21;
                                     break;
                                 }
 
@@ -1315,17 +1330,17 @@ var SettlementStore = (_class = function () {
                                     _this11.billID = resp.ID;
                                 }));
 
-                            case 18:
-                                _context3.next = 21;
+                            case 21:
+                                _context3.next = 24;
                                 break;
 
-                            case 20:
+                            case 23:
                                 return _context3.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 21:
+                            case 24:
                             case 'end':
                                 return _context3.stop();
                         }
@@ -1347,7 +1362,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1375,7 +1390,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1401,14 +1416,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref19, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1493,7 +1508,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref18.apply(this, arguments);
             }
 
             return validePwd;
@@ -1532,14 +1547,14 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
-                var _getLoginInfo2, IdStore, StoreCode, resp;
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+                var _getLoginInfo3, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
                         switch (_context6.prev = _context6.next) {
                             case 0:
-                                _getLoginInfo2 = _this13.getLoginInfo(), IdStore = _getLoginInfo2.IdStore, StoreCode = _getLoginInfo2.StoreCode;
+                                _getLoginInfo3 = _this13.getLoginInfo(), IdStore = _getLoginInfo3.IdStore, StoreCode = _getLoginInfo3.StoreCode;
                                 _context6.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
@@ -1559,7 +1574,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref20.apply(this, arguments);
             };
         }();
     }
@@ -1628,14 +1643,22 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }, {
         key: 'calcReserved',
-        value: function calcReserved(blur) {
+        value: function calcReserved(type) {
             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 (blur && this.isNotFullBook) {
-                this.receivable = (0, _utils.getFixedNumber)(this.bookMaxValue - 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);
             }
@@ -1657,8 +1680,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            var _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.isNewRetailBCPos;
 
             var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn15.PayStyle,
@@ -1768,18 +1791,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        var _ref21 = element || {},
-                            couponCode = _ref21.couponCode,
-                            name = _ref21.name,
-                            tieredAmountResult = _ref21.tieredAmountResult,
-                            fromDate = _ref21.fromDate,
-                            dateMount = _ref21.dateMount,
-                            promoMethodEnum = _ref21.promoMethodEnum,
-                            discountPct = _ref21.discountPct,
-                            nominalAmount = _ref21.nominalAmount,
-                            promoId = _ref21.promoId,
-                            id = _ref21.id,
-                            doorsill = _ref21.doorsill;
+                        var _ref22 = element || {},
+                            couponCode = _ref22.couponCode,
+                            name = _ref22.name,
+                            tieredAmountResult = _ref22.tieredAmountResult,
+                            fromDate = _ref22.fromDate,
+                            dateMount = _ref22.dateMount,
+                            promoMethodEnum = _ref22.promoMethodEnum,
+                            discountPct = _ref22.discountPct,
+                            nominalAmount = _ref22.nominalAmount,
+                            promoId = _ref22.promoId,
+                            id = _ref22.id,
+                            doorsill = _ref22.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1823,8 +1846,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn16.Differentiate;
@@ -1914,7 +1937,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
                 var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
@@ -1952,7 +1975,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 idBankAccount: mode.IdBankAccount,
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
                                                 idCurrency: mode.Currency ? mode.Currency.ID : -1,
-                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
+                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
+                                                virtualPay: mode.VirtualPay
                                             });
                                         });
                                         _this15.paymodes = paymodes;
@@ -1969,7 +1993,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref23.apply(this, arguments);
+                return _ref24.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2090,8 +2114,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref24 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref24.isNewRetailBCPos;
+            var _ref25 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);