tplus-components-touch 3.36.1 → 3.36.4

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, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
 
 var _mobx = require('mobx');
 
@@ -168,6 +168,7 @@ var SettlementStore = (_class = function () {
         (0, _classCallCheck3.default)(this, SettlementStore);
         this.paymode = null;
         this.dto = null;
+        this.dtoParams = null;
         this.member = null;
         this.brefund = false;
         this.bquick = false;
@@ -178,6 +179,46 @@ var SettlementStore = (_class = function () {
 
         _initDefineProp(this, 'updateMemberInfo', _descriptor2, this);
 
+        _initDefineProp(this, 'updateCurrentMode', _descriptor3, this);
+
+        _initDefineProp(this, 'updateCardInfo', _descriptor4, this);
+
+        this.handleCzkData = function (m) {
+            if (!m || !m.StorageCardNo) {
+                (0, _mobx.runInAction)(function () {
+                    _this2.paymode.currentMode.errinfo = "无效的会员卡号";
+                });
+            } else {
+                (0, _mobx.runInAction)(function () {
+                    _this2.paymode.currentMode.errinfo = "";
+                    _this2.paymode.currentMode.memberId = m.ID;
+                    _this2.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this2.brefund ? _this2.paymode.receivable : Math.max(_this2.paymode.receivable, 0));
+                    _this2.updateEvent();
+                    var message = '';
+                    var sum = (0, _reduce3.default)(_this2.paymode.thePaymodes, function (total, cur) {
+                        return total + cur.value;
+                    }, 0);
+                    // 对于卡不用判断会员的一些信息
+                    // if (global.CheckMemberStorageProcessorBlock ) {
+                    //     message= CheckMemberStorageProcessorBlock.execute(m);
+                    // }
+                    if (!String.isNullOrEmpty(message)) {
+                        _this2.paymode.currentMode.errinfo = message;
+                    } else if (_this2.checkReceived(_this2.paymode.currentMode, "balance")) {
+                        _this2.paymode.currentMode.errinfo = "余额不足";
+                    } else if (_this2.paymode.amount > 0 && parseFloat(_this2.paymode.amount) !== sum && _this2.paymode.currentMode.value == 0) {
+                        _this2.paymode.currentMode.errinfo = "实收金额必须录入";
+                    } else {
+                        // 查询成功后将焦点移入下一个输入框
+                        setTimeout(function () {
+                            var nextInput = document.querySelector('.czk .received .input');
+                            nextInput && nextInput.select();
+                        }, 300);
+                    }
+                });
+            }
+        };
+
         this.getCouponList = function (coupon_code) {
             var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn.PayStyle,
@@ -193,8 +234,6 @@ var SettlementStore = (_class = function () {
                 var promoVoucher = {};
                 _this2.paymode.clearDjqs();
                 _this2.paymode.reCalculationDjqs();
-                // promoVoucher.bizDate = dto.VoucherDate;
-                // promoVoucher.bizDate = new Date().getTime();
                 promoVoucher.coupon_code = coupon_code || "";
                 promoVoucher.boName = "Retail";
                 promoVoucher.voucherId = dto.ID;
@@ -281,11 +320,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 : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
+                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" && nominalAmount, promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
                             }
                         });
                         if (promoVoucher.coupon_code) {
@@ -308,14 +343,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;
@@ -383,10 +418,56 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x) {
-                return _ref3.apply(this, arguments);
+                return _ref2.apply(this, arguments);
             };
         }();
 
+        this.repeatStorageModal = function (content) {
+            return new _promise2.default(function (resolve, reject) {
+                _tplusComponentsTouch.ModalWraper.confirm({
+                    title: '',
+                    okText: '继续储值',
+                    className: 'repeat-modal',
+                    zIndex: 1007,
+                    content: content,
+                    onOk: function () {
+                        var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+                            var ret;
+                            return _regenerator2.default.wrap(function _callee2$(_context2) {
+                                while (1) {
+                                    switch (_context2.prev = _context2.next) {
+                                        case 0:
+                                            _context2.next = 2;
+                                            return _this2.saveMember();
+
+                                        case 2:
+                                            ret = _context2.sent;
+
+                                            if (ret === false) {
+                                                resolve(false);
+                                            } else {
+                                                resolve(true);
+                                            }
+
+                                        case 4:
+                                        case 'end':
+                                            return _context2.stop();
+                                    }
+                                }
+                            }, _callee2, _this2);
+                        }));
+
+                        return function onOk() {
+                            return _ref4.apply(this, arguments);
+                        };
+                    }(),
+                    onCancel: function onCancel() {
+                        resolve(false);
+                    }
+                });
+            });
+        };
+
         this.checkIntegralExchangeReturn = function (id) {
             return new _promise2.default(function (resolve, reject) {
                 (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -425,7 +506,7 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'init',
-        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data) {
+        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
             var _this3 = this;
 
             this.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
@@ -441,9 +522,15 @@ var SettlementStore = (_class = function () {
                     if (global.DealSingleRowAmountSettingProcessorBlock) {
                         global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
                     }
+
+                    var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
+                        PayStyle = _enumController$getEn4.PayStyle;
+
+                    var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
+
                     // 成交金额抹零
                     if (global.DealAmountSettingProcessorBlock) {
-                        global.DealAmountSettingProcessorBlock.execute(_this3.dto);
+                        global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
                     }
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
@@ -493,8 +580,8 @@ var SettlementStore = (_class = function () {
         value: function initByOriginReturn() {
             var _this5 = this;
 
-            var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn4.PayStyle;
+            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn5.PayStyle;
 
             var _ref5 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref5.isNewRetailBCPos;
@@ -516,7 +603,8 @@ var SettlementStore = (_class = function () {
                         authCode: detail.PaymentCode,
                         steadCashIntegral: detail.SteadCashIntegral,
                         overchargesAmount: detail.OverchargesAmount,
-                        boriginReturn: true
+                        boriginReturn: true,
+                        thirdPaymentReturnInfo: detail.ThirdPaymentReturnInfo
                     });
                     _this5.paymode.currentMode = newmode;
                     if (themode.paymentType == PayStyle.djq) {
@@ -531,23 +619,33 @@ var SettlementStore = (_class = function () {
                                     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);
+                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
                     _this5.paymode.thePaymodes.push(newmode);
                 }
             });
             (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
-                var balanceAmount = detail.Member.BalanceStorage;
-                balanceAmount = balanceAmount - detail.StoragePaymentAmount;
+                var balanceAmount = null;
+                var storageCardNo = null;
+                var meStorageCardId = null;
+                detail.DynamicPropertyKeys.forEach(function (ele, index) {
+                    if (ele === "mestoragecard") {
+                        balanceAmount = detail.DynamicPropertyValues[index].BalanceStorage - detail.StoragePaymentAmount;
+                        storageCardNo = detail.DynamicPropertyValues[index].StorageCardNo;
+                        meStorageCardId = detail.DynamicPropertyValues[index].MeStorageCardId;
+                    }
+                });
                 var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
-                    member: new Member(detail.Member),
-                    authCode: detail.Password,
+                    member: new Member(detail.Member ? detail.Member : null),
+                    authCode: detail.Password ? detail.Password : null,
                     balance: balanceAmount,
-                    boriginReturn: true
+                    boriginReturn: true,
+                    meStorageCardId: meStorageCardId ? meStorageCardId : detail.MeStorageCardId,
+                    storageCardNo: storageCardNo ? storageCardNo : detail.StorageCardNo
                 });
                 _this5.paymode.thePaymodes.push(newmode);
             });
@@ -562,7 +660,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'quickSettle',
         value: function quickSettle(key) {
-            this.addPay(key);
+            this.addPay(key, true);
         }
 
         //outer call
@@ -573,8 +671,8 @@ var SettlementStore = (_class = function () {
         value: function changeFocusAndAddPay(type) {
             var _this6 = this;
 
-            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn5.PayStyle;
+            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn6.PayStyle;
 
             this.paymode.currentFocus = type;
             if (this.paymode.currentMode) {
@@ -591,7 +689,7 @@ var SettlementStore = (_class = function () {
 
                     //抵现积分
                     (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
-                            Idmember: this.paymode.currentMode.member.id,
+                            Idmember: this.paymode.currentMode.memberId,
                             TotalTaxAmount: this.paymode.amount,
                             BalanceTaxAmount: this.paymode.currentMode.value
                         } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -620,7 +718,6 @@ var SettlementStore = (_class = function () {
 
             if ((0, _trim3.default)(v) === "") {
                 (0, _mobx.runInAction)(function () {
-                    _this7.paymode.currentMode.member = new Member(null);
                     _this7.paymode.currentMode.errinfo = "请输入储值卡";
                 });
                 return;
@@ -634,66 +731,98 @@ var SettlementStore = (_class = function () {
             var address = '';
             if (isNewRetailBCPos) {
                 // 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 _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);
-                        _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 = '';
-                            var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
-                                return total + cur.value;
-                            }, 0);
-                            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 && parseFloat(_this7.paymode.amount) !== sum && _this7.paymode.currentMode.value == 0) {
-                                _this7.paymode.currentMode.errinfo = "实收金额必须录入";
-                            } else {
-                                // 查询成功后将焦点移入下一个输入框
-                                var nextInput = document.querySelector('.czk .received .input');
-                                nextInput && nextInput.select();
+                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
+                return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
+                    var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
+                        var data, m;
+                        return _regenerator2.default.wrap(function _callee3$(_context3) {
+                            while (1) {
+                                switch (_context3.prev = _context3.next) {
+                                    case 0:
+                                        data = result.data;
+                                        m = data && data.length && data[0];
+
+                                        if (!(result && result.data.length)) {
+                                            _context3.next = 25;
+                                            break;
+                                        }
+
+                                        if (!(result.data.length === 1)) {
+                                            _context3.next = 14;
+                                            break;
+                                        }
+
+                                        if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
+                                            _context3.next = 10;
+                                            break;
+                                        }
+
+                                        _this7.paymode.updateCardInfo(m);
+                                        _this7.handleCzkData(m);
+                                        return _context3.abrupt('return', result.data);
+
+                                    case 10:
+                                        _context3.next = 12;
+                                        return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
+                                            var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
+                                            if (data1.enable) {
+                                                _this7.paymode.updateCardInfo(m);
+                                                _this7.handleCzkData(m);
+                                                return result1.data;
+                                            } else {
+                                                _message2.default.warn(data1.disableReason);
+                                            }
+                                        });
+
+                                    case 12:
+                                        _context3.next = 25;
+                                        break;
+
+                                    case 14:
+                                        if (!(result.data && result.data.length === 1)) {
+                                            _context3.next = 19;
+                                            break;
+                                        }
+
+                                        _this7.paymode.updateCardInfo(result.data[0]);
+                                        return _context3.abrupt('return', result.data);
+
+                                    case 19:
+                                        if (!(result.data && result.data.length > 1)) {
+                                            _context3.next = 23;
+                                            break;
+                                        }
+
+                                        return _context3.abrupt('return', result.data);
+
+                                    case 23:
+                                        _message2.default.warn('没有可用储值卡！');
+                                        return _context3.abrupt('return', false);
+
+                                    case 25:
+                                    case 'end':
+                                        return _context3.stop();
+                                }
                             }
-                        });
-                    }
-                });
+                        }, _callee3, _this7);
+                    }));
+
+                    return function (_x2) {
+                        return _ref8.apply(this, arguments);
+                    };
+                }()
+                // result.data.forEach((m) => {
+                //     if (m.CardTypeEnum === 'BALANCE_CARD') {
+                //         // 会员概念改为卡，把这些字段都放开
+                //         this.paymode.updateCardInfo(m);
+                //     }
+                // })
+                );
             } 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 _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 = "无效的会员卡号";
@@ -726,12 +855,13 @@ 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(promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
             var djq = {
                 code: promoCouponCode,
                 promoCouponCode: promoCouponCode,
                 name: name,
                 IsEnable: IsEnable,
+                nominalAmount: nominalAmount,
                 amount: amount,
                 doorsill: doorsill, //:"无门槛"
                 LastTS: LastTS,
@@ -755,8 +885,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setCurrentMode',
         value: function setCurrentMode(id, type, append) {
-            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn6.PayStyle;
+            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn7.PayStyle;
 
             var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
             if (mode) {
@@ -774,8 +904,8 @@ var SettlementStore = (_class = function () {
         value: function afterSetCurrentMode(type) {
             var _this8 = this;
 
-            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn7.PayStyle;
+            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn8.PayStyle;
 
             if (type == PayStyle.djq) {
                 this.paymode.calcDjqValue();
@@ -789,7 +919,7 @@ var SettlementStore = (_class = function () {
                 }
 
                 (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
-                        Idmember: this.paymode.currentMode.member.id,
+                        Idmember: this.paymode.currentMode.memberId,
                         TotalTaxAmount: this.paymode.amount,
                         BalanceTaxAmount: this.paymode.amount
                     } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -810,23 +940,27 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'genNewMode',
-        value: function genNewMode(type, notwithm, v) {
-            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn8.PayStyle;
+        value: function genNewMode(type, notwithm, v, isQuick) {
+            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn9.PayStyle;
 
             var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
             var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
+            var memberId = this.member && this.member.ID ? this.member.ID : null;
             var mode = (0, _mobx.observable)({
                 paymethodId: this.paymode.counter,
                 name: themode.name,
                 exchangeRate: themode.exchangeRate,
                 calDirection: themode.calDirection,
+                thridPayment: themode.thridPayment,
                 value: value,
                 value2: (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
                 value3: value,
                 order: this.paymode.thePaymodes.length + 1,
                 paymentType: type,
                 djqs: [],
+                card: null,
+                memberId: !notwithm ? memberId : null,
                 member: new Member(!notwithm ? this.member : null),
                 authCode: '',
                 steadCashIntegral: null,
@@ -834,9 +968,9 @@ var SettlementStore = (_class = function () {
                 maxamount: this.paymode.amount
             });
             if (type == PayStyle.hyczk) {
-                if (!mode.member.id || !mode.member.StorageCardNo) {
+                if (!mode.storageCardNo) {
                     (0, _mobx.runInAction)(function () {
-                        mode.errinfo = '未录入储值卡';
+                        mode.errinfo = '未录入手机号或储值卡号';
                     });
                 } else if (this.checkReceived(mode, "balance")) {
                     (0, _mobx.runInAction)(function () {
@@ -847,7 +981,7 @@ var SettlementStore = (_class = function () {
             if (type == PayStyle.hyczk || type == PayStyle.jfdx || type == PayStyle.djq) {
                 this.setMaxAmount(type, mode);
             }
-            console.log(mode);
+            console.log('\u5F53\u524D\u64CD\u4F5C\u7ED3\u7B97\u65B9\u5F0F\u4FE1\u606F:' + mode);
             return mode;
         }
     }, {
@@ -855,8 +989,8 @@ var SettlementStore = (_class = function () {
         value: function setMaxAmount(type, mode) {
             var _this9 = this;
 
-            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn9.PayStyle;
+            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn10.PayStyle;
 
             var sum = 0;
             if (type == PayStyle.hyczk) {
@@ -884,15 +1018,6 @@ var SettlementStore = (_class = function () {
         key: 'changeFocusOnly',
         value: function changeFocusOnly(type) {
             this.paymode.currentFocus = type;
-            // 获取焦点时带入剩余的值
-            // let mode=_find(this.paymode.thePaymodes,{'paymentType':type});
-            // if(mode && this.isIntegralExchange){
-            //     const shouldSetValue =getFixedNumber(parseFloat(this.paymode.receivable) + parseFloat(mode.value));
-            //     mode.value = shouldSetValue;
-            //     mode.value2 = getFixedNumber(mode.calDirection=="88"?shouldSetValue / mode.exchangeRate:(shouldSetValue * mode.exchangeRate));
-            //     mode.value3 = shouldSetValue;
-            //     this.paymode.calcReserved();
-            // }
         }
     }, {
         key: 'changeClickFocusOnly',
@@ -932,8 +1057,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'addPayDirectly',
         value: function addPayDirectly(pay) {
-            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn10.PayStyle;
+            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn11.PayStyle;
 
             if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
                 var pos = this.paymode.thePaymodes.length;
@@ -950,9 +1075,9 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addPay',
-        value: function addPay(type) {
-            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn11.PayStyle;
+        value: function addPay(type, isQuick) {
+            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn12.PayStyle;
 
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
@@ -961,15 +1086,14 @@ var SettlementStore = (_class = function () {
                 });
                 pos = index == -1 ? pos : index + 1;
             }
-            // this.paymode.thePaymodes.push(this.genNewMode(type) );
-            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
+            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
             this.paymode.calcReserved();
         }
     }, {
         key: 'delPay',
         value: function delPay(index) {
-            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn12.PayStyle;
+            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn13.PayStyle;
 
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId === index;
@@ -977,83 +1101,179 @@ var SettlementStore = (_class = function () {
             this.paymode.currentFocus = -1;
             this.paymode.calcReserved();
         }
+
+        // 获取储值是否重复, 在commit方法中使用
+
+    }, {
+        key: 'findStorageBillValidate',
+        value: function findStorageBillValidate() {
+            var _this10 = this;
+
+            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle;
+
+            (0, _mobx.runInAction)(function () {
+                _this10.dto.StorageMutiSettleDetails = [];
+                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
+                    return parseFloat(mode.value) != 0;
+                }) : _this10.paymode.thePaymodes;
+                (0, _each3.default)(thePaymodes, function (mode) {
+                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+
+                    var value = parseFloat(mode.value);
+                    var giveChange = null;
+                    if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
+                        value = Math.Add(value, _this10.paymode.receivable);
+                        giveChange = Math.abs(_this10.paymode.receivable);
+                    }
+                    _this10.dto.StorageMutiSettleDetails.push({
+                        Code: mode.paymethodId,
+                        StorageAmount: value,
+                        GiveChange: giveChange,
+                        IdsettleStyle: themode.idSettleStyle,
+                        IdbankAccount: themode.idBankAccount,
+                        PaymentCode: mode.authCode,
+                        DynamicPropertyKeys: [],
+                        DynamicPropertyValues: [],
+                        DataSource: { Id: _this10.dataSource }
+                    });
+                });
+            });
+            return (0, _tplusApi.ccApi)((0, _extends3.default)({}, this.dto), '/marketingtool/Storage/findStorageBillValidate', false, false);
+        }
+
+        //判断是否重复弹框
+
     }, {
         key: 'commit',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
-                var _ref11, isNewRetailBCPos;
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
+                var status, paylist, ret, _ref10, _ref10$data, code, returnMsg, state, ret1, ret2;
 
-                return _regenerator2.default.wrap(function _callee2$(_context2) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context2.prev = _context2.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
                                 console.log('settlementStore.commit开始，参数：' + bTest);
 
                                 if (!bTest) {
-                                    _context2.next = 3;
+                                    _context4.next = 3;
                                     break;
                                 }
 
-                                return _context2.abrupt('return', _promise2.default.resolve(true));
+                                return _context4.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
-                                _context2.prev = 4;
+                                status = this.type;
+                                _context4.prev = 4;
+                                paylist = this.paymode.thePaymodes.filter(function (v) {
+                                    return !!v.thridPayment && Math.abs(v.value) > 0;
+                                }) || [];
+
+                                if (!(paylist && paylist.length > 1)) {
+                                    _context4.next = 9;
+                                    break;
+                                }
+
+                                _message2.default.warn('二开支付目前仅支持单一结算方式。');
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                                if (!(this.type == 1)) {
-                                    _context2.next = 10;
+                            case 9:
+                                if (!(status == 1)) {
+                                    _context4.next = 30;
                                     break;
                                 }
 
-                                _context2.next = 8;
-                                return this.saveMember();
+                                _context4.next = 12;
+                                return this.findStorageBillValidate();
 
-                            case 8:
-                                _context2.next = 18;
-                                break;
+                            case 12:
+                                ret = _context4.sent;
+                                _ref10 = ret || {}, _ref10$data = _ref10.data;
+                                _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
+                                code = _ref10$data.code, returnMsg = _ref10$data.returnMsg;
 
-                            case 10:
-                                if (!isNewRetailBCPos) {
-                                    _context2.next = 13;
+                                if (!(code && code == 10001)) {
+                                    _context4.next = 24;
                                     break;
                                 }
 
-                                _context2.next = 13;
+                                _context4.next = 19;
+                                return this.repeatStorageModal(returnMsg);
+
+                            case 19:
+                                state = _context4.sent;
+
+                                if (!(state === false)) {
+                                    _context4.next = 22;
+                                    break;
+                                }
+
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
+
+                            case 22:
+                                _context4.next = 28;
+                                break;
+
+                            case 24:
+                                _context4.next = 26;
+                                return this.saveMember();
+
+                            case 26:
+                                ret1 = _context4.sent;
+
+                                if (ret1 === false) {
+                                    _promise2.default.resolve(false);
+                                }
+
+                            case 28:
+                                _context4.next = 39;
+                                break;
+
+                            case 30:
+                                _context4.next = 32;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
-                            case 13:
-                                _context2.next = 15;
+                            case 32:
+                                _context4.next = 34;
                                 return this.save();
 
-                            case 15:
-                                if (!isNewRetailBCPos) {
-                                    _context2.next = 18;
+                            case 34:
+                                ret2 = _context4.sent;
+
+                                if (!(ret2 === false)) {
+                                    _context4.next = 37;
                                     break;
                                 }
 
-                                _context2.next = 18;
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
+
+                            case 37:
+                                _context4.next = 39;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
-                            case 18:
-                                return _context2.abrupt('return', _promise2.default.resolve(true));
+                            case 39:
+                                return _context4.abrupt('return', _promise2.default.resolve(true));
 
-                            case 21:
-                                _context2.prev = 21;
-                                _context2.t0 = _context2['catch'](4);
+                            case 42:
+                                _context4.prev = 42;
+                                _context4.t0 = _context4['catch'](4);
 
-                                console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
-                                return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
+                                console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
+                                //其他支付失败时,处理二开支付情况。
+                                this.thirdPayRefund(status == 1 ? 2 : 1);
+                                return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
 
-                            case 25:
+                            case 47:
                             case 'end':
-                                return _context2.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee2, this, [[4, 21]]);
+                }, _callee4, this, [[4, 42]]);
             }));
 
-            function commit(_x2) {
-                return _ref10.apply(this, arguments);
+            function commit(_x3) {
+                return _ref9.apply(this, arguments);
             }
 
             return commit;
@@ -1066,100 +1286,155 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'saveMember',
-        value: function saveMember() {
-            var _this10 = this;
+        value: function () {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _this11 = this;
 
-            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn13.PayStyle;
+                var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
 
-            (0, _mobx.runInAction)(function () {
-                _this10.dto.StorageMutiSettleDetails = [];
-                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
-                    return parseFloat(mode.value) != 0;
-                }) : _this10.paymode.thePaymodes;
-                (0, _each3.default)(thePaymodes, function (mode) {
-                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
+                    while (1) {
+                        switch (_context5.prev = _context5.next) {
+                            case 0:
+                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle, TradeType = _enumController$getEn15.TradeType;
 
-                    var value = parseFloat(mode.value);
-                    var giveChange = null;
-                    if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
-                        value = Math.Add(value, _this10.paymode.receivable);
-                        giveChange = Math.abs(_this10.paymode.receivable);
+                                (0, _mobx.runInAction)(function () {
+                                    _this11.dto.StorageMutiSettleDetails = [];
+                                    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) {
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+
+                                        var value = parseFloat(mode.value);
+                                        var giveChange = null;
+                                        if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
+                                            value = Math.Add(value, _this11.paymode.receivable);
+                                            giveChange = Math.abs(_this11.paymode.receivable);
+                                        }
+                                        _this11.dto.StorageMutiSettleDetails.push({
+                                            Code: mode.paymethodId,
+                                            StorageAmount: value,
+                                            GiveChange: giveChange,
+                                            IdsettleStyle: themode.idSettleStyle,
+                                            IdbankAccount: themode.idBankAccount,
+                                            PaymentCode: mode.authCode,
+                                            DynamicPropertyKeys: [],
+                                            DynamicPropertyValues: [],
+                                            DataSource: { Id: _this11.dataSource },
+                                            ThirdPaymentInfo: themode.thridPayment || null,
+                                            ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
+                                        });
+                                    });
+                                });
+                                // cc结算调用
+                                IPMSG = {};
+
+                                if (!!window.localStorage.IPMSG) {
+                                    IPMSG = JSON.parse(window.localStorage.IPMSG);
+                                }
+                                dtoParams = this.dto;
+                                //处理存在二开支付情况
+
+                                payList = dtoParams.StorageMutiSettleDetails.filter(function (v) {
+                                    return v.ThirdPaymentInfo;
+                                });
+
+                                if (!(payList && payList.length > 0)) {
+                                    _context5.next = 19;
+                                    break;
+                                }
+
+                                payment = payList[0];
+                                tradeType = payment && payment.StorageAmount > 0 ? TradeType.PAY : TradeType.REFUND;
+                                _context5.next = 11;
+                                return this.thirdPay(2, payment, tradeType, dtoParams);
+
+                            case 11:
+                                ret = _context5.sent;
+                                _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
+
+                                if (!(type === true)) {
+                                    _context5.next = 17;
+                                    break;
+                                }
+
+                                dtoParams = data;
+                                _context5.next = 19;
+                                break;
+
+                            case 17:
+                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
+                                return _context5.abrupt('return', false);
+
+                            case 19:
+                                this.dtoParams = dtoParams;
+                                console.log('储值结算信息:', dtoParams);
+                                return _context5.abrupt('return', (0, _tplusApi.tApi)({ dto: dtoParams }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
+                                    _this11.handlePrint(resp);
+                                }));
+
+                            case 22:
+                            case 'end':
+                                return _context5.stop();
+                        }
                     }
-                    _this10.dto.StorageMutiSettleDetails.push({
-                        Code: mode.paymethodId,
-                        StorageAmount: value,
-                        GiveChange: giveChange,
-                        IdsettleStyle: themode.idSettleStyle,
-                        IdbankAccount: themode.idBankAccount,
-                        PaymentCode: mode.authCode,
-                        DynamicPropertyKeys: [],
-                        DynamicPropertyValues: [],
-                        DataSource: { Id: _this10.dataSource }
-                    });
-                });
-            });
-            // cc结算调用
-            var IPMSG = {};
-            if (!!window.localStorage.IPMSG) {
-                IPMSG = JSON.parse(window.localStorage.IPMSG);
+                }, _callee5, this);
+            }));
+
+            function saveMember() {
+                return _ref11.apply(this, arguments);
             }
-            return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                _this10.handlePrint(resp);
-            });
-        }
+
+            return saveMember;
+        }()
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-                var _this11 = this;
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                var _this12 = this;
 
-                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, payment, tradeType, ret, _ref14, type, data, msg, code;
 
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+                return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
-                        switch (_context3.prev = _context3.next) {
+                        switch (_context6.prev = _context6.next) {
                             case 0:
-                                _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
+                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle, TradeType = _enumController$getEn16.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this11.dto.RetailPaymentDetails = [];
-                                    _this11.dto.RetailStorageDetails = [];
-                                    _this11.dto.RetailCouponDetails = [];
+                                    _this12.dto.RetailPaymentDetails = [];
+                                    _this12.dto.RetailStorageDetails = [];
+                                    _this12.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) {
+                                    var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this11.paymode.thePaymodes;
+                                    }) : _this12.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this12.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({
+                                            _this12.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
-                                                MeStorageCardId: MeStorageCardId,
+                                                MeStorageCardId: mode.meStorageCardId,
                                                 StoragePaymentAmount: mode.value,
                                                 IsOrigReturn: false,
                                                 BalanceStorage: mode.balance,
-                                                Idmember: mode.member.id,
+                                                Idmember: mode.memberId,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
+                                                DataSource: { Id: _this12.dataSource },
                                                 Password: mode.authCode
                                             });
                                         } else {
                                             var value = parseFloat(mode.value);
                                             var giveChange = null;
-                                            if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
-                                                value = Math.Add(value, _this11.paymode.receivable);
-                                                giveChange = Math.abs(_this11.paymode.receivable);
+                                            if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
+                                                value = Math.Add(value, _this12.paymode.receivable);
+                                                giveChange = Math.abs(_this12.paymode.receivable);
                                             }
-                                            _this11.dto.RetailPaymentDetails.push({
+                                            _this12.dto.RetailPaymentDetails.push({
                                                 Code: mode.paymethodId,
                                                 OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
                                                 Amount: value,
@@ -1173,71 +1448,44 @@ var SettlementStore = (_class = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource }
+                                                DataSource: { Id: _this12.dataSource },
+                                                ThirdPaymentInfo: themode.thridPayment || null,
+                                                ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
-                                                    _this11.dto.RetailCouponDetails.push({
+                                                (0, _each3.default)(_this12.paymode.checkList && _this12.paymode.checkList.length ? _this12.paymode.checkList : mode.djqs, function (djq) {
+                                                    _this12.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
                                                         EnableAmount: djq.doorsill,
                                                         CouponTitle: djq.name,
-                                                        IdMember: djq.UMemberID ? mode.member.id : null,
+                                                        IdMember: djq.UMemberID ? mode.memberId : null,
                                                         LastTS: djq.LastTS,
                                                         PromotionId: djq.promoId,
                                                         PromotionRuleId: djq.promoRuleId,
                                                         PromoCouponAllocatedId: djq.id,
-                                                        DataSource: { Id: _this11.dataSource }
+                                                        DataSource: { Id: _this12.dataSource }
                                                     });
                                                 });
                                             }
                                         }
                                     });
-
-                                    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) {
-                                            // 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,
-                                                Amount: czkSum,
-                                                IdsettleStyle: themode.idSettleStyle,
-                                                IdbankAccount: themode.idBankAccount,
-                                                DynamicPropertyKeys: [],
-                                                DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
-                                                RetailStorageDetails: _this11.dto.RetailStorageDetails
-                                            });
-                                        } else {
-                                            _this11.dto.RetailPaymentDetails.push({
-                                                Code: _this11.paymode.counter,
-                                                OrigAmount: czkSum,
-                                                Amount: czkSum,
-                                                IdsettleStyle: themode.idSettleStyle,
-                                                IdbankAccount: themode.idBankAccount,
-                                                DynamicPropertyKeys: [],
-                                                DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource }
-                                            });
-                                        }
-                                        _this11.dto.Idmember = Idmember;
+                                    if (_this12.dto.RetailStorageDetails.length > 0) {
+                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
+                                        _this12.dto.RetailPaymentDetails.push({
+                                            Code: _this12.paymode.counter,
+                                            OrigAmount: czkSum,
+                                            Amount: czkSum,
+                                            IdsettleStyle: themode.idSettleStyle,
+                                            IdbankAccount: themode.idBankAccount,
+                                            DynamicPropertyKeys: [],
+                                            DynamicPropertyValues: [],
+                                            DataSource: { Id: _this12.dataSource },
+                                            RetailStorageDetails: _this12.dto.RetailStorageDetails
+                                        });
                                     }
                                 });
-                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
-
-                                console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
-
-                                if (!isNewRetailBCPos) {
-                                    _context3.next = 20;
-                                    break;
-                                }
-
+                                console.log('\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
                                 // cc结算调用
                                 IPMSG = {};
 
@@ -1245,65 +1493,271 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _context3.t1 = this.dto.IdbusiType == 37;
+                                _context6.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context3.t1) {
-                                    _context3.next = 13;
+                                if (!_context6.t1) {
+                                    _context6.next = 11;
                                     break;
                                 }
 
-                                _context3.next = 12;
+                                _context6.next = 10;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 12:
-                                _context3.t1 = _context3.sent;
+                            case 10:
+                                _context6.t1 = _context6.sent;
 
-                            case 13:
-                                _context3.t0 = _context3.t1;
+                            case 11:
+                                _context6.t0 = _context6.t1;
 
-                                if (_context3.t0) {
-                                    _context3.next = 16;
+                                if (_context6.t0) {
+                                    _context6.next = 14;
                                     break;
                                 }
 
-                                _context3.t0 = this.dto.IdbusiType != 37;
+                                _context6.t0 = this.dto.IdbusiType != 37;
 
-                            case 16:
-                                if (!_context3.t0) {
-                                    _context3.next = 18;
+                            case 14:
+                                if (!_context6.t0) {
+                                    _context6.next = 33;
                                     break;
                                 }
 
-                                return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    _this11.setDtoID(resp.ID);
-                                    _this11.paymode.checkList = [];
-                                    _this11.billID = resp.ID;
-                                }));
+                                dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
+                                //处理存在二开支付情况
 
-                            case 18:
-                                _context3.next = 21;
+                                payList = dtoParams.RetailPaymentDetails.filter(function (v) {
+                                    return v.ThirdPaymentInfo;
+                                });
+
+                                if (!(payList && payList.length > 0)) {
+                                    _context6.next = 30;
+                                    break;
+                                }
+
+                                payment = payList[0];
+                                tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
+                                _context6.next = 22;
+                                return this.thirdPay(1, payment, tradeType, dtoParams);
+
+                            case 22:
+                                ret = _context6.sent;
+                                _ref14 = ret || {}, type = _ref14.type, data = _ref14.data, msg = _ref14.msg, code = _ref14.code;
+
+                                if (!(type === true)) {
+                                    _context6.next = 28;
+                                    break;
+                                }
+
+                                dtoParams = data;
+                                _context6.next = 30;
                                 break;
 
-                            case 20:
-                                return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
-                                    _this11.setDtoID(resp.ID);
-                                    _this11.billID = resp.ID;
+                            case 28:
+                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
+                                return _context6.abrupt('return', false);
+
+                            case 30:
+                                this.dtoParams = dtoParams;
+                                console.log('结算信息:', dtoParams);
+                                return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
+                                    var _ref15 = resp || {},
+                                        ID = _ref15.ID;
+
+                                    _this12.setDtoID(ID);
+                                    _this12.billID = ID;
+                                    _this12.paymode.checkList = [];
                                 }));
 
-                            case 21:
+                            case 33:
                             case 'end':
-                                return _context3.stop();
+                                return _context6.stop();
                         }
                     }
-                }, _callee3, this);
+                }, _callee6, this);
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
         }()
