tplus-components-touch 3.21.2 → 3.22.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, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
+var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _desc3, _value3, _class5, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
 
 var _mobx = require('mobx');
 
@@ -93,10 +93,6 @@ var _utils = require('./utils');
 
 var _tplusApi = require('tplus-api');
 
-var _cloneDeep = require('lodash/cloneDeep');
-
-var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
-
 var _message = require('../message');
 
 var _message2 = _interopRequireDefault(_message);
@@ -198,9 +194,6 @@ var SettlementStore = (_class = function () {
                 if (dto.OnlinePaymentAmount) {
                     onlinePaymentAmount = dto.OnlinePaymentAmount;
                 }
-                promoVoucher.promoLinks = (0, _filter3.default)(_this2.paymode.currentMode.djqs, function (djq) {
-                    return djq.checked;
-                });
                 promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
                 promoVoucher.redBlueFlagEnum = "BLUE";
                 promoVoucher.meMemberId = dto.Idmember;
@@ -216,7 +209,7 @@ var SettlementStore = (_class = function () {
                     detailDTO.productSpecId = item.ProductSpecId;
                     detailDTO.isManualFreeGift = item.IsPresent;
                     detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
-                    detailDTO.IsManualChangePrice = item.IsManualChangePrice;
+
                     if (detailDTO.IsManualChangePrice) //如果是手工改价
                         {
                             detailDTO.listPrice = item.TaxPrice;
@@ -266,8 +259,7 @@ var SettlementStore = (_class = function () {
                             var condValue = tieredAmountResult.condValue,
                                 promoDiscount = tieredAmountResult.promoDiscount,
                                 displayText = tieredAmountResult.displayText,
-                                promoRuleId = tieredAmountResult.promoRuleId,
-                                couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
+                                promoRuleId = tieredAmountResult.promoRuleId;
 
                             if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
                                 return djq.code == couponCode;
@@ -278,12 +270,7 @@ var SettlementStore = (_class = function () {
                             })) {
                                 _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
                             } else {
-                                var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
-
-                                var _ref2 = _mutantsUtil.platform || {},
-                                    isNewRetailBCPos = _ref2.isNewRetailBCPos;
-
-                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : isNewRetailBCPos && discountPct > 0 ? 0 : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
+                                _this2.addDjq(couponCode, name, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
                             }
                         });
                         if (promoVoucher.coupon_code) {
@@ -306,14 +293,14 @@ var SettlementStore = (_class = function () {
         };
 
         this.checkCoupon = function () {
-            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
-                var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
+                var _ref3, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
 
                 return _regenerator2.default.wrap(function _callee$(_context) {
                     while (1) {
                         switch (_context.prev = _context.next) {
                             case 0:
-                                _ref4 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref4.isNewRetailBCPos;
+                                _ref3 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref3.isNewRetailBCPos;
 
                                 if (!isNewRetailBCPos) {
                                     _context.next = 7;
@@ -381,7 +368,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x) {
-                return _ref3.apply(this, arguments);
+                return _ref2.apply(this, arguments);
             };
         }();
 
@@ -495,8 +482,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn4.PayStyle;
 
-            var _ref5 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref5.isNewRetailBCPos;
+            var _ref4 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref4.isNewRetailBCPos;
 
             (0, _each3.default)(this.dto.RetailPaymentDetails, function (detail) {
                 var themode = (0, _find3.default)(_this5.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
@@ -519,19 +506,19 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                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);
+                                var _ref5 = djq || {},
+                                    displayText = _ref5.displayText,
+                                    promoRuleId = _ref5.promoRuleId,
+                                    dateMount = _ref5.dateMount,
+                                    promoMethodEnum = _ref5.promoMethodEnum,
+                                    discountPct = _ref5.discountPct,
+                                    promoId = _ref5.promoId,
+                                    id = _ref5.id;
+
+                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
                                 return;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
                     _this5.paymode.thePaymodes.push(newmode);
@@ -608,9 +595,9 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref7$loginInfo = _ref7.loginInfo,
-                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
+            var _ref6 = _mutantsMicrofx.localStore.get('user') || {},
+                _ref6$loginInfo = _ref6.loginInfo,
+                loginInfo = _ref6$loginInfo === undefined ? {} : _ref6$loginInfo;
 
             return loginInfo;
         }
@@ -629,8 +616,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 _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref7 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
@@ -642,8 +629,8 @@ var SettlementStore = (_class = function () {
                 var data = JSON.parse(result.Data);
                 var m = data && data.length > 0 && data[0];
 
-                var _ref9 = _mutantsUtil.platform || {},
-                    isNewRetailBCPos = _ref9.isNewRetailBCPos;
+                var _ref8 = _mutantsUtil.platform || {},
+                    isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
                 if (isNewRetailBCPos) {
                     _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
@@ -680,12 +667,10 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addDjq',
-        value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
+        value: function addDjq(code, name, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, unCheck) {
             var djq = {
-                code: promoCouponCode,
-                promoCouponCode: promoCouponCode,
+                code: code,
                 name: name,
-                IsEnable: IsEnable,
                 amount: amount,
                 doorsill: doorsill, //:"无门槛"
                 LastTS: LastTS,
@@ -698,12 +683,9 @@ var SettlementStore = (_class = function () {
                 discountPct: discountPct,
                 promoId: promoId,
                 promoRuleId: promoRuleId,
-                couponCategoryEnum: couponCategoryEnum,
-                id: id,
-                count: count === 1 && (couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT') ? 1 : null
+                id: id
             };
             this.paymode.currentMode.djqs.push(djq);
-            // let copyData = _clonedeep(this.data[targetIndex]);
             !unCheck && !this.boriginReturn && this.paymode.calcDjqValue(djq);
         }
     }, {
@@ -931,7 +913,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -986,7 +968,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref10.apply(this, arguments);
+                return _ref9.apply(this, arguments);
             }
 
             return commit;
@@ -1032,20 +1014,20 @@ var SettlementStore = (_class = function () {
                 IPMSG = JSON.parse(window.localStorage.IPMSG);
             }
             return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                var _ref11 = _mutantsUtil.platform || {},
-                    isHorizontalPad = _ref11.isHorizontalPad,
-                    isHorizontalSunMi = _ref11.isHorizontalSunMi;
+                var _ref10 = _mutantsUtil.platform || {},
+                    isHorizontalPad = _ref10.isHorizontalPad,
+                    isHorizontalSunMi = _ref10.isHorizontalSunMi;
 
                 if (isHorizontalPad === true) {
                     // pad打印
                     //执行移动端云打印
                     if (_this10.cloudPrintArguments) {
-                        var _ref12 = _this10.cloudPrintArguments || {},
-                            Open = _ref12.Open,
-                            Key = _ref12.Key,
-                            Sign = _ref12.Sign,
-                            Name = _ref12.Name,
-                            Card = _ref12.Card;
+                        var _ref11 = _this10.cloudPrintArguments || {},
+                            Open = _ref11.Open,
+                            Key = _ref11.Key,
+                            Sign = _ref11.Sign,
+                            Name = _ref11.Name,
+                            Card = _ref11.Card;
 
                         if (!Open) {
                             _message2.default.warn(t('云打印未启用，请设置。'));
@@ -1083,8 +1065,8 @@ var SettlementStore = (_class = function () {
                     return;
                 } else {
                     if (global.StoragePrintProcessBlock) {
-                        var _ref13 = _mutantsUtil.platform || {},
-                            isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                        var _ref12 = _mutantsUtil.platform || {},
+                            isNewRetailBCPos = _ref12.isNewRetailBCPos;
 
                         if (isNewRetailBCPos) {
                             global.StoragePrintProcessBlock.execute(resp);
@@ -1102,10 +1084,10 @@ 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$getEn13, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1185,8 +1167,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 });
@@ -1220,7 +1202,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);
 
@@ -1289,7 +1271,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref14.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1302,7 +1284,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) {
@@ -1330,7 +1312,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1356,14 +1338,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, result, count, _result;
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, 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) {
@@ -1447,7 +1429,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref18.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return validePwd;
@@ -1486,7 +1468,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1513,14 +1495,13 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref20.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             };
         }();
     }
 }), _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 () {
-    //应收
     function PayMode() {
         // this.amount=getFixedNumber(amount);
         // this.calcReserved();
@@ -1542,19 +1523,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
         _initDefineProp(this, 'thePaymodes', _descriptor7, this);
 
         this.currentMode = null;
-        this.checkList = [];
         this.settle = {
             name: "复合结算",
             hotKey: "Ctrl+M"
         };
-
-        _initDefineProp(this, 'calcCheckList', _descriptor8, this);
-
-        _initDefineProp(this, 'setCouponNum', _descriptor9, this);
-
-        _initDefineProp(this, 'addDjqs', _descriptor10, this);
-    }
-    // @observable store = null;
+    } //应收
 
 
     (0, _createClass3.default)(PayMode, [{
@@ -1589,24 +1562,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
     }, {
-        key: 'calcDjqCheckValue',
-        value: function calcDjqCheckValue(q1, dto) {
+        key: 'calcDjqValue',
+        value: function calcDjqValue(q1) {
             var _this14 = this;
 
-            var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
-            var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
-                return djq.checked;
-            });
-            if (qList.length === useLimitPerOrder && !q1.checked) {
-                _message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
-                return;
-            }
-
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref20 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn14.PayStyle,
                 Differentiate = _enumController$getEn14.Differentiate;
 
             if (q1) {
@@ -1615,184 +1578,22 @@ var PayMode = exports.PayMode = (_class3 = function () {
                     return;
                 }
                 var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
-                    return djq.promoCouponCode == q1.promoCouponCode;
+                    return djq.code == q1.code;
                 });
                 if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
                     _message2.default.error("本单金额低于使用门槛，该券不可使用。");
                     return;
                 }
                 //判断是否是选择优惠券  //CC优惠券只能使用一个
-                // if (q1 && !q1.checked && isNewRetailBCPos) {
-                //     // 检查是否有已经选定优惠券 并且去除选定的优惠券
-                //     this.currentMode.djqs.forEach((djq, index) => {
-                //         if (djq.checked) this.currentMode.djqs[index].checked = false;
-                //     })
-                // }
-                q && (q.checked = !q.checked);
-            }
-            var sum = 0;
-            // console.log(this.store, 'stores-------');
-            (0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
-                return djq.checked;
-            }), function (q) {
-                if (q.discountPct > 0) {
-                    if (q.amount === 0) {
-                        q.amount = (1 - q.discountPct) * _this14.currentMode.receivable;
-                        console.log(q.amount, _this14.currentMode.receivable, 'amount111111111');
-                    }
-                }
-                sum = Math.Add(sum, q.amount);
-            });
-            console.log(this.receivable, sum, this.currentMode.maxamount, 'amount3333333333');
-            this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
-            this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
-            this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
-            if (!q1.checked) {
-                this.checkList.forEach(function (ele, i) {
-                    if (ele.id === q1.id) {
-                        _this14.checkList.splice(i, 1);
-                    }
-                });
-                return;
-            }
-            var promoVoucher = {};
-            promoVoucher.boName = "Retail";
-            this.checkList.push(q1);
-            // promoVoucher.promoLinks = _filter(this.currentMode.djqs,djq=>djq.checked);
-            promoVoucher.meMemberId = this.currentMode.member.id;
-            promoVoucher.storeFactorId = (0, _tplusPoslogin.PosInitData)('storeID');
-            promoVoucher.voucherDetailList = [];
-            dto.RetailDetails.forEach(function (item) {
-                var detailDTO = {};
-                detailDTO.uuid = item.Code;
-                detailDTO.detailBoName = "RetailDetail";
-                detailDTO.voucherDetailId = item.ID;
-                detailDTO.productId = item.Idinventory;
-                detailDTO.uomId = item.Idunit;
-                detailDTO.productSpecId = item.ProductSpecId;
-                detailDTO.isManualFreeGift = item.IsPresent;
-                detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
-                detailDTO.IsManualChangePrice = item.IsManualChangePrice;
-                if (detailDTO.IsManualChangePrice) //如果是手工改价
-                    {
-                        detailDTO.listPrice = item.TaxPrice;
-                        detailDTO.netAmountWithTax = item.TaxAmount;
-                    } else {
-                    var bookingQuantity = 0;
-                    if (item.BookingQuantity) {
-                        bookingQuantity = item.BookingQuantity;
-                    }
-                    detailDTO.listPrice = item.MemberPrice;
-                    detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
-                }
-                detailDTO.taxRate = item.TaxRate;
-                detailDTO.quantity = item.Quantity;
-
-                detailDTO.amountWithTax = item.RetailAmount;
-                // 促销 start
-                if (item.PromotionDetails && item.PromotionDetails.length != 0) {
-                    var promoLinks = [];
-                    item.PromotionDetails.forEach(function (promotion) {
-                        promoLinks.push({
-                            promoId: promotion.IdSalesPromotionDTO,
-                            promoRuleId: promotion.PromotionRuleId
-                        });
+                if (q1 && !q1.checked && isNewRetailBCPos) {
+                    // 检查是否有已经选定优惠券 并且去除选定的优惠券
+                    this.currentMode.djqs.forEach(function (djq, index) {
+                        if (djq.checked) _this14.currentMode.djqs[index].checked = false;
                     });
-                    if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
-                }
-                // 促销 end
-                promoVoucher.voucherDetailList.push(detailDTO);
-            });
-            promoVoucher.promoLinks = this.checkList;
-            return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
-                if (result && result.length != 0) {
-                    result.forEach(function (element) {
-                        var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
-                            return djq.id === element.id;
-                        });
-
-                        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,
-                            displayText = tieredAmountResult.displayText,
-                            promoRuleId = tieredAmountResult.promoRuleId,
-                            couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
-
-                        if (!djq1.length) {
-                            // this.currentMode.djqs.push({
-                            //     promoCouponCode: element.CouponCode,
-                            //     name: element.CouponTitle,
-                            //     IsEnable: true,
-                            //     amount: element.ReductionAmount,
-                            //     doorsill: element.EnableAmount,
-                            //     LastTS: element.LastTS,
-                            //     checked: false,
-                            //     IsRepelWithPoints: true,
-                            //     UMemberID: dto.Idmember,
-                            //     expired: null,
-                            //     displayText,
-                            //     promoMethodEnum,
-                            //     discountPct,
-                            //     promoId,
-                            //     promoRuleId,
-                            //     couponCategoryEnum: 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);
-                        } else {
-                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
-                            // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
-                            // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
-                        }
-                    });
-                }
-            });
-            //this.receivable = getFixedNumber(this.receivable - sum);
-        }
-    }, {
-        key: 'calcDjqValue',
-        value: function calcDjqValue(q1) {
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
-
-            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn15.Differentiate;
-
-            if (q1) {
-                if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
-                    _message2.default.error('\u672C\u5355\u6CA1\u6709' + Differentiate.COUPON + '\u53EF\u7528\u91D1\u989D\uFF0C\u8BE5\u5238\u4E0D\u53EF\u4F7F\u7528\u3002');
-                    return;
-                }
-                var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
-                    return djq.code == q1.code;
-                });
-                if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
-                    _message2.default.error("本单金额低于使用门槛，该券不可使用。");
-                    return;
                 }
-                //判断是否是选择优惠券  //CC优惠券只能使用一个
-                // if (q1 && !q1.checked && isNewRetailBCPos) {
-                //     // 检查是否有已经选定优惠券 并且去除选定的优惠券
-                //     this.currentMode.djqs.forEach((djq, index) => {
-                //         if (djq.checked) this.currentMode.djqs[index].checked = false;
-                //     })
-                // }
                 q && (q.checked = !q.checked);
             }
             var sum = 0;
-            // console.log(this.store, 'stores-------');
             (0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
                 return djq.checked;
             }), function (q) {
@@ -1801,7 +1602,6 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
             this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
             this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
-
             //this.receivable = getFixedNumber(this.receivable - sum);
         }
     }, {
@@ -1844,16 +1644,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 _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
-                var _enumController$getEn16, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn16.settleStyleType, PayStyle = _enumController$getEn16.PayStyle;
+                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn15.settleStyleType, PayStyle = _enumController$getEn15.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1898,7 +1698,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref24.apply(this, arguments);
+                return _ref21.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1940,74 +1740,22 @@ var PayMode = exports.PayMode = (_class3 = function () {
     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), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this16 = this;
-
-        return function () {
-            _this16.checkList = [];
-        };
-    }
-}), _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 _this17 = this;
-
-        return function (id, couponNum, code) {
-            _this17.currentMode.djqs.forEach(function (ele) {
-                if (ele.id === id) {
-                    ele.couponCategoryEnum = couponNum;
-                    var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
-                    ele.IsEnable = IsEnable;
-                }
-            });
-        };
-    }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this18 = this;
-
-        return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
-            var djq = {
-                promoCouponCode: promoCouponCode,
-                name: name,
-                IsEnable: IsEnable,
-                amount: amount,
-                doorsill: doorsill,
-                LastTS: LastTS,
-                checked: checked,
-                IsRepelWithPoints: IsRepelWithPoints,
-                UMemberID: UMemberID,
-                expired: expired,
-                displayText: displayText,
-                promoMethodEnum: promoMethodEnum,
-                discountPct: discountPct,
-                promoId: promoId,
-                promoRuleId: promoRuleId,
-                couponCategoryEnum: couponCategoryEnum,
-                id: id
-            };
-            _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);
+}), _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), _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 _this19 = this;
+        var _this16 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor11, this);
+        _initDefineProp(this, 'cardNo', _descriptor8, this);
 
-        _initDefineProp(this, 'balance', _descriptor12, this);
+        _initDefineProp(this, 'balance', _descriptor9, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor13, this);
+        _initDefineProp(this, 'exchangable', _descriptor10, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor14, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor11, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
 
         if (m) {
             this.id = m.ID;
@@ -2018,16 +1766,16 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref25 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref25.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             (0, _mobx.runInAction)(function () {
-                _this19.cardNo = m.CardCode;
+                _this16.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this16.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this19.balance = _this19.rawbalance;
+                    _this16.balance = _this16.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2059,19 +1807,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor8 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
+}), _descriptor12 = _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);