tplus-components-touch 3.22.1 → 3.22.2

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, _desc3, _value3, _class5, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
+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');
 
@@ -93,18 +93,22 @@ 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);
 
 var _mutantsUtil = require('mutants-util');
 
+var _tplusComponentsTouch = require('tplus-components-touch');
+
 var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
 
-var _tplusComponentsTouch = require('tplus-components-touch');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _initDefineProp(target, property, descriptor, context) {
@@ -194,6 +198,9 @@ 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;
@@ -209,7 +216,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;
@@ -259,7 +266,8 @@ var SettlementStore = (_class = function () {
                             var condValue = tieredAmountResult.condValue,
                                 promoDiscount = tieredAmountResult.promoDiscount,
                                 displayText = tieredAmountResult.displayText,
-                                promoRuleId = tieredAmountResult.promoRuleId;
+                                promoRuleId = tieredAmountResult.promoRuleId,
+                                couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
                             if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
                                 return djq.code == couponCode;
@@ -270,7 +278,12 @@ var SettlementStore = (_class = function () {
                             })) {
                                 _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
                             } else {
-                                _this2.addDjq(couponCode, name, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
+                                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);
                             }
                         });
                         if (promoVoucher.coupon_code) {
@@ -293,14 +306,14 @@ var SettlementStore = (_class = function () {
         };
 
         this.checkCoupon = function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
-                var _ref3, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
+            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
+                var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
 
                 return _regenerator2.default.wrap(function _callee$(_context) {
                     while (1) {
                         switch (_context.prev = _context.next) {
                             case 0:
-                                _ref3 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref3.isNewRetailBCPos;
+                                _ref4 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref4.isNewRetailBCPos;
 
                                 if (!isNewRetailBCPos) {
                                     _context.next = 7;
@@ -368,7 +381,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x) {
-                return _ref2.apply(this, arguments);
+                return _ref3.apply(this, arguments);
             };
         }();
 
@@ -398,7 +411,6 @@ var SettlementStore = (_class = function () {
         this.paymode = new PayMode();
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
-        this.printUtil = new _tplusComponentsTouch.PrintUtil();
         this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
     }
 
@@ -482,8 +494,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn4.PayStyle;
 
-            var _ref4 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref4.isNewRetailBCPos;
+            var _ref5 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
             (0, _each3.default)(this.dto.RetailPaymentDetails, function (detail) {
                 var themode = (0, _find3.default)(_this5.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
@@ -506,19 +518,19 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                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);
+                                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;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
                     _this5.paymode.thePaymodes.push(newmode);
@@ -595,9 +607,9 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref6 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref6$loginInfo = _ref6.loginInfo,
-                loginInfo = _ref6$loginInfo === undefined ? {} : _ref6$loginInfo;
+            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
+                _ref7$loginInfo = _ref7.loginInfo,
+                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
 
             return loginInfo;
         }
@@ -616,61 +628,107 @@ 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 _ref7 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref7.isNewRetailBCPos;
+            var _ref8 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
-                address = 'chanjet.AA.DR.INewRetailMember.SearchMember';
+                // address = '/member/memberProfile/FindByStorageCode/'+v;
+                address = '/member/MeMemberWallet/FindByStorageCode';
+                return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function (result) {
+                    var data = result.data;
+                    var m = data;
+
+                    var _ref9 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref9.isNewRetailBCPos;
+
+                    if (isNewRetailBCPos) {
+                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
+                    }
+                    if (!m || !m.ID) {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "无效的会员卡号";
+                        });
+                    } else {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "";
+                            _this7.paymode.currentMode.member = new Member(m);
+                            _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
+                            _this7.updateEvent();
+                            var message = '';
+                            if (global.CheckMemberStorageProcessorBlock) {
+                                message = CheckMemberStorageProcessorBlock.execute(m);
+                            }
+                            if (!String.isNullOrEmpty(message)) {
+                                _this7.paymode.currentMode.errinfo = message;
+                            } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
+                                _this7.paymode.currentMode.errinfo = "余额不足";
+                            } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
+                                _this7.paymode.currentMode.errinfo = "实收金额必须录入";
+                            } else {
+                                // 查询成功后将焦点移入下一个输入框
+                                var nextInput = document.querySelector('.czk .received .input');
+                                nextInput && nextInput.focus();
+                            }
+                        });
+                    }
+                });
             } else {
                 address = 'AA.DR.newRetailMember.SearchMember';
+                return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
+                    var data = JSON.parse(result.Data);
+                    var m = data && data.length > 0 && data[0];
+
+                    var _ref10 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+
+                    if (isNewRetailBCPos) {
+                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
+                    }
+                    if (!m || !m.ID) {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "无效的会员卡号";
+                        });
+                    } else {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "";
+                            _this7.paymode.currentMode.member = new Member(m);
+                            _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
+                            _this7.updateEvent();
+                            var message = '';
+                            if (global.CheckMemberStorageProcessorBlock) {
+                                message = CheckMemberStorageProcessorBlock.execute(data[0]);
+                            }
+                            if (!String.isNullOrEmpty(message)) {
+                                _this7.paymode.currentMode.errinfo = message;
+                            } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
+                                _this7.paymode.currentMode.errinfo = "余额不足";
+                            } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
+                                _this7.paymode.currentMode.errinfo = "实收金额必须录入";
+                            } else {
+                                // 查询成功后将焦点移入下一个输入框
+                                var nextInput = document.querySelector('.czk .received .input');
+                                nextInput && nextInput.focus();
+                            }
+                        });
+                    }
+                });
             }