+
+        //裁剪二开支付数据
+
+    }, {
+        key: 'removeThirdPayDto',
+        value: function removeThirdPayDto(dto) {
+            var data = (0, _extends3.default)({}, dto);
+            delete data['DynamicPropertyKeys'];
+            delete data['DynamicPropertyValues'];
+            return data;
+        }
+
+        /** 
+         * 二开支付
+         * vType：1零售单、2储值单
+         * payment：结算方式
+         * trade：00表示结算、02表示退款
+         * dto：结算数据集合
+        */
+
+    }, {
+        key: 'thirdPay',
+        value: function () {
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
+                var cto, params, ret, _ref17, Code, _Message, Result, _ref18, ThirdPaymentReturnInfo;
+
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                    while (1) {
+                        switch (_context7.prev = _context7.next) {
+                            case 0:
+                                _context7.prev = 0;
+                                cto = this.removeThirdPayDto(dto);
+                                params = { VoucherType: vType, Payment: payment, TradeType: trade, dto: cto };
+
+                                console.log('刷卡信息:', (0, _stringify2.default)(params));
+                                _context7.next = 6;
+                                return new _promise2.default(function (resolve, reject) {
+                                    _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
+                                        return resolve(res);
+                                    });
+                                });
+
+                            case 6:
+                                ret = _context7.sent;
+
+                                console.log('刷卡返回信息:', ret);
+                                ret = JSON.parse(ret);
+                                _ref17 = ret || {}, Code = _ref17.Code, _Message = _ref17.Message, Result = _ref17.Result;
+
+                                if (!(Code > 0)) {
+                                    _context7.next = 14;
+                                    break;
+                                }
+
+                                return _context7.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
+
+                            case 14:
+                                if (!(trade == '00')) {
+                                    _context7.next = 20;
+                                    break;
+                                }
+
+                                _ref18 = Result || {}, ThirdPaymentReturnInfo = _ref18.ThirdPaymentReturnInfo;
+
+                                if (vType == 1) {
+                                    dto.RetailPaymentDetails.forEach(function (v) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.Amount) > 0) {
+                                            v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
+                                        }
+                                    });
+                                } else if (vType == 2) {
+                                    dto.StorageMutiSettleDetails.forEach(function (v) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.StorageAmount) > 0) {
+                                            v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
+                                        }
+                                    });
+                                }
+                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+
+                            case 20:
+                                if (!(trade == '02')) {
+                                    _context7.next = 22;
+                                    break;
+                                }
+
+                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+
+                            case 22:
+                                _context7.next = 27;
+                                break;
+
+                            case 24:
+                                _context7.prev = 24;
+                                _context7.t0 = _context7['catch'](0);
+                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0, code: '9999' });
+
+                            case 27:
+                            case 'end':
+                                return _context7.stop();
+                        }
+                    }
+                }, _callee7, this, [[0, 24]]);
+            }));
+
+            function thirdPay(_x4, _x5, _x6, _x7) {
+                return _ref16.apply(this, arguments);
+            }
+
+            return thirdPay;
+        }()
+
+        //二开支付强制退款情况
+
+    }, {
+        key: 'thirdPayRefund',
+        value: function () {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
+                var _this13 = this;
+
+                var dto, pay, payment, _enumController$getEn17, TradeType;
+
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
+                    while (1) {
+                        switch (_context9.prev = _context9.next) {
+                            case 0:
+                                dto = type == 1 ? this.dtoParams.RetailPaymentDetails : this.dtoParams.StorageMutiSettleDetails;
+                                pay = dto && dto.filter(function (v) {
+                                    return v.ThirdPaymentInfo;
+                                });
+
+                                if (pay && pay.length > 0) {
+                                    setTimeout(function () {
+                                        _message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
+                                    }, 1000);
+                                    payment = pay[0];
+                                    _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
+
+                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                                        var ret, _ref21, msg;
+
+                                        return _regenerator2.default.wrap(function _callee8$(_context8) {
+                                            while (1) {
+                                                switch (_context8.prev = _context8.next) {
+                                                    case 0:
+                                                        _context8.next = 2;
+                                                        return _this13.thirdPay(type, payment, TradeType.REFUND, dto);
+
+                                                    case 2:
+                                                        ret = _context8.sent;
+                                                        _ref21 = ret || {}, msg = _ref21.msg;
+
+                                                        console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
+
+                                                    case 5:
+                                                    case 'end':
+                                                        return _context8.stop();
+                                                }
+                                            }
+                                        }, _callee8, _this13);
+                                    })), 4500);
+                                }
+
+                            case 3:
+                            case 'end':
+                                return _context9.stop();
+                        }
+                    }
+                }, _callee9, this);
+            }));
+
+            function thirdPayRefund(_x8) {
+                return _ref19.apply(this, arguments);
+            }
+
+            return thirdPayRefund;
+        }()
     }, {
         key: 'setDtoID',
         value: function setDtoID(id) {
@@ -1312,35 +1766,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context10.prev = _context10.next) {
                             case 0:
-                                _context4.prev = 0;
-                                _context4.t0 = _promise2.default;
-                                _context4.next = 4;
+                                _context10.prev = 0;
+                                _context10.t0 = _promise2.default;
+                                _context10.next = 4;
                                 return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
 
                             case 4:
-                                _context4.t1 = _context4.sent;
-                                return _context4.abrupt('return', _context4.t0.resolve.call(_context4.t0, _context4.t1));
+                                _context10.t1 = _context10.sent;
+                                return _context10.abrupt('return', _context10.t0.resolve.call(_context10.t0, _context10.t1));
 
                             case 8:
-                                _context4.prev = 8;
-                                _context4.t2 = _context4['catch'](0);
-                                return _context4.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context10.prev = 8;
+                                _context10.t2 = _context10['catch'](0);
+                                return _context10.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context4.stop();
+                                return _context10.stop();
                         }
                     }
