tplus-components-touch 3.36.1 → 3.37.1

package/dist/components/settlement/settlementStore.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Member = exports.PayMode = exports.default = undefined;
 
+var _isInteger = require('babel-runtime/core-js/number/is-integer');
+
+var _isInteger2 = _interopRequireDefault(_isInteger);
+
 var _defineProperty = require('babel-runtime/core-js/object/define-property');
 
 var _defineProperty2 = _interopRequireDefault(_defineProperty);
@@ -41,7 +45,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');
 
@@ -178,6 +182,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,
@@ -425,7 +469,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 +485,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 +543,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;
@@ -541,13 +591,23 @@ var SettlementStore = (_class = function () {
                 }
             });
             (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 +622,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'quickSettle',
         value: function quickSettle(key) {
-            this.addPay(key);
+            this.addPay(key, true);
         }
 
         //outer call
@@ -573,8 +633,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,11 +651,14 @@ 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) {
-                        _this6.paymode.currentMode.steadCashIntegral = result.Integral;
+                        // this.paymode.currentMode.steadCashIntegral=result.Integral;
+                        // this.paymode.currentMode.perIntegral=result.perIntegral;
+                        // this.paymode.currentMode.cashAmount=result.cashAmount;
+                        _this6.paymode.currentMode.integralCashOverOrderAmount = result.integralCashOverOrderAmount;
                         _this6.paymode.currentMode.overchargesAmount = result.Amount - _this6.paymode.currentMode.value;
                     });
                 } else {
@@ -620,7 +683,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 +696,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 _callee2(result) {
+                        var data, m;
+                        return _regenerator2.default.wrap(function _callee2$(_context2) {
+                            while (1) {
+                                switch (_context2.prev = _context2.next) {
+                                    case 0:
+                                        data = result.data;
+                                        m = data && data.length && data[0];
+
+                                        if (!(result && result.data.length)) {
+                                            _context2.next = 25;
+                                            break;
+                                        }
+
+                                        if (!(result.data.length === 1)) {
+                                            _context2.next = 14;
+                                            break;
+                                        }
+
+                                        if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
+                                            _context2.next = 10;
+                                            break;
+                                        }
+
+                                        _this7.paymode.updateCardInfo(m);
+                                        _this7.handleCzkData(m);
+                                        return _context2.abrupt('return', result.data);
+
+                                    case 10:
+                                        _context2.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:
+                                        _context2.next = 25;
+                                        break;
+
+                                    case 14:
+                                        if (!(result.data && result.data.length === 1)) {
+                                            _context2.next = 19;
+                                            break;
+                                        }
+
+                                        _this7.paymode.updateCardInfo(result.data[0]);
+                                        return _context2.abrupt('return', result.data);
+
+                                    case 19:
+                                        if (!(result.data && result.data.length > 1)) {
+                                            _context2.next = 23;
+                                            break;
+                                        }
+
+                                        return _context2.abrupt('return', result.data);
+
+                                    case 23:
+                                        _message2.default.warn('没有可用储值卡！');
+                                        return _context2.abrupt('return', false);
+
+                                    case 25:
+                                    case 'end':
+                                        return _context2.stop();
+                                }
                             }
-                        });
-                    }
-                });
+                        }, _callee2, _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 = "无效的会员卡号";
@@ -755,8 +849,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 +868,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,11 +883,14 @@ 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) {
                     _this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
+                    _this8.paymode.currentMode.perIntegral = result.perIntegral;
+                    _this8.paymode.currentMode.cashAmount = result.cashAmount;
+                    _this8.paymode.currentMode.integralCashOverOrderAmount = result.integralCashOverOrderAmount;
                     _this8.updateEvent();
                     if (_this8.checkReceived(_this8.paymode.currentMode, "exchangable")) {
                         (0, _mobx.runInAction)(function () {
@@ -810,12 +907,13 @@ 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,
@@ -827,6 +925,8 @@ var SettlementStore = (_class = function () {
                 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 +934,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 () {
@@ -855,8 +955,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) {
@@ -932,8 +1032,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 +1050,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) {
@@ -962,14 +1062,15 @@ var SettlementStore = (_class = function () {
                 pos = index == -1 ? pos : index + 1;
             }
             // this.paymode.thePaymodes.push(this.genNewMode(type) );
-            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk));
+
+            this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
             this.paymode.calcReserved();
         }
     }, {
         key: 'delPay',
         value: function delPay(index) {
-            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn12.PayStyle;
+            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn13.PayStyle;
 
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId === index;
@@ -980,80 +1081,80 @@ var SettlementStore = (_class = function () {
     }, {
         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 _callee3(bTest) {
+                var _ref10, isNewRetailBCPos;
 
-                return _regenerator2.default.wrap(function _callee2$(_context2) {
+                return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                        switch (_context2.prev = _context2.next) {
+                        switch (_context3.prev = _context3.next) {
                             case 0:
                                 console.log('settlementStore.commit开始，参数：' + bTest);
 
                                 if (!bTest) {
-                                    _context2.next = 3;
+                                    _context3.next = 3;
                                     break;
                                 }
 
-                                return _context2.abrupt('return', _promise2.default.resolve(true));
+                                return _context3.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
-                                _context2.prev = 4;
+                                _ref10 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref10.isNewRetailBCPos;
+                                _context3.prev = 4;
 
                                 if (!(this.type == 1)) {
-                                    _context2.next = 10;
+                                    _context3.next = 10;
                                     break;
                                 }
 
-                                _context2.next = 8;
+                                _context3.next = 8;
                                 return this.saveMember();
 
                             case 8:
-                                _context2.next = 18;
+                                _context3.next = 18;
                                 break;
 
                             case 10:
                                 if (!isNewRetailBCPos) {
-                                    _context2.next = 13;
+                                    _context3.next = 13;
                                     break;
                                 }
 
-                                _context2.next = 13;
+                                _context3.next = 13;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
                             case 13:
-                                _context2.next = 15;
+                                _context3.next = 15;
                                 return this.save();
 
                             case 15:
                                 if (!isNewRetailBCPos) {
-                                    _context2.next = 18;
+                                    _context3.next = 18;
                                     break;
                                 }
 
-                                _context2.next = 18;
+                                _context3.next = 18;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
                             case 18:
-                                return _context2.abrupt('return', _promise2.default.resolve(true));
+                                return _context3.abrupt('return', _promise2.default.resolve(true));
 
                             case 21:
-                                _context2.prev = 21;
-                                _context2.t0 = _context2['catch'](4);
+                                _context3.prev = 21;
+                                _context3.t0 = _context3['catch'](4);
 
-                                console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
-                                return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
+                                console.error('settlementStore.commit失败，错误信息：' + _context3.t0);
+                                return _context3.abrupt('return', _promise2.default.resolve(_context3.t0));
 
                             case 25:
                             case 'end':
-                                return _context2.stop();
+                                return _context3.stop();
                         }
                     }
-                }, _callee2, this, [[4, 21]]);
+                }, _callee3, this, [[4, 21]]);
             }));
 
-            function commit(_x2) {
-                return _ref10.apply(this, arguments);
+            function commit(_x3) {
+                return _ref9.apply(this, arguments);
             }
 
             return commit;
@@ -1069,8 +1170,8 @@ var SettlementStore = (_class = function () {
         value: function saveMember() {
             var _this10 = this;
 
-            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn13.PayStyle;
+            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle;
 
             (0, _mobx.runInAction)(function () {
                 _this10.dto.StorageMutiSettleDetails = [];
@@ -1111,23 +1212,22 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn15, PayStyle, _ref13, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context3.prev = _context3.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
-                                _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
+                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle;
 
                                 (0, _mobx.runInAction)(function () {
                                     _this11.dto.RetailPaymentDetails = [];
                                     _this11.dto.RetailStorageDetails = [];
                                     _this11.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
-                                    var Idmember = _this11.dto.Idmember;
                                     var count = 0;
                                     var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
@@ -1135,18 +1235,14 @@ var SettlementStore = (_class = function () {
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
                                         var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
-                                            if (!Idmember) {
-                                                Idmember = mode.member.id;
-                                            }
                                             czkSum = Math.Add(czkSum, mode.value);
-                                            var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
                                             _this11.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
-                                                MeStorageCardId: MeStorageCardId,
+                                                MeStorageCardId: mode.meStorageCardId,
                                                 StoragePaymentAmount: mode.value,
                                                 IsOrigReturn: false,
                                                 BalanceStorage: mode.balance,
-                                                Idmember: mode.member.id,
+                                                Idmember: mode.memberId,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
                                                 DataSource: { Id: _this11.dataSource },
@@ -1182,7 +1278,7 @@ var SettlementStore = (_class = function () {
                                                         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,
@@ -1194,15 +1290,12 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref13 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                    var _ref12 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref12.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,
@@ -1226,15 +1319,14 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                         }
-                                        _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
                                 if (!isNewRetailBCPos) {
-                                    _context3.next = 20;
+                                    _context4.next = 20;
                                     break;
                                 }
 
@@ -1245,61 +1337,61 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _context3.t1 = this.dto.IdbusiType == 37;
+                                _context4.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context3.t1) {
-                                    _context3.next = 13;
+                                if (!_context4.t1) {
+                                    _context4.next = 13;
                                     break;
                                 }
 
-                                _context3.next = 12;
+                                _context4.next = 12;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
                             case 12:
-                                _context3.t1 = _context3.sent;
+                                _context4.t1 = _context4.sent;
 
                             case 13:
-                                _context3.t0 = _context3.t1;
+                                _context4.t0 = _context4.t1;
 
-                                if (_context3.t0) {
-                                    _context3.next = 16;
+                                if (_context4.t0) {
+                                    _context4.next = 16;
                                     break;
                                 }
 
-                                _context3.t0 = this.dto.IdbusiType != 37;
+                                _context4.t0 = this.dto.IdbusiType != 37;
 
                             case 16:
-                                if (!_context3.t0) {
-                                    _context3.next = 18;
+                                if (!_context4.t0) {
+                                    _context4.next = 18;
                                     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) {
+                                return _context4.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;
                                 }));
 
                             case 18:
-                                _context3.next = 21;
+                                _context4.next = 21;
                                 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) {
+                                return _context4.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
                                     _this11.setDtoID(resp.ID);
                                     _this11.billID = resp.ID;
                                 }));
 
                             case 21:
                             case 'end':
-                                return _context3.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee3, this);
+                }, _callee4, this);
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref11.apply(this, arguments);
             }
 
             return save;
@@ -1312,35 +1404,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 _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context5.prev = _context5.next) {
                             case 0:
-                                _context4.prev = 0;
-                                _context4.t0 = _promise2.default;
-                                _context4.next = 4;
+                                _context5.prev = 0;
+                                _context5.t0 = _promise2.default;
+                                _context5.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));
+                                _context5.t1 = _context5.sent;
+                                return _context5.abrupt('return', _context5.t0.resolve.call(_context5.t0, _context5.t1));
 
                             case 8:
-                                _context4.prev = 8;
-                                _context4.t2 = _context4['catch'](0);
-                                return _context4.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context5.prev = 8;
+                                _context5.t2 = _context5['catch'](0);
+                                return _context5.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context4.stop();
+                                return _context5.stop();
                         }
                     }
-                }, _callee4, this, [[0, 8]]);
+                }, _callee5, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref15.apply(this, arguments);
+                return _ref14.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1366,99 +1458,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 _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
+                var _ref16, 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 _callee6$(_context6) {
                     while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context6.prev = _context6.next) {
                             case 0:
-                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
-                                _context5.prev = 1;
+                                _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
+                                _context6.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context5.next = 19;
+                                    _context6.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;
+                                    _context6.next = 12;
                                     break;
                                 }
 
-                                if (!cook2.hasOwnProperty(memberId + "")) {
-                                    _context5.next = 12;
+                                if (!cook2.hasOwnProperty(memberStorageId + "")) {
+                                    _context6.next = 12;
                                     break;
                                 }
 
-                                if (!(cook2[memberId] > 3)) {
-                                    _context5.next = 12;
+                                if (!(cook2[memberStorageId] > 3)) {
+                                    _context6.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context5.abrupt('return', _promise2.default.resolve(message));
+                                return _context6.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')) {
+                                    _context6.next = 20;
+                                    break;
+                                }
+
+                                _context6.next = 17;
+                                return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
+
+                            case 17:
+                                result = _context6.sent;
+                                _context6.next = 29;
+                                break;
+
+                            case 20:
+                                if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
+                                    _context6.next = 26;
+                                    break;
+                                }
+
+                                _context6.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 = _context6.sent;
+                                _context6.next = 29;
+                                break;
+
+                            case 26:
+                                _context6.next = 28;
+                                return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+
+                            case 28:
+                                result = _context6.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 _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 19:
-                                _context5.next = 21;
+                            case 33:
+                                _context6.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 = _context6.sent;
+                                return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 23:
-                                _context5.next = 28;
+                            case 37:
+                                _context6.next = 42;
                                 break;
 
-                            case 25:
-                                _context5.prev = 25;
-                                _context5.t0 = _context5['catch'](1);
-                                return _context5.abrupt('return', "failed");
+                            case 39:
+                                _context6.prev = 39;
+                                _context6.t0 = _context6['catch'](1);
+                                return _context6.abrupt('return', "failed");
 
-                            case 28:
+                            case 42:
                             case 'end':
-                                return _context5.stop();
+                                return _context6.stop();
                         }
                     }
