tplus-components-touch 3.33.9 → 3.33.13

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, _descriptor5, _desc2, _value2, _class3, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _desc3, _value3, _class5, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20;
+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');
 
@@ -234,8 +234,6 @@ var SettlementStore = (_class = function () {
                 var promoVoucher = {};
                 _this2.paymode.clearDjqs();
                 _this2.paymode.reCalculationDjqs();
-                // promoVoucher.bizDate = dto.VoucherDate;
-                // promoVoucher.bizDate = new Date().getTime();
                 promoVoucher.coupon_code = coupon_code || "";
                 promoVoucher.boName = "Retail";
                 promoVoucher.voucherId = dto.ID;
@@ -322,11 +320,7 @@ var SettlementStore = (_class = function () {
                                 _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
                             } else {
                                 var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
-
-                                var _ref2 = _mutantsUtil.platform || {},
-                                    isNewRetailBCPos = _ref2.isNewRetailBCPos;
-
-                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
+                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" && nominalAmount, promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
                             }
                         });
                         if (promoVoucher.coupon_code) {
@@ -349,14 +343,14 @@ var SettlementStore = (_class = function () {
         };
 
         this.checkCoupon = function () {
-            var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
-                var _ref4, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
+            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
+                var _ref3, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
 
                 return _regenerator2.default.wrap(function _callee$(_context) {
                     while (1) {
                         switch (_context.prev = _context.next) {
                             case 0:
-                                _ref4 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref4.isNewRetailBCPos;
+                                _ref3 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref3.isNewRetailBCPos;
 
                                 if (!isNewRetailBCPos) {
                                     _context.next = 7;
@@ -424,7 +418,7 @@ var SettlementStore = (_class = function () {
             }));
 
             return function (_x) {
-                return _ref3.apply(this, arguments);
+                return _ref2.apply(this, arguments);
             };
         }();
 
@@ -437,7 +431,8 @@ var SettlementStore = (_class = function () {
                     zIndex: 1007,
                     content: content,
                     onOk: function () {
-                        var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+                        var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+                            var ret;
                             return _regenerator2.default.wrap(function _callee2$(_context2) {
                                 while (1) {
                                     switch (_context2.prev = _context2.next) {
@@ -446,9 +441,15 @@ var SettlementStore = (_class = function () {
                                             return _this2.saveMember();
 
                                         case 2:
-                                            resolve(true);
+                                            ret = _context2.sent;
+
+                                            if (ret === false) {
+                                                resolve(false);
+                                            } else {
+                                                resolve(true);
+                                            }
 
-                                        case 3:
+                                        case 4:
                                         case 'end':
                                             return _context2.stop();
                                     }
@@ -457,7 +458,7 @@ var SettlementStore = (_class = function () {
                         }));
 
                         return function onOk() {
-                            return _ref5.apply(this, arguments);
+                            return _ref4.apply(this, arguments);
                         };
                     }(),
                     onCancel: function onCancel() {
@@ -467,8 +468,6 @@ var SettlementStore = (_class = function () {
             });
         };
 
-        _initDefineProp(this, 'setVoucherDate', _descriptor5, this);
-
         this.checkIntegralExchangeReturn = function (id) {
             return new _promise2.default(function (resolve, reject) {
                 (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -584,8 +583,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn5.PayStyle;
 
-            var _ref6 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref6.isNewRetailBCPos;
+            var _ref5 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
@@ -611,19 +610,19 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                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);
+                                var _ref6 = djq || {},
+                                    displayText = _ref6.displayText,
+                                    promoRuleId = _ref6.promoRuleId,
+                                    dateMount = _ref6.dateMount,
+                                    promoMethodEnum = _ref6.promoMethodEnum,
+                                    discountPct = _ref6.discountPct,
+                                    promoId = _ref6.promoId,
+                                    id = _ref6.id;
+
+                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
                     _this5.paymode.thePaymodes.push(newmode);
@@ -726,15 +725,15 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref8 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref8.isNewRetailBCPos;
+            var _ref7 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref7.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
                 // 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 _callee3(result) {
+                    var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
                         var data, m;
                         return _regenerator2.default.wrap(function _callee3$(_context3) {
                             while (1) {
@@ -809,7 +808,7 @@ var SettlementStore = (_class = function () {
                     }));
 
                     return function (_x2) {
-                        return _ref9.apply(this, arguments);
+                        return _ref8.apply(this, arguments);
                     };
                 }()
                 // result.data.forEach((m) => {
@@ -856,12 +855,13 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addDjq',
-        value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
+        value: function addDjq(promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
             var djq = {
                 code: promoCouponCode,
                 promoCouponCode: promoCouponCode,
                 name: name,
                 IsEnable: IsEnable,
+                nominalAmount: nominalAmount,
                 amount: amount,
                 doorsill: doorsill, //:"无门槛"
                 LastTS: LastTS,
@@ -1078,13 +1078,14 @@ var SettlementStore = (_class = function () {
         value: function addPay(type, isQuick) {
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
-            // const hasThirdPay = this.paymode.thePaymodes.findIndex(v => !!v.thridPayment);
-            // if (hasThirdPay > -1) {
-            //     Message.warn('二开支付目前仅支持单一结算。');
-            //     return;
-            // }
-
 
+            var hasThirdPay = this.paymode.thePaymodes.filter(function (v) {
+                return !!v.thridPayment && v.value > 0;
+            }) || [];
+            if (hasThirdPay && hasThirdPay.length > 0) {
+                _message2.default.warn('二开支付目前仅支持单一结算。');
+                return;
+            }
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
                 var index = (0, _findLastIndex3.default)(this.paymode.thePaymodes, function (m) {
@@ -1153,8 +1154,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
-                var ret, _ref11, _ref11$data, code, returnMsg, state, _ret;
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
+                var status, paylist, ret, _ref10, _ref10$data, code, returnMsg, state, ret1, ret2;
 
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
@@ -1170,96 +1171,116 @@ var SettlementStore = (_class = function () {
                                 return _context4.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _context4.prev = 3;
+                                status = this.type;
+                                _context4.prev = 4;
+                                paylist = this.paymode.thePaymodes.filter(function (v) {
+                                    return !!v.thridPayment && v.value > 0;
+                                }) || [];
+
+                                if (!(paylist && paylist.length > 1)) {
+                                    _context4.next = 9;
+                                    break;
+                                }
+
+                                _message2.default.warn('二开支付目前仅支持单一结算方式。');
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                                if (!(this.type == 1)) {
-                                    _context4.next = 23;
+                            case 9:
+                                if (!(status == 1)) {
+                                    _context4.next = 30;
                                     break;
                                 }
 
-                                _context4.next = 7;
+                                _context4.next = 12;
                                 return this.findStorageBillValidate();
 
-                            case 7:
+                            case 12:
                                 ret = _context4.sent;
-                                _ref11 = ret || {}, _ref11$data = _ref11.data;
-                                _ref11$data = _ref11$data === undefined ? {} : _ref11$data;
-                                code = _ref11$data.code, returnMsg = _ref11$data.returnMsg;
+                                _ref10 = ret || {}, _ref10$data = _ref10.data;
+                                _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
+                                code = _ref10$data.code, returnMsg = _ref10$data.returnMsg;
 
                                 if (!(code && code == 10001)) {
-                                    _context4.next = 19;
+                                    _context4.next = 24;
                                     break;
                                 }
 
-                                _context4.next = 14;
+                                _context4.next = 19;
                                 return this.repeatStorageModal(returnMsg);
 
-                            case 14:
+                            case 19:
                                 state = _context4.sent;
 
                                 if (!(state === false)) {
-                                    _context4.next = 17;
+                                    _context4.next = 22;
                                     break;
                                 }
 
                                 return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                            case 17:
-                                _context4.next = 21;
+                            case 22:
+                                _context4.next = 28;
                                 break;
 
-                            case 19:
-                                _context4.next = 21;
+                            case 24:
+                                _context4.next = 26;
                                 return this.saveMember();
 
-                            case 21:
-                                _context4.next = 32;
+                            case 26:
+                                ret1 = _context4.sent;
+
+                                if (ret1 === false) {
+                                    _promise2.default.resolve(false);
+                                }
+
+                            case 28:
+                                _context4.next = 39;
                                 break;
 
-                            case 23:
-                                _context4.next = 25;
+                            case 30:
+                                _context4.next = 32;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
-                            case 25:
-                                _context4.next = 27;
+                            case 32:
+                                _context4.next = 34;
                                 return this.save();
 
-                            case 27:
-                                _ret = _context4.sent;
+                            case 34:
+                                ret2 = _context4.sent;
 
-                                if (!(_ret === false)) {
-                                    _context4.next = 30;
+                                if (!(ret2 === false)) {
+                                    _context4.next = 37;
                                     break;
                                 }
 
                                 return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                            case 30:
-                                _context4.next = 32;
+                            case 37:
+                                _context4.next = 39;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
-                            case 32:
+                            case 39:
                                 return _context4.abrupt('return', _promise2.default.resolve(true));
 
-                            case 35:
-                                _context4.prev = 35;
-                                _context4.t0 = _context4['catch'](3);
+                            case 42:
+                                _context4.prev = 42;
+                                _context4.t0 = _context4['catch'](4);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
                                 //其他支付失败时,处理二开支付情况。
-                                this.thirdPayRefund();
+                                this.thirdPayRefund(status == 1 ? 2 : 1);
                                 return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
 
-                            case 40:
+                            case 47:
                             case 'end':
                                 return _context4.stop();
                         }
                     }
-                }, _callee4, this, [[3, 35]]);
+                }, _callee4, this, [[4, 42]]);
             }));
 
             function commit(_x3) {
-                return _ref10.apply(this, arguments);
+                return _ref9.apply(this, arguments);
             }
 
             return commit;
@@ -1272,59 +1293,119 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'saveMember',
-        value: function saveMember() {
-            var _this11 = this;
+        value: function () {
+            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _this11 = this;
 
-            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn15.PayStyle;
+                var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
 
-            (0, _mobx.runInAction)(function () {
-                _this11.dto.StorageMutiSettleDetails = [];
-                var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
-                    return parseFloat(mode.value) != 0;
-                }) : _this11.paymode.thePaymodes;
-                (0, _each3.default)(thePaymodes, function (mode) {
-                    var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
+                    while (1) {
+                        switch (_context5.prev = _context5.next) {
+                            case 0:
+                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle, TradeType = _enumController$getEn15.TradeType;
 
-                    var value = parseFloat(mode.value);
-                    var giveChange = null;
-                    if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
-                        value = Math.Add(value, _this11.paymode.receivable);
-                        giveChange = Math.abs(_this11.paymode.receivable);
+                                (0, _mobx.runInAction)(function () {
+                                    _this11.dto.StorageMutiSettleDetails = [];
+                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
+                                        return parseFloat(mode.value) != 0;
+                                    }) : _this11.paymode.thePaymodes;
+                                    (0, _each3.default)(thePaymodes, function (mode) {
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+
+                                        var value = parseFloat(mode.value);
+                                        var giveChange = null;
+                                        if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
+                                            value = Math.Add(value, _this11.paymode.receivable);
+                                            giveChange = Math.abs(_this11.paymode.receivable);
+                                        }
+                                        _this11.dto.StorageMutiSettleDetails.push({
+                                            Code: mode.paymethodId,
+                                            StorageAmount: value,
+                                            GiveChange: giveChange,
+                                            IdsettleStyle: themode.idSettleStyle,
+                                            IdbankAccount: themode.idBankAccount,
+                                            PaymentCode: mode.authCode,
+                                            DynamicPropertyKeys: [],
+                                            DynamicPropertyValues: [],
+                                            DataSource: { Id: _this11.dataSource },
+                                            ThirdPaymentInfo: themode.thridPayment || null,
+                                            ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
+                                        });
+                                    });
+                                });
+                                // cc结算调用
+                                IPMSG = {};
+
+                                if (!!window.localStorage.IPMSG) {
+                                    IPMSG = JSON.parse(window.localStorage.IPMSG);
+                                }
+                                dtoParams = this.dto;
+                                //处理存在二开支付情况
+
+                                payList = dtoParams.StorageMutiSettleDetails.filter(function (v) {
+                                    return v.ThirdPaymentInfo;
+                                });
+
+                                if (!(payList && payList.length > 0)) {
+                                    _context5.next = 19;
+                                    break;
+                                }
+
+                                payment = payList[0];
+                                tradeType = payment && payment.StorageAmount > 0 ? TradeType.PAY : TradeType.REFUND;
+                                _context5.next = 11;
+                                return this.thirdPay(2, payment, tradeType, dtoParams);
+
+                            case 11:
+                                ret = _context5.sent;
+                                _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
+
+                                if (!(type === true)) {
+                                    _context5.next = 17;
+                                    break;
+                                }
+
+                                dtoParams = data;
+                                _context5.next = 19;
+                                break;
+
+                            case 17:
+                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
+                                return _context5.abrupt('return', false);
+
+                            case 19:
+                                this.dtoParams = dtoParams;
+                                console.log('储值结算信息:', dtoParams);
+                                return _context5.abrupt('return', (0, _tplusApi.tApi)({ dto: dtoParams }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
+                                    _this11.handlePrint(resp);
+                                }));
+
+                            case 22:
+                            case 'end':
+                                return _context5.stop();
+                        }
                     }
-                    _this11.dto.StorageMutiSettleDetails.push({
-                        Code: mode.paymethodId,
-                        StorageAmount: value,
-                        GiveChange: giveChange,
-                        IdsettleStyle: themode.idSettleStyle,
-                        IdbankAccount: themode.idBankAccount,
-                        PaymentCode: mode.authCode,
-                        DynamicPropertyKeys: [],
-                        DynamicPropertyValues: [],
-                        DataSource: { Id: _this11.dataSource }
-                    });
-                });
-            });
-            // cc结算调用
-            var IPMSG = {};
-            if (!!window.localStorage.IPMSG) {
-                IPMSG = JSON.parse(window.localStorage.IPMSG);
+                }, _callee5, this);
+            }));
+
+            function saveMember() {
+                return _ref11.apply(this, arguments);
             }
-            return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                _this11.handlePrint(resp);
-            });
-        }
+
+            return saveMember;
+        }()
     }, {
         key: 'save',
         value: function () {
-            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                 var _this12 = this;
 
-                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, amount, tradeType, ret, _ref13, type, data, msg, code;
+                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, payment, tradeType, ret, _ref14, type, data, msg, code;
 
-                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:
                                 _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle, TradeType = _enumController$getEn16.TradeType;
 
@@ -1419,32 +1500,32 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _context5.t1 = this.dto.IdbusiType == 37;
+                                _context6.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context5.t1) {
-                                    _context5.next = 11;
+                                if (!_context6.t1) {
+                                    _context6.next = 11;
                                     break;
                                 }
 
-                                _context5.next = 10;
+                                _context6.next = 10;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
                             case 10:
-                                _context5.t1 = _context5.sent;
+                                _context6.t1 = _context6.sent;
 
                             case 11:
-                                _context5.t0 = _context5.t1;
+                                _context6.t0 = _context6.t1;
 
-                                if (_context5.t0) {
-                                    _context5.next = 14;
+                                if (_context6.t0) {
+                                    _context6.next = 14;
                                     break;
                                 }
 
-                                _context5.t0 = this.dto.IdbusiType != 37;
+                                _context6.t0 = this.dto.IdbusiType != 37;
 
                             case 14:
-                                if (!_context5.t0) {
-                                    _context5.next = 33;
+                                if (!_context6.t0) {
+                                    _context6.next = 33;
                                     break;
                                 }
 
@@ -1456,38 +1537,38 @@ var SettlementStore = (_class = function () {
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context5.next = 30;
+                                    _context6.next = 30;
                                     break;
                                 }
 
-                                amount = payList[0].Amount;
-                                tradeType = amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context5.next = 22;
-                                return this.thirdPay(tradeType, dtoParams);
+                                payment = payList[0];
+                                tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
+                                _context6.next = 22;
+                                return this.thirdPay(1, payment, tradeType, dtoParams);
 
                             case 22:
-                                ret = _context5.sent;
-                                _ref13 = ret || {}, type = _ref13.type, data = _ref13.data, msg = _ref13.msg, code = _ref13.code;
+                                ret = _context6.sent;
+                                _ref14 = ret || {}, type = _ref14.type, data = _ref14.data, msg = _ref14.msg, code = _ref14.code;
 
                                 if (!(type === true)) {
-                                    _context5.next = 28;
+                                    _context6.next = 28;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context5.next = 30;
+                                _context6.next = 30;
                                 break;
 
                             case 28:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context5.abrupt('return', false);
+                                return _context6.abrupt('return', false);
 
                             case 30:
                                 this.dtoParams = dtoParams;
                                 console.log('结算信息:', dtoParams);
-                                return _context5.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    var _ref14 = resp || {},
-                                        ID = _ref14.ID;
+                                return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
+                                    var _ref15 = resp || {},
+                                        ID = _ref15.ID;
 
                                     _this12.setDtoID(ID);
                                     _this12.billID = ID;
@@ -1496,14 +1577,14 @@ var SettlementStore = (_class = function () {
 
                             case 33:
                             case 'end':
-                                return _context5.stop();
+                                return _context6.stop();
                         }
                     }
-                }, _callee5, this);
+                }, _callee6, this);
             }));
 
             function save() {
-                return _ref12.apply(this, arguments);
+                return _ref13.apply(this, arguments);
             }
 
             return save;
@@ -1520,76 +1601,100 @@ var SettlementStore = (_class = function () {
             return data;
         }
 
-        //二开支付
+        /** 
+         * 二开支付
+         * vType：1零售单、2储值单
+         * payment：结算方式
+         * trade：00表示结算、02表示退款
+         * dto：结算数据集合
+        */
 
     }, {
         key: 'thirdPay',
         value: function () {
-            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(status, dto) {
-                var cto, params, ret, _ref16, Code, Message, Result, _ref17, ThirdPaymentReturnInfo;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
+                var cto, params, ret, _ref17, Code, _Message, Result, _ref18, ThirdPaymentReturnInfo;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context7.prev = _context7.next) {
                             case 0:
+                                _context7.prev = 0;
                                 cto = this.removeThirdPayDto(dto);
-                                params = { TradeType: status, dto: cto };
+                                params = { VoucherType: vType, Payment: payment, TradeType: trade, dto: cto };
 
                                 console.log('刷卡信息:', (0, _stringify2.default)(params));
-                                _context6.next = 5;
+                                _context7.next = 6;
                                 return new _promise2.default(function (resolve, reject) {
                                     _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
                                         return resolve(res);
                                     });
                                 });
 
-                            case 5:
-                                ret = _context6.sent;
+                            case 6:
+                                ret = _context7.sent;
 
                                 console.log('刷卡返回信息:', ret);
                                 ret = JSON.parse(ret);
-                                _ref16 = ret || {}, Code = _ref16.Code, Message = _ref16.Message, Result = _ref16.Result;
+                                _ref17 = ret || {}, Code = _ref17.Code, _Message = _ref17.Message, Result = _ref17.Result;
 
                                 if (!(Code > 0)) {
-                                    _context6.next = 13;
+                                    _context7.next = 14;
                                     break;
                                 }
 
-                                return _context6.abrupt('return', { type: false, data: null, msg: Message, code: Code });
+                                return _context7.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
 
-                            case 13:
+                            case 14:
                                 if (!(status == '00')) {
-                                    _context6.next = 19;
+                                    _context7.next = 20;
                                     break;
                                 }
 
-                                _ref17 = Result || {}, ThirdPaymentReturnInfo = _ref17.ThirdPaymentReturnInfo;
+                                _ref18 = Result || {}, ThirdPaymentReturnInfo = _ref18.ThirdPaymentReturnInfo;
 
-                                dto.RetailPaymentDetails.forEach(function (v) {
-                                    if (v.ThirdPaymentInfo != null) {
-                                        v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
-                                    }
-                                });
-                                return _context6.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+                                if (vType == 1) {
+                                    dto.RetailPaymentDetails.forEach(function (v) {
+                                        if (v.ThirdPaymentInfo != null) {
+                                            v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
+                                        }
+                                    });
+                                } else if (vType == 2) {
+                                    dto.StorageMutiSettleDetails.forEach(function (v) {
+                                        if (v.ThirdPaymentInfo != null) {
+                                            v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
+                                        }
+                                    });
+                                }
+                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
-                            case 19:
+                            case 20:
                                 if (!(status == '02')) {
-                                    _context6.next = 21;
+                                    _context7.next = 22;
                                     break;
                                 }
 
-                                return _context6.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+
+                            case 22:
+                                _context7.next = 27;
+                                break;
 
-                            case 21:
+                            case 24:
+                                _context7.prev = 24;
+                                _context7.t0 = _context7['catch'](0);
+                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0 });
+
+                            case 27:
                             case 'end':
-                                return _context6.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee6, this);
+                }, _callee7, this, [[0, 24]]);
             }));
 