-                }, _callee4, this, [[0, 8]]);
+                }, _callee10, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref15.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1366,99 +1820,131 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
-                var _ref17, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
+                var _ref24, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
+                return _regenerator2.default.wrap(function _callee11$(_context11) {
                     while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context11.prev = _context11.next) {
                             case 0:
-                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
-                                _context5.prev = 1;
+                                _ref24 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref24.isNewRetailBCPos;
+                                _context11.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context5.next = 19;
+                                    _context11.next = 33;
                                     break;
                                 }
 
                                 cook1 = this.getAllCookies()['errorPwd'];
                                 cook2 = cook1 && JSON.parse(cook1);
                                 message = '密码输入错误';
-                                memberId = this.paymode.currentMode.member.MeStorageCardId;
+                                memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context5.next = 12;
+                                    _context11.next = 12;
                                     break;
                                 }
 
-                                if (!cook2.hasOwnProperty(memberId + "")) {
-                                    _context5.next = 12;
+                                if (!cook2.hasOwnProperty(memberStorageId + "")) {
+                                    _context11.next = 12;
                                     break;
                                 }
 
-                                if (!(cook2[memberId] > 3)) {
-                                    _context5.next = 12;
+                                if (!(cook2[memberStorageId] > 3)) {
+                                    _context11.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context5.abrupt('return', _promise2.default.resolve(message));
+                                return _context11.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
-                                _context5.next = 14;
-                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
+                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
+                                result = null;
 
-                            case 14:
-                                result = _context5.sent;
+                                if (!(cardTypeEnum === 'BALANCE_CARD')) {
+                                    _context11.next = 20;
+                                    break;
+                                }
+
+                                _context11.next = 17;
+                                return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
+
+                            case 17:
+                                result = _context11.sent;
+                                _context11.next = 29;
+                                break;
+
+                            case 20:
+                                if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
+                                    _context11.next = 26;
+                                    break;
+                                }
+
+                                _context11.next = 23;
+                                return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+
+                            case 23:
+                                result = _context11.sent;
+                                _context11.next = 29;
+                                break;
 
+                            case 26:
+                                _context11.next = 28;
+                                return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+
+                            case 28:
+                                result = _context11.sent;
+
+                            case 29:
                                 if (!result.data) {
                                     if (cook2) {
-                                        if (cook2.hasOwnProperty(memberId + "")) {
-                                            count = cook2[memberId];
+                                        if (cook2.hasOwnProperty(memberStorageId + "")) {
+                                            count = cook2[memberStorageId];
 
-                                            cook2[memberId] = count + 1;
+                                            cook2[memberStorageId] = count + 1;
                                         } else {
-                                            cook2[memberId] = 1;
+                                            cook2[memberStorageId] = 1;
                                         }
                                     } else {
                                         cook2 = {};
-                                        cook2[memberId] = 1;
+                                        cook2[memberStorageId] = 1;
                                     }
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context11.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 19:
-                                _context5.next = 21;
+                            case 33:
+                                _context11.next = 35;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
-                            case 21:
-                                _result = _context5.sent;
-                                return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                            case 35:
+                                _result = _context11.sent;
+                                return _context11.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 23:
-                                _context5.next = 28;
+                            case 37:
+                                _context11.next = 42;
                                 break;
 
-                            case 25:
-                                _context5.prev = 25;
-                                _context5.t0 = _context5['catch'](1);
-                                return _context5.abrupt('return', "failed");
+                            case 39:
+                                _context11.prev = 39;
+                                _context11.t0 = _context11['catch'](1);
+                                return _context11.abrupt('return', "failed");
 
-                            case 28:
+                            case 42:
                             case 'end':
-                                return _context5.stop();
+                                return _context11.stop();
                         }
                     }
-                }, _callee5, this, [[1, 25]]);
+                }, _callee11, this, [[1, 39]]);
             }));
 