-                }, _callee5, this, [[1, 25]]);
+                }, _callee6, this, [[1, 39]]);
             }));
 
-            function validePwd(_x3) {
-                return _ref16.apply(this, arguments);
+            function validePwd(_x4) {
+                return _ref15.apply(this, arguments);
             }
 
             return validePwd;
@@ -1480,7 +1604,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this12.member.ID,
+                meMemberId: _this12.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1497,37 +1621,130 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context7.prev = _context7.next) {
                             case 0:
                                 _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context6.next = 3;
+                                _context7.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context6.sent;
+                                resp = _context7.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 _context7.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context6.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee6, _this13);
+                }, _callee7, _this13);
             }));
 
-            return function (_x4) {
+            return function (_x5) {
+                return _ref17.apply(this, arguments);
+            };
+        }();
+    }
+}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this14 = this;
+
+        return function () {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(memberId) {
+                var result;
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
+                    while (1) {
+                        switch (_context8.prev = _context8.next) {
+                            case 0:
+                                _context8.next = 2;
+                                return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
+
+                            case 2:
+                                result = _context8.sent;
+
+                                if (!(result && result.data.length)) {
+                                    _context8.next = 20;
+                                    break;
+                                }
+
+                                if (!(result.data.length === 1)) {
+                                    _context8.next = 9;
+                                    break;
+                                }
+
+                                _this14.paymode.updateCardInfo(result.data[0]);
+                                return _context8.abrupt('return', result.data);
+
+                            case 9:
+                                if (!(result.data && result.data.length === 1)) {
+                                    _context8.next = 14;
+                                    break;
+                                }
+
+                                _this14.paymode.updateCardInfo(result.data[0]);
+                                return _context8.abrupt('return', result.data);
+
+                            case 14:
+                                if (!(result.data && result.data.length > 1)) {
+                                    _context8.next = 18;
+                                    break;
+                                }
+
+                                return _context8.abrupt('return', result.data);
+
+                            case 18:
+                                _message2.default.warn('没有可用储值卡！');
+                                return _context8.abrupt('return', false);
+
+                            case 20:
+                            case 'end':
+                                return _context8.stop();
+                        }
+                    }
+                }, _callee8, _this14);
+            }));
+
+            return function (_x6) {
                 return _ref18.apply(this, arguments);
             };
         }();
     }
