tplus-components-touch 3.27.1 → 3.28.1

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _desc2, _value2, _class3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _desc3, _value3, _class5, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16;
+var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
 
 var _mobx = require('mobx');
 
@@ -161,6 +161,7 @@ function _initializerWarningHelper(descriptor, context) {
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
 var SettlementStore = (_class = function () {
+    //type==2
     function SettlementStore() {
         var _this2 = this;
 
@@ -172,7 +173,6 @@ var SettlementStore = (_class = function () {
         this.bquick = false;
         this.boriginReturn = false;
         this.newStyle = true;
-        this.freight = 0;
 
         _initDefineProp(this, 'queryPwd', _descriptor, this);
 
@@ -234,7 +234,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;
 
@@ -307,20 +307,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.getPerformanceDistributionValue = function (data) {
-            return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPerformanceDistributionValue', false, false);
-        };
-
-        this.getPosFreight = function (data) {
-            return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
-        };
-
-        _initDefineProp(this, 'updataFreight', _descriptor3, this);
-
         this.checkCoupon = function () {
             var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
                 var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
@@ -428,8 +414,7 @@ var SettlementStore = (_class = function () {
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
         this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
-    } //type==2
-
+    }
 
     (0, _createClass3.default)(SettlementStore, [{
         key: 'initPaymodes',
@@ -440,7 +425,7 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'init',
-        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data) {
+        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
             var _this3 = this;
 
             this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
@@ -456,36 +441,20 @@ var SettlementStore = (_class = function () {
                     if (global.DealSingleRowAmountSettingProcessorBlock) {
                         global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
                     }
+
+                    var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
+                        PayStyle = _enumController$getEn4.PayStyle;
+
+                    var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
+
                     // 成交金额抹零
                     if (global.DealAmountSettingProcessorBlock) {
-                        global.DealAmountSettingProcessorBlock.execute(_this3.dto);
+                        global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
                     }
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
                 this.member = this.dto.Member; //stores.selectMemberStore.selectMemberInfo;
-
-                //预订按比例收取订金处理
-                var value = this.dto.TotalTaxAmount;
-
-                var _getLoginInfo = this.getLoginInfo(),
-                    Book = _getLoginInfo.Book,
-                    PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
-
-                var _ref5 = this.dto || {},
-                    IdbusiType = _ref5.IdbusiType,
-                    DistributionMode = _ref5.DistributionMode;
-
-                if (IdbusiType == 38 && Book && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
-                    value = value * PercentageWhenBook / 100;
-                }
-                if (IdbusiType == 38 && Book && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
-                    value += this.freight;
-                }
-                if (IdbusiType == 39) {
-                    value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
-                }
-
-                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;
@@ -530,11 +499,11 @@ var SettlementStore = (_class = function () {
         value: function initByOriginReturn() {
             var _this5 = this;
 
-            var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn4.PayStyle;
+            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 = [];
@@ -559,14 +528,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, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
@@ -599,7 +568,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'quickSettle',
         value: function quickSettle(key) {
-            this.addPay(key);
+            this.addPay(key, true);
         }
 
         //outer call
@@ -610,8 +579,8 @@ var SettlementStore = (_class = function () {
         value: function changeFocusAndAddPay(type) {
             var _this6 = this;
 
-            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn5.PayStyle;
+            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn6.PayStyle;
 
             this.paymode.currentFocus = type;
             if (this.paymode.currentMode) {
@@ -648,9 +617,9 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref8 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref8$loginInfo = _ref8.loginInfo,
-                loginInfo = _ref8$loginInfo === undefined ? {} : _ref8$loginInfo;
+            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
+                _ref7$loginInfo = _ref7.loginInfo,
+                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
 
             return loginInfo;
         }
@@ -669,8 +638,8 @@ 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 _ref9 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref9.isNewRetailBCPos;
+            var _ref8 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
@@ -680,8 +649,8 @@ var SettlementStore = (_class = function () {
                     var data = result.data;
                     var m = data;
 
-                    var _ref10 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -726,8 +695,8 @@ var SettlementStore = (_class = function () {
                     var data = JSON.parse(result.Data);
                     var m = data && data.length > 0 && data[0];
 
-                    var _ref11 = _mutantsUtil.platform || {},
-                        isNewRetailBCPos = _ref11.isNewRetailBCPos;
+                    var _ref10 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
 
                     if (isNewRetailBCPos) {
                         _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -796,8 +765,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setCurrentMode',
         value: function setCurrentMode(id, type, append) {
-            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn6.PayStyle;
+            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn7.PayStyle;
 
             var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
             if (mode) {
@@ -815,8 +784,8 @@ var SettlementStore = (_class = function () {
         value: function afterSetCurrentMode(type) {
             var _this8 = this;
 
-            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn7.PayStyle;
+            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn8.PayStyle;
 
             if (type == PayStyle.djq) {
                 this.paymode.calcDjqValue();
@@ -851,9 +820,9 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'genNewMode',
-        value: function genNewMode(type, notwithm, v) {
-            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn8.PayStyle;
+        value: function genNewMode(type, notwithm, v, isQuick) {
+            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn9.PayStyle;
 
             var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
             var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
@@ -862,9 +831,9 @@ var SettlementStore = (_class = function () {
                 name: themode.name,
                 exchangeRate: themode.exchangeRate,
                 calDirection: themode.calDirection,
-                value: value,
-                value2: (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
-                value3: value,
+                value: !isQuick ? 0 : value,
+                value2: !isQuick ? 0 : (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
+                value3: !isQuick ? 0 : value,
                 order: this.paymode.thePaymodes.length + 1,
                 paymentType: type,
                 djqs: [],
@@ -896,8 +865,8 @@ var SettlementStore = (_class = function () {
         value: function setMaxAmount(type, mode) {
             var _this9 = this;
 
-            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn9.PayStyle;
+            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn10.PayStyle;
 
             var sum = 0;
             if (type == PayStyle.hyczk) {
@@ -973,8 +942,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'addPayDirectly',
         value: function addPayDirectly(pay) {
-            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn10.PayStyle;
+            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn11.PayStyle;
 
             if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
                 var pos = this.paymode.thePaymodes.length;
@@ -991,9 +960,9 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addPay',
-        value: function addPay(type) {
-            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn11.PayStyle;
+        value: function addPay(type, isQuick) {
+            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn12.PayStyle;
 
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
@@ -1003,14 +972,15 @@ var SettlementStore = (_class = function () {
                 pos = index == -1 ? pos : index + 1;
             }
             // this.paymode.thePaymodes.push(this.genNewMode(type) );
-            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
+
+            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
             this.paymode.calcReserved();
         }
     }, {
         key: 'delPay',
         value: function delPay(index) {
-            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn12.PayStyle;
+            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn13.PayStyle;
 
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId === index;
@@ -1021,8 +991,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
-                var _ref13, isNewRetailBCPos;
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref12, isNewRetailBCPos;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -1038,7 +1008,7 @@ var SettlementStore = (_class = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                _ref12 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref12.isNewRetailBCPos;
                                 _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
@@ -1094,7 +1064,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref12.apply(this, arguments);
+                return _ref11.apply(this, arguments);
             }
 
             return commit;
@@ -1110,8 +1080,8 @@ var SettlementStore = (_class = function () {
         value: function saveMember() {
             var _this10 = this;
 
-            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn13.PayStyle;
+            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle;
 
             (0, _mobx.runInAction)(function () {
                 _this10.dto.StorageMutiSettleDetails = [];
@@ -1152,16 +1122,16 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn15, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
                         switch (_context3.prev = _context3.next) {
                             case 0:
-                                _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
+                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
 
                                 (0, _mobx.runInAction)(function () {
                                     _this11.dto.RetailPaymentDetails = [];
@@ -1235,8 +1205,8 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref15 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                    var _ref14 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
@@ -1270,7 +1240,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
+                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1340,7 +1310,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref14.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1353,7 +1323,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1381,7 +1351,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1407,14 +1377,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref19, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
+                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1499,7 +1469,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref18.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return validePwd;
@@ -1538,14 +1508,14 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
-                var _getLoginInfo2, IdStore, StoreCode, resp;
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+                var _getLoginInfo, 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;
+                                _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
                                 _context6.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
@@ -1565,19 +1535,10 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref20.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             };
         }();
     }
-}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updataFreight', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this14 = this;
-
-        return function (freight) {
-            _this14.freight = freight;
-        };
-    }
 }), _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 () {
@@ -1592,15 +1553,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor4, this);
+        _initDefineProp(this, 'currentFocus', _descriptor3, this);
 
-        _initDefineProp(this, 'received', _descriptor5, this);
+        _initDefineProp(this, 'received', _descriptor4, this);
 
-        _initDefineProp(this, 'receivable', _descriptor6, this);
+        _initDefineProp(this, 'receivable', _descriptor5, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor7, this);
+        _initDefineProp(this, 'paymodes', _descriptor6, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor8, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor7, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1609,11 +1570,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor9, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor8, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor10, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor9, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor11, this);
+        _initDefineProp(this, 'addDjqs', _descriptor10, this);
     }
     // @observable store = null;
 
@@ -1652,7 +1613,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this15 = this;
+            var _this14 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1666,12 +1627,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref20 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
-            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn15.PayStyle,
-                Differentiate = _enumController$getEn15.Differentiate;
+            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn16.PayStyle,
+                Differentiate = _enumController$getEn16.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1699,7 +1660,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this15.checkList.splice(i, 1);
+                        _this14.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1741,13 +1702,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;
 
@@ -1771,24 +1732,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this15.currentMode.djqs.forEach(function (djq) {
+                        _this14.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
                         });
 
-                        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 _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 condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1816,10 +1777,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this15.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this15.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1832,11 +1793,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
-            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn16.Differentiate;
+            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn17.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1898,8 +1859,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn17.PayStyle;
+            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn18.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -1923,16 +1884,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
-                var _this16 = this;
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+                var _this15 = this;
 
-                var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
+                                _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1964,7 +1925,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
-                                        _this16.paymodes = paymodes;
+                                        _this15.paymodes = paymodes;
                                         //modes.QuickSettleStyles
                                     });
                                 }
@@ -1978,7 +1939,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref24.apply(this, arguments);
+                return _ref23.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1995,47 +1956,47 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this16 = this;
 
         return function () {
-            _this17.checkList = [];
+            _this16.checkList = [];
         };
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this17 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this18.currentMode.djqs.forEach(function (ele) {
+            _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
@@ -2045,10 +2006,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this19 = this;
+        var _this18 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2070,25 +2031,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this19.currentMode.djqs.push(djq);
+            _this18.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this20 = this;
+        var _this19 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor12, this);
+        _initDefineProp(this, 'cardNo', _descriptor11, this);
 
-        _initDefineProp(this, 'balance', _descriptor13, this);
+        _initDefineProp(this, 'balance', _descriptor12, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor14, this);
+        _initDefineProp(this, 'exchangable', _descriptor13, this);
 
-        _initDefineProp(this, 'MeStorageCardId', _descriptor15, this);
+        _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor16, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
 
         if (m) {
             this.id = m.ID;
@@ -2099,17 +2060,17 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref25 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref25.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this20.cardNo = m.CardCode;
+                _this19.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this20.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this20.balance = _this20.rawbalance;
+                    _this19.balance = _this19.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2141,19 +2102,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setMeStorageCardId', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setMeStorageCardId'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setStorageCardNo'), _class5.prototype)), _class5);