-            function thirdPay(_x4, _x5) {
-                return _ref15.apply(this, arguments);
+            function thirdPay(_x4, _x5, _x6, _x7) {
+                return _ref16.apply(this, arguments);
             }
 
             return thirdPay;
@@ -1600,17 +1705,17 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'thirdPayRefund',
         value: function () {
-            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
                 var _this13 = this;
 
-                var dto, pay, _enumController$getEn17, TradeType;
+                var dto, pay, payment, _enumController$getEn17, TradeType;
 
-                return _regenerator2.default.wrap(function _callee8$(_context8) {
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context9.prev = _context9.next) {
                             case 0:
-                                dto = this.dtoParams;
-                                pay = dto && dto.RetailPaymentDetails.filter(function (v) {
+                                dto = type == 1 ? this.dtoParams.RetailPaymentDetails : this.dtoParams.StorageMutiSettleDetails;
+                                pay = dto && dto.filter(function (v) {
                                     return v.ThirdPaymentInfo;
                                 });
 
@@ -1618,43 +1723,44 @@ var SettlementStore = (_class = function () {
                                     setTimeout(function () {
                                         _message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
                                     }, 1000);
+                                    payment = pay[0];
                                     _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
 
-                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-                                        var ret, _ref20, msg;
+                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                                        var ret, _ref21, msg;
 
-                                        return _regenerator2.default.wrap(function _callee7$(_context7) {
+                                        return _regenerator2.default.wrap(function _callee8$(_context8) {
                                             while (1) {
-                                                switch (_context7.prev = _context7.next) {
+                                                switch (_context8.prev = _context8.next) {
                                                     case 0:
-                                                        _context7.next = 2;
-                                                        return _this13.thirdPay(TradeType.REFUND, dto);
+                                                        _context8.next = 2;
+                                                        return _this13.thirdPay(type, payment, TradeType.REFUND, dto);
 
                                                     case 2:
-                                                        ret = _context7.sent;
-                                                        _ref20 = ret || {}, msg = _ref20.msg;
+                                                        ret = _context8.sent;
+                                                        _ref21 = ret || {}, msg = _ref21.msg;
 
                                                         console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
 
                                                     case 5:
                                                     case 'end':
-                                                        return _context7.stop();
+                                                        return _context8.stop();
                                                 }
                                             }
-                                        }, _callee7, _this13);
+                                        }, _callee8, _this13);
                                     })), 4500);
                                 }
 
                             case 3:
                             case 'end':
-                                return _context8.stop();
+                                return _context9.stop();
                         }
                     }
-                }, _callee8, this);
+                }, _callee9, this);
             }));
 