-            return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
-                var data = JSON.parse(result.Data);
-                var m = data && data.length > 0 && data[0];
-
-                var _ref8 = _mutantsUtil.platform || {},
-                    isNewRetailBCPos = _ref8.isNewRetailBCPos;
-
-                if (isNewRetailBCPos) {
-                    _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
-                    _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
-                }
-                if (!m || !m.ID) {
-                    (0, _mobx.runInAction)(function () {
-                        _this7.paymode.currentMode.errinfo = "无效的会员卡号";
-                    });
-                } else {
-                    (0, _mobx.runInAction)(function () {
-                        _this7.paymode.currentMode.errinfo = "";
-                        _this7.paymode.currentMode.member = new Member(m);
-                        _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
-                        _this7.updateEvent();
-                        var message = '';
-                        if (global.CheckMemberStorageProcessorBlock) {
-                            message = CheckMemberStorageProcessorBlock.execute(data[0]);
-                        }
-                        if (!String.isNullOrEmpty(message)) {
-                            _this7.paymode.currentMode.errinfo = message;
-                        } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
-                            _this7.paymode.currentMode.errinfo = "余额不足";
-                        } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
-                            _this7.paymode.currentMode.errinfo = "实收金额必须录入";
-                        } else {
-                            // 查询成功后将焦点移入下一个输入框
-                            var nextInput = document.querySelector('.czk .received .input');
-                            nextInput && nextInput.focus();
-                        }
-                    });
-                }
-            });
         }
     }, {
         key: 'addDjq',
-        value: function addDjq(code, name, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, unCheck) {
+        value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
             var djq = {
-                code: code,
+                code: promoCouponCode,
+                promoCouponCode: promoCouponCode,
                 name: name,
+                IsEnable: IsEnable,
                 amount: amount,
                 doorsill: doorsill, //:"无门槛"
                 LastTS: LastTS,
@@ -683,9 +741,12 @@ var SettlementStore = (_class = function () {
                 discountPct: discountPct,
                 promoId: promoId,
                 promoRuleId: promoRuleId,
-                id: id
+                couponCategoryEnum: couponCategoryEnum,
+                id: id,
+                count: count === 1 && (couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT') ? 1 : null
             };
             this.paymode.currentMode.djqs.push(djq);
+            // let copyData = _clonedeep(this.data[targetIndex]);
             !unCheck && !this.boriginReturn && this.paymode.calcDjqValue(djq);
         }
     }, {
@@ -913,7 +974,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
                         switch (_context2.prev = _context2.next) {
@@ -968,11 +1029,17 @@ var SettlementStore = (_class = function () {
             }));
 
             function commit(_x2) {
-                return _ref9.apply(this, arguments);
+                return _ref11.apply(this, arguments);
             }
 
             return commit;
         }()
+    }, {
+        key: 'handlePrint',
+        value: function handlePrint(resp) {
+            // 储值打印
+            return (0, _tplusComponentsTouch.printDispatch)(_tplusComponentsTouch.DoNameList.DO_STORAGE_PRINT, resp.ID, {});
+        }
     }, {
         key: 'saveMember',
         value: function saveMember() {
@@ -1014,80 +1081,16 @@ 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 _ref10 = _mutantsUtil.platform || {},
-                    isHorizontalPad = _ref10.isHorizontalPad,
-                    isHorizontalSunMi = _ref10.isHorizontalSunMi;
-
-                if (isHorizontalPad === true) {
-                    // pad打印
-                    //执行移动端云打印
-                    if (_this10.cloudPrintArguments) {
-                        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('云打印未启用，请设置。'));
-                            return;
-                        }
-                        _this10.printUtil.doStoragePrint({ Key: Key, Sign: Sign, Name: Name, Card: Card }, resp.ID, function (s) {
-                            var msg = s.msg,
-                                ret = s.ret;
-
-                            if (ret === 0) {
-                                _message2.default.success(t('打印储值小票成功。'));
-                            } else if (ret === -1) {
-                                _message2.default.error(t(msg));
-                            } else {
-                                _message2.default.error(t('打印储值小票失败。'));
-                            }
-                        });
-                    } else {
-                        _message2.default.warn(t('云打印未启用，请设置。'));
-                    }
-                    return;
-                } else if (isHorizontalSunMi === true) {
-                    _this10.printUtil.doStoragePrint({}, resp.ID, function (s) {
-                        var msg = s.msg,
-                            ret = s.ret;
-
-                        if (ret === 0) {
-                            _message2.default.success(t('打印储值小票成功。'));
-                        } else if (ret === -1) {
-                            _message2.default.error(t(msg));
-                        } else {
-                            _message2.default.error(t('打印储值小票失败。'));
-                        }
-                    });
-                    return;
-                } else {
-                    if (global.StoragePrintProcessBlock) {
-                        var _ref12 = _mutantsUtil.platform || {},
-                            isNewRetailBCPos = _ref12.isNewRetailBCPos;
-
-                        if (isNewRetailBCPos) {
-                            global.StoragePrintProcessBlock.execute(resp);
-                        } else {
-                            global.StoragePrintProcessBlock.execute(resp.ID);
-                        }
-                        return;
-                    } else {
-                        _message2.default.warn(t('打印小票只能在客户端中执行'));
-                        return;
-                    }
-                }
+                _this10.handlePrint(resp);
             });
         }
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn13, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
                 return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