+}), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this15 = this;
+
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
+            var address, result;
+            return _regenerator2.default.wrap(function _callee9$(_context9) {
+                while (1) {
+                    switch (_context9.prev = _context9.next) {
+                        case 0:
+                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this15.paymode.currentMode.storageCardNo;
+                            _context9.next = 3;
+                            return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
+
+                        case 3:
+                            result = _context9.sent;
+
+                            _this15.paymode.updateCardInfo(result.data);
+
+                        case 5:
+                        case 'end':
+                            return _context9.stop();
+                    }
+                }
+            }, _callee9, _this15);
+        }));
+    }
 }), _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 +1759,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', _descriptor6, this);
 
-        _initDefineProp(this, 'received', _descriptor4, this);
+        _initDefineProp(this, 'receivable', _descriptor7, this);
 
-        _initDefineProp(this, 'receivable', _descriptor5, this);
+        _initDefineProp(this, 'paymodes', _descriptor8, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor6, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor7, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
+
+        _initDefineProp(this, 'balance', _descriptor11, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1559,11 +1780,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 +1820,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 _this16 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1616,12 +1857,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref19 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref19.isNewRetailBCPos;
+            var _ref20 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
-            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn15.PayStyle,
-                Differentiate = _enumController$getEn15.Differentiate;
+            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn16.PayStyle,
+                Differentiate = _enumController$getEn16.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1649,7 +1890,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);
+                        _this16.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1721,24 +1962,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) {
+                        _this16.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 _ref21 = element || {},
+                            couponCode = _ref21.couponCode,
+                            name = _ref21.name,
+                            tieredAmountResult = _ref21.tieredAmountResult,
+                            fromDate = _ref21.fromDate,
+                            dateMount = _ref21.dateMount,
+                            promoMethodEnum = _ref21.promoMethodEnum,
+                            discountPct = _ref21.discountPct,
+                            nominalAmount = _ref21.nominalAmount,
+                            promoId = _ref21.promoId,
+                            id = _ref21.id,
+                            doorsill = _ref21.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -1766,10 +2007,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);
+                            _this16.addDjqs(couponCode, name, true, nominalAmount, 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);
+                            _this16.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1782,11 +2023,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref21 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref21.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
-            var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn16.Differentiate;
+            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn17.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1848,8 +2089,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn17.PayStyle;
+            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn18.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -1864,32 +2105,45 @@ var PayMode = exports.PayMode = (_class3 = function () {
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
             }
+            // 如果是积分抵现的一些判断
+            if (this.currentMode.paymentType === PayStyle.jfdx) {
+                if (this.currentMode.integralCashOverOrderAmount === true) {
+                    this.currentMode.steadCashIntegral = Math.ceil(this.currentMode.value / this.currentMode.cashAmount) * this.currentMode.perIntegral;
+                } else if (this.currentMode.integralCashOverOrderAmount === false) {
+                    var v1 = this.currentMode.value / this.currentMode.cashAmount;
+                    if ((0, _isInteger2.default)(v1)) {
+                        this.currentMode.steadCashIntegral = Math.floor(this.currentMode.value / this.currentMode.cashAmount) * this.currentMode.perIntegral;
+                    } else {
+                        this.currentMode.errinfo = '\u8BF7\u6309\u7167\u79EF\u5206\u62B5\u73B0\u89C4\u5219' + this.currentMode.perIntegral + '\u79EF\u5206\u62B5\u7528' + this.currentMode.cashAmount + '\u5143\u8F93\u5165\u91D1\u989D';
+                    }
+                }
+            }
         }
     }, {
         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 _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(type, isIntegralExchange) {
+                var _this17 = this;
 
-                var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn19, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                     while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context10.prev = _context10.next) {
                             case 0:
-                                _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
+                                _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn19.settleStyleType, PayStyle = _enumController$getEn19.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context7.next = 5;
+                                _context10.next = 5;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
                             case 5:
-                                modes = _context7.sent;
+                                modes = _context10.sent;
 
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
@@ -1898,7 +2152,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
 
                                             if (mode.Code == PayStyle.hyczk) {
-                                                mode.Name = '储值余额';
+                                                mode.Name = '储值卡';
                                             }
                                             paymodes.push({
                                                 name: mode.Name,
@@ -1914,21 +2168,21 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
-                                        _this15.paymodes = paymodes;
+                                        _this17.paymodes = paymodes;
                                         //modes.QuickSettleStyles
                                     });
                                 }
 
                             case 7:
                             case 'end':
-                                return _context7.stop();
+                                return _context10.stop();
                         }
                     }
-                }, _callee7, this);
+                }, _callee10, this);
             }));
 
-            function setPaymodes(_x5, _x6) {
-                return _ref22.apply(this, arguments);
+            function setPaymodes(_x7, _x8) {
+                return _ref23.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1945,47 +2199,57 @@ 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 _this18 = this;
 
         return function () {
-            _this16.checkList = [];
+            _this18.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 _this19 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this17.currentMode.djqs.forEach(function (ele) {
+            _this19.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
@@ -1995,10 +2259,10 @@ 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 _this20 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2020,25 +2284,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this18.currentMode.djqs.push(djq);
+            _this20.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 _this21 = 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 +2313,15 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref23 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref23.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
-            m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
-            m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this19.cardNo = m.CardCode;
+                _this21.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this21.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this19.balance = _this19.rawbalance;
+                    _this21.balance = _this21.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2079,32 +2341,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