-            function thirdPayRefund() {
-                return _ref18.apply(this, arguments);
+            function thirdPayRefund(_x8) {
+                return _ref19.apply(this, arguments);
             }
 
             return thirdPayRefund;
@@ -1667,35 +1773,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                     while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context10.prev = _context10.next) {
                             case 0:
-                                _context9.prev = 0;
-                                _context9.t0 = _promise2.default;
-                                _context9.next = 4;
+                                _context10.prev = 0;
+                                _context10.t0 = _promise2.default;
+                                _context10.next = 4;
                                 return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
 
                             case 4:
-                                _context9.t1 = _context9.sent;
-                                return _context9.abrupt('return', _context9.t0.resolve.call(_context9.t0, _context9.t1));
+                                _context10.t1 = _context10.sent;
+                                return _context10.abrupt('return', _context10.t0.resolve.call(_context10.t0, _context10.t1));
 
                             case 8:
-                                _context9.prev = 8;
-                                _context9.t2 = _context9['catch'](0);
-                                return _context9.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context10.prev = 8;
+                                _context10.t2 = _context10['catch'](0);
+                                return _context10.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context9.stop();
+                                return _context10.stop();
                         }
                     }
-                }, _callee9, this, [[0, 8]]);
+                }, _callee10, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref21.apply(this, arguments);
+                return _ref22.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1721,18 +1827,18 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(value) {
-                var _ref23, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
+                var _ref24, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+                return _regenerator2.default.wrap(function _callee11$(_context11) {
                     while (1) {
-                        switch (_context10.prev = _context10.next) {
+                        switch (_context11.prev = _context11.next) {
                             case 0:
-                                _ref23 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref23.isNewRetailBCPos;
-                                _context10.prev = 1;
+                                _ref24 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref24.isNewRetailBCPos;
+                                _context11.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context10.next = 33;
+                                    _context11.next = 33;
                                     break;
                                 }
 
@@ -1742,60 +1848,60 @@ var SettlementStore = (_class = function () {
                                 memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context10.next = 12;
+                                    _context11.next = 12;
                                     break;
                                 }
 
                                 if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context10.next = 12;
+                                    _context11.next = 12;
                                     break;
                                 }
 
                                 if (!(cook2[memberStorageId] > 3)) {
-                                    _context10.next = 12;
+                                    _context11.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context10.abrupt('return', _promise2.default.resolve(message));
+                                return _context11.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, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
                                 result = null;
 
                                 if (!(cardTypeEnum === 'BALANCE_CARD')) {
-                                    _context10.next = 20;
+                                    _context11.next = 20;
                                     break;
                                 }
 
-                                _context10.next = 17;
+                                _context11.next = 17;
                                 return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
 
                             case 17:
-                                result = _context10.sent;
-                                _context10.next = 29;
+                                result = _context11.sent;
+                                _context11.next = 29;
                                 break;
 
                             case 20:
                                 if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
-                                    _context10.next = 26;
+                                    _context11.next = 26;
                                     break;
                                 }
 
-                                _context10.next = 23;
+                                _context11.next = 23;
                                 return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 23:
-                                result = _context10.sent;
-                                _context10.next = 29;
+                                result = _context11.sent;
+                                _context11.next = 29;
                                 break;
 
                             case 26:
-                                _context10.next = 28;
+                                _context11.next = 28;
                                 return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 28:
-                                result = _context10.sent;
+                                result = _context11.sent;
 
                             case 29:
                                 if (!result.data) {
@@ -1814,38 +1920,38 @@ var SettlementStore = (_class = function () {
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context10.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context11.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
                             case 33:
-                                _context10.next = 35;
+                                _context11.next = 35;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
                             case 35:
-                                _result = _context10.sent;
-                                return _context10.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                                _result = _context11.sent;
+                                return _context11.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
                             case 37:
-                                _context10.next = 42;
+                                _context11.next = 42;
                                 break;
 
                             case 39:
-                                _context10.prev = 39;
-                                _context10.t0 = _context10['catch'](1);
-                                return _context10.abrupt('return', "failed");
+                                _context11.prev = 39;
+                                _context11.t0 = _context11['catch'](1);
+                                return _context11.abrupt('return', "failed");
 
                             case 42:
                             case 'end':
-                                return _context10.stop();
+                                return _context11.stop();
                         }
                     }
-                }, _callee10, this, [[1, 39]]);
+                }, _callee11, this, [[1, 39]]);
             }));
 