@@ -1101,19 +1104,21 @@ var SettlementStore = (_class = function () {
                                     _this11.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
                                     var Idmember = _this11.dto.Idmember;
+                                    var count = 0;
                                     var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
                                     }) : _this11.paymode.thePaymodes;
-                                    (0, _each3.default)(thePaymodes, function (mode) {
+                                    (0, _each3.default)(thePaymodes, function (mode, index) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             if (!Idmember) {
                                                 Idmember = mode.member.id;
                                             }
                                             czkSum = Math.Add(czkSum, mode.value);
-
+                                            var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
                                             _this11.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
+                                                MeStorageCardId: MeStorageCardId,
                                                 StoragePaymentAmount: mode.value,
                                                 IsOrigReturn: false,
                                                 BalanceStorage: mode.balance,
@@ -1167,15 +1172,15 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref14 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                    var _ref13 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                                     if (_this11.dto.RetailStorageDetails.length > 0) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
                                         if (isNewRetailBCPos) {
-                                            _this11.dto.RetailStorageDetails && _this11.dto.RetailStorageDetails.forEach(function (value) {
-                                                value.MeStorageCardId = _this11.member.MeStorageCardId;
-                                            });
+                                            // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
+                                            //     value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
+                                            // })
                                             _this11.dto.RetailPaymentDetails.push({
                                                 Code: _this11.paymode.counter,
                                                 OrigAmount: czkSum,
@@ -1202,7 +1207,7 @@ var SettlementStore = (_class = function () {
                                         _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
@@ -1271,7 +1276,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref12.apply(this, arguments);
             }
 
             return save;
@@ -1284,7 +1289,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
                         switch (_context4.prev = _context4.next) {
@@ -1312,7 +1317,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref15.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1338,14 +1343,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref18, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref17, isNewRetailBCPos, cook1, cook2, message, result, count, _result;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
                                 _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
@@ -1429,7 +1434,7 @@ var SettlementStore = (_class = function () {
             }));
 
             function validePwd(_x3) {
-                return _ref17.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return validePwd;
@@ -1468,7 +1473,7 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
                 return _regenerator2.default.wrap(function _callee6$(_context6) {
@@ -1495,13 +1500,14 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x4) {
-                return _ref19.apply(this, arguments);
+                return _ref18.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();
@@ -1523,11 +1529,19 @@ 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, [{
@@ -1562,14 +1576,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
     }, {
-        key: 'calcDjqValue',
-        value: function calcDjqValue(q1) {
+        key: 'calcDjqCheckValue',
+        value: function calcDjqCheckValue(q1, dto) {
             var _this14 = this;
 
-            var _ref20 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref20.isNewRetailBCPos;
+            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 _ref19 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref19.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle,
                 Differentiate = _enumController$getEn14.Differentiate;
 
             if (q1) {
@@ -1578,22 +1602,185 @@ var PayMode = exports.PayMode = (_class3 = function () {
                     return;
                 }
                 var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
-                    return djq.code == q1.code;
+                    return djq.promoCouponCode == q1.promoCouponCode;
                 });
                 if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
                     _message2.default.error("本单金额低于使用门槛，该券不可使用。");
                     return;
                 }
                 //判断是否是选择优惠券  //CC优惠券只能使用一个
-                if (q1 && !q1.checked && isNewRetailBCPos) {
-                    // 检查是否有已经选定优惠券 并且去除选定的优惠券
-                    this.currentMode.djqs.forEach(function (djq, index) {
-                        if (djq.checked) _this14.currentMode.djqs[index].checked = false;
+                // 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-------');
+            if (!q1.checked) {
+                this.checkList.forEach(function (ele, i) {
+                    if (ele.id === q1.id) {
+                        _this14.checkList.splice(i, 1);
+                    }
+                });
+            } else {
+                if (q1.discountPct > 0) {
+                    q1.amount = 0;
+                }
+                this.checkList.push(q1);
+            }
+            this.checkList.forEach(function (ele, i) {
+                if (ele.discountPct > 0) {
+                    if (ele.amount === 0) {
+                        console.log(ele.amount, _this14.currentMode.receivable, 'amount2222222222');
+                        ele.amount = (1 - ele.discountPct) * _this14.currentMode.receivable;
+                        console.log(ele.amount, _this14.currentMode.receivable, 'amount1111111111');
+                    }
+                }
+                sum = Math.Add(sum, ele.amount);
+            });
+            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);
+            var promoVoucher = {};
+            promoVoucher.boName = "Retail";
+            // 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 (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 _ref20 = element || {},
+                            couponCode = _ref20.couponCode,
+                            name = _ref20.name,
+                            tieredAmountResult = _ref20.tieredAmountResult,
+                            fromDate = _ref20.fromDate,
+                            dateMount = _ref20.dateMount,
+                            promoMethodEnum = _ref20.promoMethodEnum,
+                            discountPct = _ref20.discountPct,
+                            nominalAmount = _ref20.nominalAmount,
+                            promoId = _ref20.promoId,
+                            id = _ref20.id,
+                            doorsill = _ref20.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 _ref21 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref21.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) {
@@ -1602,6 +1789,7 @@ 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);
         }
     }, {
@@ -1644,16 +1832,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
-                var _enumController$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn16, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn15.settleStyleType, PayStyle = _enumController$getEn15.PayStyle;
+                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn16.settleStyleType, PayStyle = _enumController$getEn16.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1698,7 +1886,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref21.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1740,22 +1928,74 @@ 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), _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), _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);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this16 = this;
+        var _this19 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor8, this);
+        _initDefineProp(this, 'cardNo', _descriptor11, this);
 
-        _initDefineProp(this, 'balance', _descriptor9, this);
+        _initDefineProp(this, 'balance', _descriptor12, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor10, this);
+        _initDefineProp(this, 'exchangable', _descriptor13, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor11, this);
+        _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
 
         if (m) {
             this.id = m.ID;
@@ -1766,16 +2006,17 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref23 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref23.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
+            m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this16.cardNo = m.CardCode;
+                _this19.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this16.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this16.balance = _this16.rawbalance;
+                    _this19.balance = _this19.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -1798,7 +2039,7 @@ var Member = exports.Member = (_class5 = function () {
     }, {
         key: 'setMeStorageCardId',
         value: function setMeStorageCardId(v) {
-            this.meStorageCardId = v;
+            this.MeStorageCardId = v;
         }
     }, {
         key: 'setStorageCardNo',
@@ -1807,19 +2048,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor8 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor9 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor12 = _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);