-            function validePwd(_x3) {
-                return _ref16.apply(this, arguments);
+            function validePwd(_x9) {
+                return _ref23.apply(this, arguments);
             }
 
             return validePwd;
@@ -1468,7 +1954,7 @@ var SettlementStore = (_class = function () {
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this12 = this;
+        var _this14 = this;
 
         return function (newPass, newPassConfirm) {
             if (!newPass || !newPassConfirm) {
@@ -1480,7 +1966,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this12.member.ID,
+                meMemberId: _this14.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1494,40 +1980,133 @@ var SettlementStore = (_class = function () {
 }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this13 = this;
+        var _this15 = this;
 
         return function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context12.prev = _context12.next) {
                             case 0:
-                                _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context6.next = 3;
-                                return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
+                                _getLoginInfo = _this15.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
+                                _context12.next = 3;
+                                return (0, _tplusApi.tApi)({ Idmember: _this15.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context6.sent;
+                                resp = _context12.sent;
 
                                 _this.member = resp;
-                                _this.paymode.currentMode.member.setStorageCardNo(resp.StorageCardNo);
-                                return _context6.abrupt('return', _promise2.default.resolve(resp));
+                                _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
+                                return _context12.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context6.stop();
+                                return _context12.stop();
+                        }
+                    }
+                }, _callee12, _this15);
+            }));
+
+            return function (_x10) {
+                return _ref25.apply(this, arguments);
+            };
+        }();
+    }
+}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this16 = this;
+
+        return function () {
+            var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
+                var result;
+                return _regenerator2.default.wrap(function _callee13$(_context13) {
+                    while (1) {
+                        switch (_context13.prev = _context13.next) {
+                            case 0:
+                                _context13.next = 2;
+                                return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
+
+                            case 2:
+                                result = _context13.sent;
+
+                                if (!(result && result.data.length)) {
+                                    _context13.next = 20;
+                                    break;
+                                }
+
+                                if (!(result.data.length === 1)) {
+                                    _context13.next = 9;
+                                    break;
+                                }
+
+                                _this16.paymode.updateCardInfo(result.data[0]);
+                                return _context13.abrupt('return', result.data);
+
+                            case 9:
+                                if (!(result.data && result.data.length === 1)) {
+                                    _context13.next = 14;
+                                    break;
+                                }
+
+                                _this16.paymode.updateCardInfo(result.data[0]);
+                                return _context13.abrupt('return', result.data);
+
+                            case 14:
+                                if (!(result.data && result.data.length > 1)) {
+                                    _context13.next = 18;
+                                    break;
+                                }
+
+                                return _context13.abrupt('return', result.data);
+
+                            case 18:
+                                _message2.default.warn('没有可用储值卡！');
+                                return _context13.abrupt('return', false);
+
+                            case 20:
+                            case 'end':
+                                return _context13.stop();
                         }
                     }
-                }, _callee6, _this13);
+                }, _callee13, _this16);
             }));
 