-            function validePwd(_x6) {
-                return _ref22.apply(this, arguments);
+            function validePwd(_x9) {
+                return _ref23.apply(this, arguments);
             }
 
             return validePwd;
@@ -1884,34 +1990,34 @@ var SettlementStore = (_class = function () {
         var _this15 = this;
 
         return function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(_this) {
+            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee11$(_context11) {
+                return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context12.prev = _context12.next) {
                             case 0:
                                 _getLoginInfo = _this15.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context11.next = 3;
+                                _context12.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this15.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context11.sent;
+                                resp = _context12.sent;
 
                                 _this.member = resp;
                                 _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
-                                return _context11.abrupt('return', _promise2.default.resolve(resp));
+                                return _context12.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context11.stop();
+                                return _context12.stop();
                         }
                     }
-                }, _callee11, _this15);
+                }, _callee12, _this15);
             }));
 
-            return function (_x7) {
-                return _ref24.apply(this, arguments);
+            return function (_x10) {
+                return _ref25.apply(this, arguments);
             };
         }();
     }
@@ -1921,62 +2027,62 @@ var SettlementStore = (_class = function () {
         var _this16 = this;
 
         return function () {
-            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(memberId) {
+            var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
                 var result;
-                return _regenerator2.default.wrap(function _callee12$(_context12) {
+                return _regenerator2.default.wrap(function _callee13$(_context13) {
                     while (1) {
-                        switch (_context12.prev = _context12.next) {
+                        switch (_context13.prev = _context13.next) {
                             case 0:
-                                _context12.next = 2;
+                                _context13.next = 2;
                                 return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
 
                             case 2:
-                                result = _context12.sent;
+                                result = _context13.sent;
 
                                 if (!(result && result.data.length)) {
-                                    _context12.next = 20;
+                                    _context13.next = 20;
                                     break;
                                 }
 
                                 if (!(result.data.length === 1)) {
-                                    _context12.next = 9;
+                                    _context13.next = 9;
                                     break;
                                 }
 
                                 _this16.paymode.updateCardInfo(result.data[0]);
-                                return _context12.abrupt('return', result.data);
+                                return _context13.abrupt('return', result.data);
 
                             case 9:
                                 if (!(result.data && result.data.length === 1)) {
-                                    _context12.next = 14;
+                                    _context13.next = 14;
                                     break;
                                 }
 
                                 _this16.paymode.updateCardInfo(result.data[0]);
-                                return _context12.abrupt('return', result.data);
+                                return _context13.abrupt('return', result.data);
 
                             case 14:
                                 if (!(result.data && result.data.length > 1)) {
-                                    _context12.next = 18;
+                                    _context13.next = 18;
                                     break;
                                 }
 
-                                return _context12.abrupt('return', result.data);
+                                return _context13.abrupt('return', result.data);
 
                             case 18:
                                 _message2.default.warn('没有可用储值卡！');
-                                return _context12.abrupt('return', false);
+                                return _context13.abrupt('return', false);
 
                             case 20:
                             case 'end':
-                                return _context12.stop();
+                                return _context13.stop();
                         }
                     }
-                }, _callee12, _this16);
+                }, _callee13, _this16);
             }));
 
-            return function (_x8) {
-                return _ref25.apply(this, arguments);
+            return function (_x11) {
+                return _ref26.apply(this, arguments);
             };
         }();
     }
@@ -1985,39 +2091,30 @@ var SettlementStore = (_class = function () {
     initializer: function initializer() {
         var _this17 = this;
 
-        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
             var address, result;
-            return _regenerator2.default.wrap(function _callee13$(_context13) {
+            return _regenerator2.default.wrap(function _callee14$(_context14) {
                 while (1) {
-                    switch (_context13.prev = _context13.next) {
+                    switch (_context14.prev = _context14.next) {
                         case 0:
                             address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this17.paymode.currentMode.storageCardNo;
-                            _context13.next = 3;
+                            _context14.next = 3;
                             return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
 
                         case 3:
-                            result = _context13.sent;
+                            result = _context14.sent;
 
                             _this17.paymode.updateCardInfo(result.data);
 
                         case 5:
                         case 'end':
-                            return _context13.stop();
+                            return _context14.stop();
                     }
                 }
-            }, _callee13, _this17);
+            }, _callee14, _this17);
         }));
     }
-}), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'setVoucherDate', [_mobx.action], {
-    enumerable: true,
-    initializer: function initializer() {
-        var _this18 = this;
-
-        return function () {
-            _this18.dto.VoucherDate = new Date();
-        };
-    }
-}), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
+}), _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 () {
     //应收
@@ -2031,19 +2128,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor6, this);
+        _initDefineProp(this, 'currentFocus', _descriptor5, this);
 
