tplus-components-touch 3.26.7 → 3.27.3

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
+var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _desc3, _value3, _class5, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
 
 var _mobx = require('mobx');
 
@@ -178,44 +178,6 @@ 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 {
-                        // 查询成功后将焦点移入下一个输入框
-                        var nextInput = document.querySelector('.czk .received .input');
-                        nextInput && nextInput.select();
-                    }
-                });
-            }
-        };
-
         this.getCouponList = function (coupon_code) {
             var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn.PayStyle,
@@ -272,7 +234,7 @@ var SettlementStore = (_class = function () {
                     }
                     detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
                     detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
-                    //} 
+                    //}
                     detailDTO.taxRate = item.TaxRate;
                     detailDTO.quantity = item.Quantity;
 
@@ -345,6 +307,18 @@ var SettlementStore = (_class = function () {
             return (0, _tplusApi.ccApi)({}, '/marketingtool/paygift/executeRightsForPos/' + _this2.billID, false, false, { method: 'get', timeout_skip: true });
         };
 
+        this.getRefWareHouseList = function () {
+            return (0, _tplusApi.ccApi)({}, '/retail/RetailPos/getRefWareHouseList', false, false);
+        };
+
+        this.getPerformanceDistributionValue = function (data) {
+            return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPerformanceDistributionValue', false, false);
+        };
+
+        this.getPosFreight = function (data) {
+            return (0, _tplusApi.ccApi)(data, '/retail/RetailPos/getPosFreight', false, false);
+        };
+
         this.checkCoupon = function () {
             var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
                 var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
@@ -486,7 +460,32 @@ var SettlementStore = (_class = function () {
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
                 this.member = this.dto.Member; //stores.selectMemberStore.selectMemberInfo;
-                this.brefund = this.paymode.setAmount(this.dto.TotalTaxAmount, this.dto.OnlinePaymentAmount);
+
+                //预订按比例收取订金处理
+                var value = this.dto.TotalTaxAmount;
+
+                var _getLoginInfo = this.getLoginInfo(),
+                    Book = _getLoginInfo.Book,
+                    PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
+
+                var _ref5 = this.dto || {},
+                    IdbusiType = _ref5.IdbusiType,
+                    DistributionMode = _ref5.DistributionMode;
+
+                if (IdbusiType == 38 && Book && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
+                    value = value * PercentageWhenBook / 100;
+                    (0, _mobx.runInAction)(function () {
+                        _this3.dto.PrepaidAmount = value;
+                    });
+                }
+                if (IdbusiType == 38 && Book && (DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE')) {
+                    value += this.dto.BuyerPayFreight || 0;
+                }
+                if (IdbusiType == 39) {
+                    value = _mutantsMicrofx.stores.drawerStore.thisWaitPaidAmount;
+                }
+
+                this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
             } else {
                 this.brefund = this.paymode.setAmount(amount, 0);
                 this.dto = data;
@@ -534,8 +533,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn4.PayStyle;
 
-            var _ref5 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref5.isNewRetailBCPos;
+            var _ref6 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref6.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
@@ -560,14 +559,14 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                var _ref6 = djq || {},
-                                    displayText = _ref6.displayText,
-                                    promoRuleId = _ref6.promoRuleId,
-                                    dateMount = _ref6.dateMount,
-                                    promoMethodEnum = _ref6.promoMethodEnum,
-                                    discountPct = _ref6.discountPct,
-                                    promoId = _ref6.promoId,
-                                    id = _ref6.id;
+                                var _ref7 = djq || {},
+                                    displayText = _ref7.displayText,
+                                    promoRuleId = _ref7.promoRuleId,
+                                    dateMount = _ref7.dateMount,
+                                    promoMethodEnum = _ref7.promoMethodEnum,
+                                    discountPct = _ref7.discountPct,
+                                    promoId = _ref7.promoId,
+                                    id = _ref7.id;
 
                                 _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
@@ -579,23 +578,13 @@ var SettlementStore = (_class = function () {
                 }
             });
             (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
-                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 balanceAmount = detail.Member.BalanceStorage;
+                balanceAmount = balanceAmount - detail.StoragePaymentAmount;
                 var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
-                    member: new Member(detail.Member ? detail.Member : null),
-                    authCode: detail.Password ? detail.Password : null,
+                    member: new Member(detail.Member),
+                    authCode: detail.Password,
                     balance: balanceAmount,
-                    boriginReturn: true,
-                    meStorageCardId: meStorageCardId ? meStorageCardId : detail.MeStorageCardId,
-                    storageCardNo: storageCardNo ? storageCardNo : detail.StorageCardNo
+                    boriginReturn: true
                 });
                 _this5.paymode.thePaymodes.push(newmode);
             });
@@ -639,7 +628,7 @@ var SettlementStore = (_class = function () {
 
                     //抵现积分
                     (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
-                            Idmember: this.paymode.currentMode.memberId,
+                            Idmember: this.paymode.currentMode.member.id,
                             TotalTaxAmount: this.paymode.amount,
                             BalanceTaxAmount: this.paymode.currentMode.value
                         } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -659,9 +648,9 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'getLoginInfo',
         value: function getLoginInfo() {
-            var _ref7 = _mutantsMicrofx.localStore.get('user') || {},
-                _ref7$loginInfo = _ref7.loginInfo,
-                loginInfo = _ref7$loginInfo === undefined ? {} : _ref7$loginInfo;
+            var _ref8 = _mutantsMicrofx.localStore.get('user') || {},
+                _ref8$loginInfo = _ref8.loginInfo,
+                loginInfo = _ref8$loginInfo === undefined ? {} : _ref8$loginInfo;
 
             return loginInfo;
         }
@@ -672,6 +661,7 @@ 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;
@@ -679,62 +669,72 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref9 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref9.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
-                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
-                return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
-                    var _ref9 = (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 (!(m.CardTypeEnum === 'BALANCE_CARD')) {
-                                            _context2.next = 7;
-                                            break;
-                                        }
-
-                                        _this7.paymode.updateCardInfo(m);
-                                        _this7.handleCzkData(m);
-                                        _context2.next = 9;
-                                        break;
-
-                                    case 7:
-                                        _context2.next = 9;
-                                        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);
-                                            } else {
-                                                _message2.default.warn(data1.disableReason);
-                                            }
-                                        });
-
-                                    case 9:
-                                    case 'end':
-                                        return _context2.stop();
-                                }
+                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 _ref10 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref10.isNewRetailBCPos;
+
+                    if (isNewRetailBCPos) {
+                        _this7.paymode && _this7.paymode.currentMode.member.setMeStorageCardId(m.MeStorageCardId);
+                        _this7.paymode && _this7.paymode.currentMode.member.setStorageCardNo(m.StorageCardNo);
+                        _this7.paymode && (_this7.paymode.currentMode.MeStorageCardId = m.MeStorageCardId);
+                        _this7.paymode && (_this7.paymode.currentMode.StorageCardNo = m.StorageCardNo);
+                    }
+                    if (!m || !m.ID) {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "无效的会员卡号";
+                        });
+                    } else {
+                        (0, _mobx.runInAction)(function () {
+                            _this7.paymode.currentMode.errinfo = "";
+                            _this7.paymode.currentMode.member = new Member(m);
+                            _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
+                            _this7.updateEvent();
+                            var message = '';
+                            var sum = (0, _reduce3.default)(_this7.paymode.thePaymodes, function (total, cur) {
+                                return total + cur.value;
+                            }, 0);
+                            if (global.CheckMemberStorageProcessorBlock) {
+                                message = CheckMemberStorageProcessorBlock.execute(m);
                             }
-                        }, _callee2, _this7);
-                    }));
-
-                    return function (_x2) {
-                        return _ref9.apply(this, arguments);
-                    };
-                }());
+                            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();
+                            }
+                        });
+                    }
+                });
             } 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 _ref11 = _mutantsUtil.platform || {},