-            return function (_x4) {
-                return _ref18.apply(this, arguments);
+            return function (_x11) {
+                return _ref26.apply(this, arguments);
             };
         }();
     }
+}), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this17 = this;
+
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
+            var address, result;
+            return _regenerator2.default.wrap(function _callee14$(_context14) {
+                while (1) {
+                    switch (_context14.prev = _context14.next) {
+                        case 0:
+                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this17.paymode.currentMode.storageCardNo;
+                            _context14.next = 3;
+                            return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
+
+                        case 3:
+                            result = _context14.sent;
+
+                            _this17.paymode.updateCardInfo(result.data);
+
+                        case 5:
+                        case 'end':
+                            return _context14.stop();
+                    }
+                }
+            }, _callee14, _this17);
+        }));
+    }
 }), _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 () {
@@ -1542,15 +2121,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor3, this);
+        _initDefineProp(this, 'currentFocus', _descriptor5, this);
 
-        _initDefineProp(this, 'received', _descriptor4, this);
+        _initDefineProp(this, 'received', _descriptor6, this);
 
-        _initDefineProp(this, 'receivable', _descriptor5, this);
+        _initDefineProp(this, 'receivable', _descriptor7, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor6, this);
+        _initDefineProp(this, 'paymodes', _descriptor8, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor7, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
+
+        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
+
+        _initDefineProp(this, 'balance', _descriptor11, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1559,11 +2142,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor8, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor12, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor9, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor13, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor10, this);
+        _initDefineProp(this, 'addDjqs', _descriptor14, this);
     }
     // @observable store = null;
 