-        _initDefineProp(this, 'received', _descriptor7, this);
+        _initDefineProp(this, 'received', _descriptor6, this);
 
-        _initDefineProp(this, 'receivable', _descriptor8, this);
+        _initDefineProp(this, 'receivable', _descriptor7, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor9, this);
+        _initDefineProp(this, 'paymodes', _descriptor8, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor10, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor11, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
 
-        _initDefineProp(this, 'balance', _descriptor12, this);
+        _initDefineProp(this, 'balance', _descriptor11, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -2052,11 +2149,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor13, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor12, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor14, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor13, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor15, this);
+        _initDefineProp(this, 'addDjqs', _descriptor14, this);
     }
     // @observable store = null;
 
@@ -2115,7 +2212,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this19 = this;
+            var _this18 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -2129,8 +2226,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref27 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref27.isNewRetailBCPos;
+            var _ref28 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref28.isNewRetailBCPos;
 
             var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn18.PayStyle,
@@ -2162,7 +2259,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this19.checkList.splice(i, 1);
+                        _this18.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -2234,24 +2331,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this19.currentMode.djqs.forEach(function (djq) {
+                        _this18.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
                         });
 
-                        var _ref28 = element || {},
-                            couponCode = _ref28.couponCode,
-                            name = _ref28.name,
-                            tieredAmountResult = _ref28.tieredAmountResult,
-                            fromDate = _ref28.fromDate,
-                            dateMount = _ref28.dateMount,
-                            promoMethodEnum = _ref28.promoMethodEnum,
-                            discountPct = _ref28.discountPct,
-                            nominalAmount = _ref28.nominalAmount,
-                            promoId = _ref28.promoId,
-                            id = _ref28.id,
-                            doorsill = _ref28.doorsill;
+                        var _ref29 = element || {},
+                            couponCode = _ref29.couponCode,
+                            name = _ref29.name,
+                            tieredAmountResult = _ref29.tieredAmountResult,
+                            fromDate = _ref29.fromDate,
+                            dateMount = _ref29.dateMount,
+                            promoMethodEnum = _ref29.promoMethodEnum,
+                            discountPct = _ref29.discountPct,
+                            nominalAmount = _ref29.nominalAmount,
+                            promoId = _ref29.promoId,
+                            id = _ref29.id,
+                            doorsill = _ref29.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -2279,10 +2376,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this19.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this18.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this19.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this18.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -2295,8 +2392,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref29 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref29.isNewRetailBCPos;
+            var _ref30 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref30.isNewRetailBCPos;
 
             var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn19.Differentiate;