+                        isNewRetailBCPos = _ref11.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 = "无效的会员卡号";
@@ -830,7 +830,7 @@ var SettlementStore = (_class = function () {
                 }
 
                 (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
-                        Idmember: this.paymode.currentMode.memberId,
+                        Idmember: this.paymode.currentMode.member.id,
                         TotalTaxAmount: this.paymode.amount,
                         BalanceTaxAmount: this.paymode.amount
                     } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
@@ -857,22 +857,6 @@ var SettlementStore = (_class = function () {
 
             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 balance = null;
-            var rawbalance = null;
-            var storageCardNo = null;
-            var memberId = this.member && this.member.ID ? this.member.ID : null;
-            var cardTypeEnum = null;
-            var walletEnabled = null;
-            var meStorageCardId = null;
-            if (type === PayStyle.hyczk) {
-                // 会员概念改为卡，把这些字段都放开
-                cardTypeEnum = this.member.CardTypeEnum ? this.member.CardTypeEnum : null;
-                walletEnabled = this.member.WalletEnabled ? this.member.WalletEnabled : null;
-                storageCardNo = this.member.StorageCardNo ? this.member.StorageCardNo : null;
-                balance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
-                rawbalance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
-                meStorageCardId = this.member.MeStorageCardId ? this.member.MeStorageCardId : null;
-            }
             var mode = (0, _mobx.observable)({
                 paymethodId: this.paymode.counter,
                 name: themode.name,
@@ -884,14 +868,6 @@ var SettlementStore = (_class = function () {
                 order: this.paymode.thePaymodes.length + 1,
                 paymentType: type,
                 djqs: [],
-                card: null,
-                cardTypeEnum: !notwithm ? cardTypeEnum : null,
-                walletEnabled: !notwithm ? walletEnabled : null,
-                memberId: !notwithm ? memberId : null,
-                meStorageCardId: !notwithm ? meStorageCardId : null,
-                storageCardNo: !notwithm ? storageCardNo : null,
-                balance: !notwithm ? balance : null,
-                rawbalance: !notwithm ? rawbalance : null,
                 member: new Member(!notwithm ? this.member : null),
                 authCode: '',
                 steadCashIntegral: null,
@@ -899,7 +875,7 @@ var SettlementStore = (_class = function () {
                 maxamount: this.paymode.amount
             });
             if (type == PayStyle.hyczk) {
-                if (!mode.storageCardNo) {
+                if (!mode.member.id || !mode.member.StorageCardNo) {
                     (0, _mobx.runInAction)(function () {
                         mode.errinfo = '未录入储值卡';
                     });
@@ -1045,80 +1021,80 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(bTest) {
-                var _ref11, isNewRetailBCPos;
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var _ref13, isNewRetailBCPos;
 
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+                return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
-                        switch (_context3.prev = _context3.next) {
+                        switch (_context2.prev = _context2.next) {
                             case 0:
                                 console.log('settlementStore.commit开始，参数：' + bTest);
 
                                 if (!bTest) {
-                                    _context3.next = 3;
+                                    _context2.next = 3;
                                     break;
                                 }
 
-                                return _context3.abrupt('return', _promise2.default.resolve(true));
+                                return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
-                                _context3.prev = 4;
+                                _ref13 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                _context2.prev = 4;
 
                                 if (!(this.type == 1)) {
-                                    _context3.next = 10;
+                                    _context2.next = 10;
                                     break;
                                 }
 
-                                _context3.next = 8;
+                                _context2.next = 8;
                                 return this.saveMember();
 
                             case 8:
-                                _context3.next = 18;
+                                _context2.next = 18;
                                 break;
 
                             case 10:
                                 if (!isNewRetailBCPos) {
-                                    _context3.next = 13;
+                                    _context2.next = 13;
                                     break;
                                 }
 
-                                _context3.next = 13;
+                                _context2.next = 13;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
                             case 13:
-                                _context3.next = 15;
+                                _context2.next = 15;
                                 return this.save();
 
                             case 15:
                                 if (!isNewRetailBCPos) {
-                                    _context3.next = 18;
+                                    _context2.next = 18;
                                     break;
                                 }
 
-                                _context3.next = 18;
+                                _context2.next = 18;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
                             case 18:
-                                return _context3.abrupt('return', _promise2.default.resolve(true));
+                                return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 21:
-                                _context3.prev = 21;
-                                _context3.t0 = _context3['catch'](4);
+                                _context2.prev = 21;
+                                _context2.t0 = _context2['catch'](4);
 
-                                console.error('settlementStore.commit失败，错误信息：' + _context3.t0);
-                                return _context3.abrupt('return', _promise2.default.resolve(_context3.t0));
+                                console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
+                                return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
 
                             case 25:
                             case 'end':
-                                return _context3.stop();
+                                return _context2.stop();
                         }
                     }
-                }, _callee3, this, [[4, 21]]);
+                }, _callee2, this, [[4, 21]]);
             }));
 
-            function commit(_x3) {
-                return _ref10.apply(this, arguments);
+            function commit(_x2) {
+                return _ref12.apply(this, arguments);
             }
 
             return commit;
@@ -1176,14 +1152,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+            var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
                 var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, _ref14, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn14, PayStyle, _ref16, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context3.prev = _context3.next) {
                             case 0:
                                 _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
 
@@ -1192,6 +1168,7 @@ var SettlementStore = (_class = function () {
                                     _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;
@@ -1199,14 +1176,18 @@ 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: mode.meStorageCardId,
+                                                MeStorageCardId: MeStorageCardId,
                                                 StoragePaymentAmount: mode.value,
                                                 IsOrigReturn: false,
                                                 BalanceStorage: mode.balance,
-                                                Idmember: mode.memberId,
+                                                Idmember: mode.member.id,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
                                                 DataSource: { Id: _this11.dataSource },
@@ -1242,7 +1223,7 @@ var SettlementStore = (_class = function () {
                                                         ReductionAmount: djq.amount,
                                                         EnableAmount: djq.doorsill,
                                                         CouponTitle: djq.name,
-                                                        IdMember: djq.UMemberID ? mode.memberId : null,
+                                                        IdMember: djq.UMemberID ? mode.member.id : null,
                                                         LastTS: djq.LastTS,
                                                         PromotionId: djq.promoId,
                                                         PromotionRuleId: djq.promoRuleId,
@@ -1254,12 +1235,15 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
 
-                                    var _ref13 = _mutantsUtil.platform || {},
-                                        isNewRetailBCPos = _ref13.isNewRetailBCPos;
+                                    var _ref15 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref15.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,
@@ -1283,14 +1267,15 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                         }
+                                        _this11.dto.Idmember = Idmember;
                                     }
                                 });
-                                _ref14 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref14.isNewRetailBCPos;
+                                _ref16 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref16.isNewRetailBCPos;
 
                                 console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
 
                                 if (!isNewRetailBCPos) {
-                                    _context4.next = 20;
+                                    _context3.next = 20;
                                     break;
                                 }
 
@@ -1301,61 +1286,61 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _context4.t1 = this.dto.IdbusiType == 37;
+                                _context3.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context4.t1) {
-                                    _context4.next = 13;
+                                if (!_context3.t1) {
+                                    _context3.next = 13;
                                     break;
                                 }
 
-                                _context4.next = 12;
+                                _context3.next = 12;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
                             case 12:
-                                _context4.t1 = _context4.sent;
+                                _context3.t1 = _context3.sent;
 
                             case 13:
-                                _context4.t0 = _context4.t1;
+                                _context3.t0 = _context3.t1;
 
-                                if (_context4.t0) {
-                                    _context4.next = 16;
+                                if (_context3.t0) {
+                                    _context3.next = 16;
                                     break;
                                 }
 
-                                _context4.t0 = this.dto.IdbusiType != 37;
+                                _context3.t0 = this.dto.IdbusiType != 37;
 
                             case 16:
-                                if (!_context4.t0) {
-                                    _context4.next = 18;
+                                if (!_context3.t0) {
+                                    _context3.next = 18;
                                     break;
                                 }
 
-                                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) {
+                                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;
                                 }));
 
                             case 18:
-                                _context4.next = 21;
+                                _context3.next = 21;
                                 break;
 
                             case 20:
-                                return _context4.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
+                                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 21:
                             case 'end':
-                                return _context4.stop();
+                                return _context3.stop();
                         }
                     }
-                }, _callee4, this);
+                }, _callee3, this);
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref14.apply(this, arguments);
             }
 
             return save;