@@ -1599,10 +2182,30 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.received = (0, _utils.getFixedNumber)(sum);
             this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
+    }, {
+        key: 'updateMemberStorageCardNo',
+        value: function updateMemberStorageCardNo(storageCardNo, walletEnabled) {
+            this.currentMode.storageCardNo = storageCardNo;
+            this.currentMode.walletEnabled = walletEnabled;
+        }
+    }, {
+        key: 'updateCardInfo',
+        value: function updateCardInfo(m) {
+            this.currentMode.cardStatusEnum = m.CardStatusEnum;
+            this.currentMode.isNeedPassword = m.IsNeedPassword;
+            this.currentMode.meStorageCardId = m.MeStorageCardId;
+            this.currentMode.storageCardNo = m.StorageCardNo;
+            this.currentMode.balance = m.BalanceStorage;
+            this.currentMode.rawbalance = m.BalanceStorage;
+            this.currentMode.cardTypeEnum = m.CardTypeEnum;
+            this.currentMode.walletEnabled = m.WalletEnabled;
+            this.currentMode.memberId = m.ID;
+            this.currentMode.freePaymentPasswordStore = m.FreePaymentPasswordStore;
+        }
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this14 = this;
+            var _this18 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1616,12 +2219,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref19 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref19.isNewRetailBCPos;
+            var _ref28 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref28.isNewRetailBCPos;
 
-            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn15.PayStyle,
-                Differentiate = _enumController$getEn15.Differentiate;
+            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn18.PayStyle,
+                Differentiate = _enumController$getEn18.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1649,7 +2252,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this14.checkList.splice(i, 1);
+                        _this18.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1721,24 +2324,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this14.currentMode.djqs.forEach(function (djq) {
+                        _this18.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
                         });
 
-                        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 _ref29 = element || {},
+                            couponCode = _ref29.couponCode,
+                            name = _ref29.name,
+                            tieredAmountResult = _ref29.tieredAmountResult,
+                            fromDate = _ref29.fromDate,
+                            dateMount = _ref29.dateMount,
+                            promoMethodEnum = _ref29.promoMethodEnum,
+                            discountPct = _ref29.discountPct,
+                            nominalAmount = _ref29.nominalAmount,
+                            promoId = _ref29.promoId,
+                            id = _ref29.id,
+                            doorsill = _ref29.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1766,10 +2369,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     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);
+                            _this18.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this18.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1782,11 +2385,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref30 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
-            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn16.Differentiate;
+            var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn19.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1848,8 +2451,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn17.PayStyle;
+            var _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn20.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -1868,37 +2471,43 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcMemberBalance',
         value: function calcMemberBalance() {
-            this.currentMode.balance = this.currentMode.member.rawbalance - this.currentMode.value;
+            this.currentMode.balance = this.currentMode.rawbalance - this.currentMode.value;
         }
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
-                var _this15 = this;
+            var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
+                var _this19 = this;
 