@@ -2386,24 +2483,28 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, isIntegralExchange) {
-                var _this20 = this;
+            var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
+                var _this19 = this;
 
-                var _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _ref32, isHorizontalPad, isHorizontalSunMi, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee14$(_context14) {
+                return _regenerator2.default.wrap(function _callee15$(_context15) {
                     while (1) {
-                        switch (_context14.prev = _context14.next) {
+                        switch (_context15.prev = _context15.next) {
                             case 0:
+                                _ref32 = _mutantsUtil.platform || {}, isHorizontalPad = _ref32.isHorizontalPad, isHorizontalSunMi = _ref32.isHorizontalSunMi;
                                 _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context14.next = 5;
+                                _context15.next = 6;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
-                            case 5:
-                                modes = _context14.sent;
+                            case 6:
+                                modes = _context15.sent;
 
+                                modes = !(!!isHorizontalPad || !!isHorizontalSunMi) ? modes : modes.filter(function (v) {
+                                    return !!v.ThirdPaymentInfo;
+                                });
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
                                         var paymodes = [];
@@ -2427,20 +2528,20 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
-                                        _this20.paymodes = paymodes;
+                                        _this19.paymodes = paymodes;
                                     });
                                 }
 
-                            case 7:
+                            case 9:
                             case 'end':
-                                return _context14.stop();
+                                return _context15.stop();
                         }
                     }
-                }, _callee14, this);
+                }, _callee15, this);
             }));
 