@@ -1368,35 +1353,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
-                                _context5.prev = 0;
-                                _context5.t0 = _promise2.default;
-                                _context5.next = 4;
+                                _context4.prev = 0;
+                                _context4.t0 = _promise2.default;
+                                _context4.next = 4;
                                 return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
 
                             case 4:
-                                _context5.t1 = _context5.sent;
-                                return _context5.abrupt('return', _context5.t0.resolve.call(_context5.t0, _context5.t1));
+                                _context4.t1 = _context4.sent;
+                                return _context4.abrupt('return', _context4.t0.resolve.call(_context4.t0, _context4.t1));
 
                             case 8:
-                                _context5.prev = 8;
-                                _context5.t2 = _context5['catch'](0);
-                                return _context5.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context4.prev = 8;
+                                _context4.t2 = _context4['catch'](0);
+                                return _context4.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context5.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee5, this, [[0, 8]]);
+                }, _callee4, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref15.apply(this, arguments);
+                return _ref17.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1422,117 +1407,99 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(value) {
-                var _ref17, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, result, count, _result;
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(value) {
+                var _ref19, isNewRetailBCPos, cook1, cook2, message, memberId, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context5.prev = _context5.next) {
                             case 0:
-                                _ref17 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref17.isNewRetailBCPos;
-                                _context6.prev = 1;
+                                _ref19 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref19.isNewRetailBCPos;
+                                _context5.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context6.next = 27;
+                                    _context5.next = 19;
                                     break;
                                 }
 
                                 cook1 = this.getAllCookies()['errorPwd'];
                                 cook2 = cook1 && JSON.parse(cook1);
                                 message = '密码输入错误';
-                                memberStorageId = this.paymode.currentMode.meStorageCardId;
+                                memberId = this.paymode.currentMode.member.MeStorageCardId;
 
                                 if (!cook2) {
-                                    _context6.next = 12;
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context6.next = 12;
+                                if (!cook2.hasOwnProperty(memberId + "")) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
-                                if (!(cook2[memberStorageId] > 3)) {
-                                    _context6.next = 12;
+                                if (!(cook2[memberId] > 3)) {
+                                    _context5.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context6.abrupt('return', _promise2.default.resolve(message));
+                                return _context5.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
-                                _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId;
-                                result = null;
-
-                                if (!(cardTypeEnum === 'BALANCE_CARD')) {
-                                    _context6.next = 20;
-                                    break;
-                                }
-
-                                _context6.next = 17;
-                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
+                                _context5.next = 14;
+                                return (0, _tplusApi.ccApi)({ password: _tplusApi.User.pwdEncrypt(value.pwd) }, '/member/MeMemberWallet/checkPaymentPassword/' + value.id, false, false);
 
-                            case 17:
-                                result = _context6.sent;
-                                _context6.next = 23;
-                                break;
-
-                            case 20:
-                                _context6.next = 22;
-                                return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+                            case 14:
+                                result = _context5.sent;
 
-                            case 22:
-                                result = _context6.sent;
-
-                            case 23:
                                 if (!result.data) {
                                     if (cook2) {
-                                        if (cook2.hasOwnProperty(memberStorageId + "")) {
-                                            count = cook2[memberStorageId];
+                                        if (cook2.hasOwnProperty(memberId + "")) {
+                                            count = cook2[memberId];
 
-                                            cook2[memberStorageId] = count + 1;
+                                            cook2[memberId] = count + 1;
                                         } else {
-                                            cook2[memberStorageId] = 1;
+                                            cook2[memberId] = 1;
                                         }
                                     } else {
                                         cook2 = {};
-                                        cook2[memberStorageId] = 1;
+                                        cook2[memberId] = 1;
                                     }
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context6.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context5.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 27:
-                                _context6.next = 29;
+                            case 19:
+                                _context5.next = 21;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
-                            case 29:
-                                _result = _context6.sent;
-                                return _context6.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                            case 21:
+                                _result = _context5.sent;
+                                return _context5.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 31:
-                                _context6.next = 36;
+                            case 23:
+                                _context5.next = 28;
                                 break;
 
-                            case 33:
-                                _context6.prev = 33;
-                                _context6.t0 = _context6['catch'](1);
-                                return _context6.abrupt('return', "failed");
+                            case 25:
+                                _context5.prev = 25;
+                                _context5.t0 = _context5['catch'](1);
+                                return _context5.abrupt('return', "failed");
 
-                            case 36:
+                            case 28:
                             case 'end':
-                                return _context6.stop();
+                                return _context5.stop();
                         }
                     }
-                }, _callee6, this, [[1, 33]]);
+                }, _callee5, this, [[1, 25]]);
             }));
 