-                var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _ref32, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                return _regenerator2.default.wrap(function _callee15$(_context15) {
                     while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context15.prev = _context15.next) {
                             case 0:
-                                _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
+                                // 是否移动端判断
+                                _ref32 = _mutantsUtil.platform || {}, isHorizontalPad = _ref32.isHorizontalPad, isHorizontalSunMi = _ref32.isHorizontalSunMi;
+                                isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
+                                _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context7.next = 5;
+                                _context15.next = 7;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
-                            case 5:
-                                modes = _context7.sent;
+                            case 7:
+                                modes = _context15.sent;
 
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
                                         var paymodes = [];
-                                        (0, _each3.default)(modes.SettleStyles, function (mode, index) {
+                                        var settleLists = modes.SettleStyles;
+                                        settleLists = isMobileEnvironment ? settleLists.filter(function (v) {
+                                            return !v.ThirdPaymentInfo;
+                                        }) : settleLists;
+                                        (0, _each3.default)(settleLists, function (mode, index) {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
-
                                             if (mode.Code == PayStyle.hyczk) {
-                                                mode.Name = '储值余额';
+                                                mode.Name = '储值卡';
                                             }
                                             paymodes.push({
                                                 name: mode.Name,
@@ -1911,24 +2520,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 idBankAccount: mode.IdBankAccount,
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
                                                 idCurrency: mode.Currency ? mode.Currency.ID : -1,
-                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
+                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
+                                                thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
-                                        _this15.paymodes = paymodes;
-                                        //modes.QuickSettleStyles
+                                        _this19.paymodes = paymodes;
                                     });
                                 }
 
-                            case 7:
+                            case 9:
                             case 'end':
-                                return _context7.stop();
+                                return _context15.stop();
                         }
                     }
-                }, _callee7, this);
+                }, _callee15, this);
             }));
 