-            function setPaymodes(_x9, _x10) {
-                return _ref30.apply(this, arguments);
+            function setPaymodes(_x12, _x13) {
+                return _ref31.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2457,59 +2558,60 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return null;
     }
-}), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
+}), _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), _descriptor13 = _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), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this21 = this;
+        var _this20 = this;
 
         return function () {
-            _this21.checkList = [];
+            _this20.checkList = [];
         };
     }
-}), _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), _descriptor14 = _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 _this22 = this;
+        var _this21 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this22.currentMode.djqs.forEach(function (ele) {
+            _this21.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
-                    promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
+                    ele.amount = promoDiscount;
+                    promoMethodEnum == "CASH_COUPON" && (ele.nominalAmount = nominalAmount);
                     ele.couponCategoryEnum = couponNum;
                     var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
                     ele.IsEnable = IsEnable;
@@ -2517,16 +2619,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this23 = this;
+        var _this22 = this;
 
-        return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
+        return function (promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
                 promoCouponCode: promoCouponCode,
                 name: name,
                 IsEnable: IsEnable,
+                nominalAmount: nominalAmount,
                 amount: amount,
                 doorsill: doorsill,
                 LastTS: LastTS,
@@ -2542,25 +2645,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this23.currentMode.djqs.push(djq);
+            _this22.currentMode.djqs.push(djq);
         };
     }
 }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this24 = this;
+        var _this23 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor16, this);
+        _initDefineProp(this, 'cardNo', _descriptor15, this);
 
-        _initDefineProp(this, 'balance', _descriptor17, this);
+        _initDefineProp(this, 'balance', _descriptor16, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor18, this);
+        _initDefineProp(this, 'exchangable', _descriptor17, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor19, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor20, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor19, this);
 
         if (m) {
             this.id = m.ID;
@@ -2571,15 +2674,15 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref31 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref31.isNewRetailBCPos;
+            var _ref33 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref33.isNewRetailBCPos;
 
             (0, _mobx.runInAction)(function () {
-                _this24.cardNo = m.CardCode;
+                _this23.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this24.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this23.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this24.balance = _this24.rawbalance;
+                    _this23.balance = _this23.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2601,19 +2704,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor20 = _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)), _class5);