-            function validePwd(_x4) {
-                return _ref16.apply(this, arguments);
+            function validePwd(_x3) {
+                return _ref18.apply(this, arguments);
             }
 
             return validePwd;
@@ -1554,7 +1521,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this12.paymode.currentMode.memberId,
+                meMemberId: _this12.member.ID,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1571,105 +1538,37 @@ var SettlementStore = (_class = function () {
         var _this13 = this;
 
         return function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(_this) {
-                var _getLoginInfo, IdStore, StoreCode, resp;
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
+                var _getLoginInfo2, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context6.prev = _context6.next) {
                             case 0:
-                                _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context7.next = 3;
+                                _getLoginInfo2 = _this13.getLoginInfo(), IdStore = _getLoginInfo2.IdStore, StoreCode = _getLoginInfo2.StoreCode;
+                                _context6.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context7.sent;
+                                resp = _context6.sent;
 
                                 _this.member = resp;
-                                _this.paymode.currentMode.storageCardNo = resp.StorageCardNo;
-                                return _context7.abrupt('return', _promise2.default.resolve(resp));
+                                _this.paymode.currentMode.member.setStorageCardNo(resp.StorageCardNo);
+                                return _context6.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context7.stop();
-                        }
-                    }
-                }, _callee7, _this13);
-            }));
-
-            return function (_x5) {
-                return _ref18.apply(this, arguments);
-            };
-        }();
-    }
-}), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this14 = this;
-
-        return function () {
-            var _ref19 = (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, false, false, { method: 'get' });
-
-                            case 2:
-                                result = _context8.sent;
-
-                                if (result && result.data.length) {
-                                    result.data.forEach(function (m) {
-                                        if (m.CardTypeEnum === 'BALANCE_CARD') {
-                                            // 会员概念改为卡，把这些字段都放开
-                                            _this14.paymode.updateCardInfo(m);
-                                        }
-                                    });
-                                }
-
-                            case 4:
-                            case 'end':
-                                return _context8.stop();
+                                return _context6.stop();
                         }
                     }