-            function setPaymodes(_x5, _x6) {
-                return _ref22.apply(this, arguments);
+            function setPaymodes(_x12, _x13) {
+                return _ref31.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1945,49 +2554,60 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
-        var _this16 = this;
+        return null;
+    }
+}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
+    enumerable: true,
+    initializer: function initializer() {
+        return null;
+    }
+}), _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), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this20 = this;
 
         return function () {
-            _this16.checkList = [];
+            _this20.checkList = [];
         };
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this21 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this17.currentMode.djqs.forEach(function (ele) {
+            _this21.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
-                    promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
+                    ele.amount = promoDiscount;
+                    promoMethodEnum == "CASH_COUPON" && (ele.nominalAmount = nominalAmount);
                     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;
@@ -1995,16 +2615,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this22 = this;
 
-        return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
+        return function (promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
                 promoCouponCode: promoCouponCode,
                 name: name,
                 IsEnable: IsEnable,
+                nominalAmount: nominalAmount,
                 amount: amount,
                 doorsill: doorsill,
                 LastTS: LastTS,
@@ -2020,25 +2641,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this18.currentMode.djqs.push(djq);
+            _this22.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 _this19 = this;
+        var _this23 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor11, this);
+        _initDefineProp(this, 'cardNo', _descriptor15, this);
 
-        _initDefineProp(this, 'balance', _descriptor12, this);
+        _initDefineProp(this, 'balance', _descriptor16, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor13, this);
+        _initDefineProp(this, 'exchangable', _descriptor17, this);
 
-        _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor19, this);
 
         if (m) {
             this.id = m.ID;
@@ -2049,17 +2670,15 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
+            var _ref33 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref33.isNewRetailBCPos;
 
-            m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
-            m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this19.cardNo = m.CardCode;
+                _this23.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this23.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this19.balance = _this19.rawbalance;
+                    _this23.balance = _this23.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2079,32 +2698,22 @@ var Member = exports.Member = (_class5 = function () {
             this.cardNo = v;
             this.id = null;
         }
-    }, {
-        key: 'setMeStorageCardId',
-        value: function setMeStorageCardId(v) {
-            this.MeStorageCardId = v;
-        }
-    }, {
-        key: 'setStorageCardNo',
-        value: function setStorageCardNo(v) {
-            this.StorageCardNo = v;
-        }
     }]);
     return Member;
-}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
+}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
+}), _descriptor19 = _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);
+}), _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)), _class5);
 //# sourceMappingURL=settlementStore.js.map