-                }, _callee8, _this14);
+                }, _callee6, _this13);
             }));
 
-            return function (_x6) {
-                return _ref19.apply(this, arguments);
+            return function (_x4) {
+                return _ref20.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 () {
@@ -1684,19 +1583,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor5, this);
-
-        _initDefineProp(this, 'received', _descriptor6, this);
-
-        _initDefineProp(this, 'receivable', _descriptor7, this);
+        _initDefineProp(this, 'currentFocus', _descriptor3, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor8, this);
+        _initDefineProp(this, 'received', _descriptor4, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
+        _initDefineProp(this, 'receivable', _descriptor5, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
+        _initDefineProp(this, 'paymodes', _descriptor6, this);
 
-        _initDefineProp(this, 'balance', _descriptor11, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor7, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1705,11 +1600,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor12, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor8, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor13, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor9, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor14, this);
+        _initDefineProp(this, 'addDjqs', _descriptor10, this);
     }
     // @observable store = null;
 
@@ -1745,22 +1640,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.received = (0, _utils.getFixedNumber)(sum);
             this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
-    }, {
-        key: 'updateCardInfo',
-        value: function updateCardInfo(m) {
-            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;
-        }
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this16 = this;
+            var _this14 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1807,7 +1690,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this16.checkList.splice(i, 1);
+                        _this14.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -1849,13 +1732,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 // }
                 // else
                 // {
+
                 var bookingQuantity = 0;
                 if (item.BookingQuantity) {
                     bookingQuantity = item.BookingQuantity;
                 }
                 detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
                 detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
-                //} 
                 detailDTO.taxRate = item.TaxRate;
                 detailDTO.quantity = item.Quantity;
 
@@ -1879,7 +1762,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this16.currentMode.djqs.forEach(function (djq) {
+                        _this14.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
@@ -1924,10 +1807,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: 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);
+                            _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this16.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -2017,7 +1900,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
 
             if (this.amount > 0 && (v === '' || v === '0.00') && sum !== 0) {
                 this.currentMode.errinfo = "实收金额必须录入";
-            } else if (Math.abs(parseFloat(v)) > Math.abs((0, _utils.getFixedNumber)(sum))) {
+            } else if (Math.abs(parseFloat(v)) > Math.abs(sum)) {
                 this.currentMode.errinfo = "实收不应大于应收";
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
@@ -2026,28 +1909,28 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcMemberBalance',
         value: function calcMemberBalance() {
-            this.currentMode.balance = this.currentMode.rawbalance - this.currentMode.value;
+            this.currentMode.balance = this.currentMode.member.rawbalance - this.currentMode.value;
         }
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(type, isIntegralExchange) {
-                var _this17 = this;
+            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+                var _this15 = this;
 
                 var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
-                        switch (_context10.prev = _context10.next) {
+                        switch (_context7.prev = _context7.next) {
                             case 0:
                                 _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context10.next = 5;
+                                _context7.next = 5;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
                             case 5:
-                                modes = _context10.sent;
+                                modes = _context7.sent;
 
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
@@ -2056,7 +1939,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,
@@ -2072,20 +1955,20 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
-                                        _this17.paymodes = paymodes;
+                                        _this15.paymodes = paymodes;
                                         //modes.QuickSettleStyles
                                     });
                                 }
 
                             case 7:
                             case 'end':
-                                return _context10.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee10, this);
+                }, _callee7, this);
             }));
 
-            function setPaymodes(_x7, _x8) {
+            function setPaymodes(_x5, _x6) {
                 return _ref24.apply(this, arguments);
             }
 
@@ -2103,57 +1986,47 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor3 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
-    enumerable: true,
-    initializer: function initializer() {
-        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], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this16 = this;
 
         return function () {
-            _this18.checkList = [];
+            _this16.checkList = [];
         };
     }
-}), _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], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this19 = this;
+        var _this17 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this19.currentMode.djqs.forEach(function (ele) {
+            _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
@@ -2163,10 +2036,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this20 = this;
+        var _this18 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2188,25 +2061,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this20.currentMode.djqs.push(djq);
+            _this18.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this21 = this;
+        var _this19 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor15, this);
+        _initDefineProp(this, 'cardNo', _descriptor11, this);
 
-        _initDefineProp(this, 'balance', _descriptor16, this);
+        _initDefineProp(this, 'balance', _descriptor12, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor17, this);
+        _initDefineProp(this, 'exchangable', _descriptor13, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
+        _initDefineProp(this, 'MeStorageCardId', _descriptor14, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor19, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor15, this);
 
         if (m) {
             this.id = m.ID;
@@ -2220,12 +2093,14 @@ var Member = exports.Member = (_class5 = function () {
             var _ref25 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref25.isNewRetailBCPos;
 
+            m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
+            m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
             (0, _mobx.runInAction)(function () {
-                _this21.cardNo = m.CardCode;
+                _this19.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this21.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this21.balance = _this21.rawbalance;
+                    _this19.balance = _this19.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2245,22 +2120,32 @@ 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;
-}(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'MeStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _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), _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);
 //# sourceMappingURL=settlementStore.js.map