tplus-components-touch 3.54.6 → 3.55.2

package/dist/components/settlement/settlementStore.js

@@ -169,7 +169,7 @@ function _initializerWarningHelper(descriptor, context) {
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
 var SettlementStore = (_class = (_temp = _class2 = function () {
-    // 预售都是全款；预订是否全款，在点击确认支付时计算订金和商品金额计算得出
+    //type==2
     function SettlementStore() {
         (0, _classCallCheck3.default)(this, SettlementStore);
 
@@ -180,12 +180,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
         if (params) this.cloudPrintArguments = params;
         this.setNewStyle();
         this.SettlementApi = _settlementApi2.default;
-    } //赊销-客户id
-
-    // 赊销-欠款单据
-    //type==2
-    //type 1：储值；2：赊销; 不传或0是普通开单
-
+    } // 预售都是全款；预订是否全款，在点击确认支付时计算订金和商品金额计算得出
 
     (0, _createClass3.default)(SettlementStore, [{
         key: 'initPaymodes',
@@ -196,33 +191,12 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
         }
     }, {
         key: 'init',
-        value: function init(_ref) {
+        value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
             var _this2 = this;
 
-            var context = _ref.context,
-                amounthandler = _ref.amounthandler,
-                datasource = _ref.datasource,
-                storeinfo = _ref.storeinfo,
-                bquick = _ref.bquick,
-                amount = _ref.amount,
-                type = _ref.type,
-                data = _ref.data,
-                payModeKey = _ref.payModeKey,
-                creditSalesVoucher = _ref.creditSalesVoucher,
-                custVendorId = _ref.custVendorId;
-
             this.setNewStyle();
             this.type = type;
-            //type 1：储值；2：赊销
-            if (type == 1) {
-                this.brefund = this.paymode.setAmount(amount, 0);
-                this.dto = data;
-            } else if (type == 2) {
-                this.brefund = this.paymode.setAmount(amount, 0);
-                this.dto = context.viewModel.data;
-                this.creditSalesVoucher = creditSalesVoucher;
-                this.custVendorId = custVendorId;
-            } else {
+            if (context) {
                 this.context = context;
                 this.amountHandler = amounthandler;
                 this.dataSource = datasource;
@@ -256,9 +230,9 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                     PreSellOrBook = _getLoginInfo.PreSellOrBook,
                     PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
 
-                var _ref2 = this.dto || {},
-                    IdbusiType = _ref2.IdbusiType,
-                    DistributionMode = _ref2.DistributionMode;
+                var _ref = this.dto || {},
+                    IdbusiType = _ref.IdbusiType,
+                    DistributionMode = _ref.DistributionMode;
 
                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                     this.paymode.bookMaxValue = value;
@@ -283,7 +257,11 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                         this.paymode.bookMaxValue = _mutantsMicrofx.stores.drawerStore.totalWaitPaidAmount;
                     }
                 }
+
                 this.brefund = this.paymode.setAmount(value, this.dto.OnlinePaymentAmount);
+            } else {
+                this.brefund = this.paymode.setAmount(amount, 0);
+                this.dto = data;
             }
             this.paymode.clean();
 
@@ -328,8 +306,8 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
             var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn2.PayStyle;
 
-            var _ref3 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref3.isNewRetailBCPos;
+            var _ref2 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref2.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
@@ -355,14 +333,14 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this4.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                var _ref4 = djq || {},
-                                    displayText = _ref4.displayText,
-                                    promoRuleId = _ref4.promoRuleId,
-                                    dateMount = _ref4.dateMount,
-                                    promoMethodEnum = _ref4.promoMethodEnum,
-                                    discountPct = _ref4.discountPct,
-                                    promoId = _ref4.promoId,
-                                    id = _ref4.id;
+                                var _ref3 = djq || {},
+                                    displayText = _ref3.displayText,
+                                    promoRuleId = _ref3.promoRuleId,
+                                    dateMount = _ref3.dateMount,
+                                    promoMethodEnum = _ref3.promoMethodEnum,
+                                    discountPct = _ref3.discountPct,
+                                    promoId = _ref3.promoId,
+                                    id = _ref3.id;
 
                                 _this4.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this4.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
@@ -475,7 +453,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
             }
             var isOnlyEnabled = returnType ? false : true; //非原单退货为false，其他true
             return this.SettlementApi.getCardInfoByCardNo(v, isOnlyEnabled).then(function () {
-                var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(result) {
+                var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(result) {
                     var data, m;
                     return _regenerator2.default.wrap(function _callee$(_context) {
                         while (1) {
@@ -550,7 +528,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 }));
 
                 return function (_x) {
-                    return _ref5.apply(this, arguments);
+                    return _ref4.apply(this, arguments);
                 };
             }());
         }
@@ -881,8 +859,8 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest, dto) {
-                var status, paylist, ret, _ref7, _ref7$data, code, returnMsg, state, ret1, _ret, ret2;
+            var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var status, paylist, ret, _ref6, _ref6$data, code, returnMsg, state, ret1, ret2;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
@@ -923,9 +901,9 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 
                             case 12:
                                 ret = _context2.sent;
-                                _ref7 = ret || {}, _ref7$data = _ref7.data;
-                                _ref7$data = _ref7$data === undefined ? {} : _ref7$data;
-                                code = _ref7$data.code, returnMsg = _ref7$data.returnMsg;
+                                _ref6 = ret || {}, _ref6$data = _ref6.data;
+                                _ref6$data = _ref6$data === undefined ? {} : _ref6$data;
+                                code = _ref6$data.code, returnMsg = _ref6$data.returnMsg;
 
                                 if (!(code && code == 10001)) {
                                     _context2.next = 24;
@@ -964,62 +942,36 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 return _context2.abrupt('return', _promise2.default.resolve(false));
 
                             case 29:
-                                _context2.next = 49;
+                                _context2.next = 40;
                                 break;
 
                             case 31:
-                                if (!(status == 2)) {
-                                    _context2.next = 39;
-                                    break;
-                                }
-
-                                _context2.next = 34;
-                                return this.saveCreditSales();
-
-                            case 34:
-                                _ret = _context2.sent;
-
-                                if (!(_ret === false)) {
-                                    _context2.next = 37;
-                                    break;
-                                }
-
-                                return _context2.abrupt('return', _promise2.default.resolve(false));
-
-                            case 37:
-                                _context2.next = 49;
-                                break;
-
-                            case 39:
-                                if (dto) {
-                                    this.dto = dto;
-                                }
-                                _context2.next = 42;
+                                _context2.next = 33;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
-                            case 42:
-                                _context2.next = 44;
+                            case 33:
+                                _context2.next = 35;
                                 return this.save();
 
-                            case 44:
+                            case 35:
                                 ret2 = _context2.sent;
 
                                 if (!(ret2 === false)) {
-                                    _context2.next = 47;
+                                    _context2.next = 38;
                                     break;
                                 }
 
                                 return _context2.abrupt('return', _promise2.default.resolve(false));
 
-                            case 47:
-                                _context2.next = 49;
+                            case 38:
+                                _context2.next = 40;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
-                            case 49:
+                            case 40:
                                 return _context2.abrupt('return', _promise2.default.resolve(true));
 
-                            case 52:
-                                _context2.prev = 52;
+                            case 43:
+                                _context2.prev = 43;
                                 _context2.t0 = _context2['catch'](4);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
@@ -1027,139 +979,20 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 this.thirdPayRefund(status == 1 ? 2 : 1);
                                 return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
 
-                            case 57:
+                            case 48:
                             case 'end':
                                 return _context2.stop();
                         }
                     }
-                }, _callee2, this, [[4, 52]]);
+                }, _callee2, this, [[4, 43]]);
             }));
 
-            function commit(_x2, _x3) {
-                return _ref6.apply(this, arguments);
+            function commit(_x2) {
+                return _ref5.apply(this, arguments);
             }
 
             return commit;
         }()
-
-        //赊销结算
-
-    }, {
-        key: 'saveCreditSales',
-        value: function () {
-            var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
-                var _this10 = this;
-
-                var _enumController$getEn12, PayStyle, TradeType, IPMSG, retailPaymentDetails, thePaymodes, _ref9, UserCode, UserId, UserName, VoucherDate, IdShiftVoucher, Shift, ShiftCode, Idstore, POSCode, WipeChange, params, payList, payment, tradeType, ret, _ref10, type, data, code;
-
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
-                    while (1) {
-                        switch (_context3.prev = _context3.next) {
-                            case 0:
-                                _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn12.PayStyle, TradeType = _enumController$getEn12.TradeType;
-                                IPMSG = {};
-
-                                if (!!window.localStorage.IPMSG) {
-                                    IPMSG = JSON.parse(window.localStorage.IPMSG);
-                                }
-                                retailPaymentDetails = [];
-                                thePaymodes = this.newStyle ? (0, _filter3.default)(this.paymode.thePaymodes, function (mode) {
-                                    return parseFloat(mode.value) != 0;
-                                }) : this.paymode.thePaymodes;
-
-                                (0, _each3.default)(thePaymodes, function (mode) {
-                                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
-
-                                    var value = parseFloat(mode.value);
-                                    var giveChange = null;
-                                    if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
-                                        value = Math.Add(value, _this10.paymode.receivable);
-                                        giveChange = Math.abs(_this10.paymode.receivable);
-                                    }
-                                    retailPaymentDetails.push({
-                                        "PaymentCode": mode.authCode,
-                                        "ThirdPaymentInfo": themode.thridPayment || null,
-                                        "IdbankAccount": themode.idBankAccount,
-                                        "ExchangeRate": themode.exchangeRate,
-                                        "OrigAmount": mode.exchangeRate != 1 ? mode.value2 : value,
-                                        "Amount": value,
-                                        "GiveChange": giveChange,
-                                        "Code": mode.paymethodId,
-                                        "IdsettleStyle": themode.idSettleStyle,
-                                        "Idcurrency": themode.idCurrency,
-                                        "ThirdPaymentReturnInfo": mode.thirdPaymentReturnInfo || null
-                                    });
-                                });
-                                _ref9 = this.dto || {}, UserCode = _ref9.UserCode, UserId = _ref9.UserId, UserName = _ref9.UserName, VoucherDate = _ref9.VoucherDate, IdShiftVoucher = _ref9.IdShiftVoucher, Shift = _ref9.Shift, ShiftCode = _ref9.ShiftCode, Idstore = _ref9.Idstore, POSCode = _ref9.POSCode, WipeChange = _ref9.WipeChange;
-                                params = {
-                                    "cip": IPMSG.query || "",
-                                    "longitude": IPMSG.longitude || "",
-                                    "latitude": IPMSG.latitude || "",
-                                    "Retails": this.creditSalesVoucher,
-                                    "IdCustVendor": this.custVendorId,
-                                    "TotalOwedAmount": this.paymode.amount, //TotalOwedAmount欠款金额
-                                    "TotalTaxAmount": this.paymode.received, //TotalTaxAmount 本次结算付款金额
-                                    "RetailPaymentDetails": retailPaymentDetails,
-                                    UserCode: UserCode,
-                                    UserId: UserId,
-                                    UserName: UserName,
-                                    VoucherDate: VoucherDate,
-                                    IdShiftVoucher: IdShiftVoucher,
-                                    Shift: Shift,
-                                    ShiftCode: ShiftCode,
-                                    Idstore: Idstore,
-                                    POSCode: POSCode,
-                                    WipeChange: WipeChange
-                                    //处理存在二开支付情况
-                                };
-                                payList = retailPaymentDetails.filter(function (v) {
-                                    return v.ThirdPaymentInfo;
-                                });
-
-                                if (!(payList && payList.length > 0)) {
-                                    _context3.next = 22;
-                                    break;
-                                }
-
-                                payment = payList[0];
-                                tradeType = payment && payment.StorageAmount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context3.next = 14;
-                                return this.thirdPay(1, payment, tradeType, params);
-
-                            case 14:
-                                ret = _context3.sent;
-                                _ref10 = ret || {}, type = _ref10.type, data = _ref10.data, code = _ref10.code;
-
-                                if (!(type === true)) {
-                                    _context3.next = 20;
-                                    break;
-                                }
-
-                                params = data;
-                                _context3.next = 22;
-                                break;
-
-                            case 20:
-                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context3.abrupt('return', false);
-
-                            case 22:
-                                return _context3.abrupt('return', this.SettlementApi.saveCreditSales({ params: params }));
-
-                            case 23:
-                            case 'end':
-                                return _context3.stop();
-                        }
-                    }
-                }, _callee3, this);
-            }));
-
-            function saveCreditSales() {
-                return _ref8.apply(this, arguments);
-            }
-
-            return saveCreditSales;
-        }()
     }, {
         key: 'handlePrint',
         value: function handlePrint(resp) {
@@ -1169,32 +1002,32 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'saveMember',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-                var _this11 = this;
+            var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+                var _this10 = this;
 
-                var _enumController$getEn13, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
+                var _enumController$getEn12, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref8, type, data, msg, code;
 
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context3.prev = _context3.next) {
                             case 0:
-                                _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle, TradeType = _enumController$getEn13.TradeType;
+                                _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn12.PayStyle, TradeType = _enumController$getEn12.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this11.dto.StorageMutiSettleDetails = [];
-                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
+                                    _this10.dto.StorageMutiSettleDetails = [];
+                                    var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this11.paymode.thePaymodes;
+                                    }) : _this10.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this10.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);
+                                        if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
+                                            value = Math.Add(value, _this10.paymode.receivable);
+                                            giveChange = Math.abs(_this10.paymode.receivable);
                                         }
-                                        _this11.dto.StorageMutiSettleDetails.push({
+                                        _this10.dto.StorageMutiSettleDetails.push({
                                             Code: mode.paymethodId,
                                             StorageAmount: value,
                                             GiveChange: giveChange,
@@ -1203,7 +1036,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                             PaymentCode: mode.authCode,
                                             DynamicPropertyKeys: [],
                                             DynamicPropertyValues: [],
-                                            DataSource: { Id: _this11.dataSource },
+                                            DataSource: { Id: _this10.dataSource },
                                             ThirdPaymentInfo: themode.thridPayment || null,
                                             ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                         });
@@ -1223,49 +1056,49 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context4.next = 19;
+                                    _context3.next = 19;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.StorageAmount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context4.next = 11;
+                                _context3.next = 11;
                                 return this.thirdPay(2, payment, tradeType, dtoParams);
 
                             case 11:
-                                ret = _context4.sent;
-                                _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
+                                ret = _context3.sent;
+                                _ref8 = ret || {}, type = _ref8.type, data = _ref8.data, msg = _ref8.msg, code = _ref8.code;
 
                                 if (!(type === true)) {
-                                    _context4.next = 17;
+                                    _context3.next = 17;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context4.next = 19;
+                                _context3.next = 19;
                                 break;
 
                             case 17:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context4.abrupt('return', false);
+                                return _context3.abrupt('return', false);
 
                             case 19:
                                 this.dtoParams = dtoParams;
                                 console.log('储值结算信息:', dtoParams);
-                                return _context4.abrupt('return', this.SettlementApi.INewRetailMemberStorageSave({ dto: dtoParams }).then(function (resp) {
-                                    _this11.handlePrint(resp);
+                                return _context3.abrupt('return', this.SettlementApi.INewRetailMemberStorageSave({ dto: dtoParams }).then(function (resp) {
+                                    _this10.handlePrint(resp);
                                 }));
 
                             case 22:
                             case 'end':
-                                return _context4.stop();
+                                return _context3.stop();
                         }
                     }
-                }, _callee4, this);
+                }, _callee3, this);
             }));
 
             function saveMember() {
-                return _ref11.apply(this, arguments);
+                return _ref7.apply(this, arguments);
             }
 
             return saveMember;
@@ -1273,31 +1106,31 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-                var _this12 = this;
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                var _this11 = this;
 
-                var _enumController$getEn14, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref14, IdbusiType, DistributionMode, TotalTaxAmount, _dto, _TotalTaxAmount, ArrearsAmount, returnAmount1, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
+                var _enumController$getEn13, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref10, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref11, type, data, msg, code;
 
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
-                                _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle, TradeType = _enumController$getEn14.TradeType;
+                                _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle, TradeType = _enumController$getEn13.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this12.dto.RetailPaymentDetails = [];
-                                    _this12.dto.RetailStorageDetails = [];
-                                    _this12.dto.RetailCouponDetails = [];
+                                    _this11.dto.RetailPaymentDetails = [];
+                                    _this11.dto.RetailStorageDetails = [];
+                                    _this11.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
                                     var count = 0;
-                                    var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
+                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this12.paymode.thePaymodes;
+                                    }) : _this11.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
-                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             czkSum = Math.Add(czkSum, mode.value);
-                                            _this12.dto.RetailStorageDetails.push({
+                                            _this11.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
                                                 MeStorageCardId: mode.meStorageCardId,
                                                 StoragePaymentAmount: mode.value,
@@ -1306,17 +1139,17 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                                 Idmember: mode.memberId,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this12.dataSource },
+                                                DataSource: { Id: _this11.dataSource },
                                                 Password: mode.authCode
                                             });
                                         } else {
                                             var value = parseFloat(mode.value);
                                             var giveChange = null;
-                                            if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
-                                                value = Math.Add(value, _this12.paymode.receivable);
-                                                giveChange = Math.abs(_this12.paymode.receivable);
+                                            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);
                                             }
-                                            _this12.dto.RetailPaymentDetails.push({
+                                            _this11.dto.RetailPaymentDetails.push({
                                                 Code: mode.paymethodId,
                                                 OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
                                                 Amount: value,
@@ -1330,14 +1163,14 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this12.dataSource },
+                                                DataSource: { Id: _this11.dataSource },
                                                 ThirdPaymentInfo: themode.thridPayment || null,
                                                 SettleStyle: { Name: mode.name },
                                                 ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this12.paymode.checkList && _this12.paymode.checkList.length ? _this12.paymode.checkList : mode.djqs, function (djq) {
-                                                    _this12.dto.RetailCouponDetails.push({
+                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
+                                                    _this11.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
                                                         EnableAmount: djq.doorsill,
@@ -1347,24 +1180,24 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                                         PromotionId: djq.promoId,
                                                         PromotionRuleId: djq.promoRuleId,
                                                         PromoCouponAllocatedId: djq.id,
-                                                        DataSource: { Id: _this12.dataSource }
+                                                        DataSource: { Id: _this11.dataSource }
                                                     });
                                                 });
                                             }
                                         }
                                     });
-                                    if (_this12.dto.RetailStorageDetails.length > 0) {
-                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
-                                        _this12.dto.RetailPaymentDetails.push({
-                                            Code: _this12.paymode.counter,
+                                    if (_this11.dto.RetailStorageDetails.length > 0) {
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
+                                        _this11.dto.RetailPaymentDetails.push({
+                                            Code: _this11.paymode.counter,
                                             OrigAmount: czkSum,
                                             Amount: czkSum,
                                             IdsettleStyle: themode.idSettleStyle,
                                             IdbankAccount: themode.idBankAccount,
                                             DynamicPropertyKeys: [],
                                             DynamicPropertyValues: [],
-                                            DataSource: { Id: _this12.dataSource },
-                                            RetailStorageDetails: _this12.dto.RetailStorageDetails
+                                            DataSource: { Id: _this11.dataSource },
+                                            RetailStorageDetails: _this11.dto.RetailStorageDetails
                                         });
                                     }
                                 });
@@ -1377,21 +1210,8 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
                                 _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
-                                _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode, TotalTaxAmount = _ref14.TotalTaxAmount;
+                                _ref10 = this.dto || {}, IdbusiType = _ref10.IdbusiType, DistributionMode = _ref10.DistributionMode;
 
-                                if (IdbusiType === 42) {
-                                    (0, _mobx.runInAction)(function () {
-                                        _this12.dto.CreditUsageAmount = (0, _utils.getFixedNumber)(TotalTaxAmount, 2);
-                                    });
-                                }
-                                if (IdbusiType === 42) {
-                                    _dto = this.dto, _TotalTaxAmount = _dto.TotalTaxAmount, ArrearsAmount = _dto.ArrearsAmount;
-                                    returnAmount1 = Math.abs(_TotalTaxAmount) - ArrearsAmount;
-
-                                    (0, _mobx.runInAction)(function () {
-                                        _this12.dto.CreditUsageAmount = returnAmount1 > 1 ? (0, _utils.getFixedNumber)(-(Math.abs(_TotalTaxAmount) - returnAmount1), 2) : Math.abs(_TotalTaxAmount, 2);
-                                    });
-                                }
                                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                                     prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
                                         return c + (item.Amount || 0);
@@ -1402,106 +1222,99 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 
                                     this.isFull = fullPayment == prepaidAmount; // 是否全款
                                     (0, _mobx.runInAction)(function () {
-                                        _this12.dto.PrepaidAmount = prepaidAmount;
+                                        _this11.dto.PrepaidAmount = prepaidAmount;
                                     });
                                 }
-                                _context5.t1 = this.dto.IdbusiType == 37;
+                                _context4.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context5.t1) {
-                                    _context5.next = 16;
+                                if (!_context4.t1) {
+                                    _context4.next = 14;
                                     break;
                                 }
 
-                                _context5.next = 15;
+                                _context4.next = 13;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 15:
-                                _context5.t1 = _context5.sent;
+                            case 13:
+                                _context4.t1 = _context4.sent;
 
-                            case 16:
-                                _context5.t0 = _context5.t1;
+                            case 14:
+                                _context4.t0 = _context4.t1;
 
-                                if (_context5.t0) {
-                                    _context5.next = 19;
+                                if (_context4.t0) {
+                                    _context4.next = 17;
                                     break;
                                 }
 
-                                _context5.t0 = this.dto.IdbusiType != 37;
+                                _context4.t0 = this.dto.IdbusiType != 37;
 
-                            case 19:
-                                if (!_context5.t0) {
-                                    _context5.next = 39;
+                            case 17:
+                                if (!_context4.t0) {
+                                    _context4.next = 36;
                                     break;
                                 }
 
                                 dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
-
-                                if (!(IdbusiType !== 42)) {
-                                    _context5.next = 37;
-                                    break;
-                                }
-
                                 //处理存在二开支付情况
+
                                 payList = dtoParams.RetailPaymentDetails.filter(function (v) {
                                     return v.ThirdPaymentInfo;
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context5.next = 36;
+                                    _context4.next = 33;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context5.next = 28;
+                                _context4.next = 25;
                                 return this.thirdPay(1, payment, tradeType, dtoParams);
 
-                            case 28:
-                                ret = _context5.sent;
-                                _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
+                            case 25:
+                                ret = _context4.sent;
+                                _ref11 = ret || {}, type = _ref11.type, data = _ref11.data, msg = _ref11.msg, code = _ref11.code;
 
                                 if (!(type === true)) {
-                                    _context5.next = 34;
+                                    _context4.next = 31;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context5.next = 36;
+                                _context4.next = 33;
                                 break;
 
-                            case 34:
+                            case 31:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context5.abrupt('return', false);
+                                return _context4.abrupt('return', false);
 
-                            case 36:
+                            case 33:
                                 this.dtoParams = dtoParams;
-
-                            case 37:
                                 console.log('结算信息:', dtoParams);
-                                return _context5.abrupt('return', this.SettlementApi.retailPosSettle({
+                                return _context4.abrupt('return', this.SettlementApi.retailPosSettle({
                                     dto: dtoParams,
                                     cip: IPMSG.query || "",
                                     longitude: IPMSG.longitude || "",
                                     latitude: IPMSG.latitude || ""
                                 }).then(function (resp) {
-                                    var _ref16 = resp || {},
-                                        ID = _ref16.ID;
+                                    var _ref12 = resp || {},
+                                        ID = _ref12.ID;
 
-                                    _this12.setDtoID(ID);
-                                    _this12.billID = ID;
-                                    _this12.paymode.checkList = [];
+                                    _this11.setDtoID(ID);
+                                    _this11.billID = ID;
+                                    _this11.paymode.checkList = [];
                                 }));
 
-                            case 39:
+                            case 36:
                             case 'end':
-                                return _context5.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee5, this);
+                }, _callee4, this);
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref9.apply(this, arguments);
             }
 
             return save;
@@ -1529,19 +1342,19 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'thirdPay',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(vType, payment, trade, dto) {
-                var cto, params, ret, _ref18, Code, _Message, Result, _ref19, ThirdPaymentReturnInfo;
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(vType, payment, trade, dto) {
+                var cto, params, ret, _ref14, Code, _Message, Result, _ref15, ThirdPaymentReturnInfo;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context5.prev = _context5.next) {
                             case 0:
-                                _context6.prev = 0;
+                                _context5.prev = 0;
                                 cto = this.removeThirdPayDto(dto);
                                 params = { VoucherType: vType, Payment: payment, TradeType: trade, dto: cto };
 
                                 console.log('刷卡信息:', (0, _stringify2.default)(params));
-                                _context6.next = 6;
+                                _context5.next = 6;
                                 return new _promise2.default(function (resolve, reject) {
                                     _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
                                         return resolve(res);
@@ -1549,26 +1362,26 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 });
 
                             case 6:
-                                ret = _context6.sent;
+                                ret = _context5.sent;
 
                                 console.log('刷卡返回信息:', ret);
                                 ret = JSON.parse(ret);
-                                _ref18 = ret || {}, Code = _ref18.Code, _Message = _ref18.Message, Result = _ref18.Result;
+                                _ref14 = ret || {}, Code = _ref14.Code, _Message = _ref14.Message, Result = _ref14.Result;
 
                                 if (!(Code > 0)) {
-                                    _context6.next = 14;
+                                    _context5.next = 14;
                                     break;
                                 }
 
-                                return _context6.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
 
                             case 14:
                                 if (!(trade == '00')) {
-                                    _context6.next = 20;
+                                    _context5.next = 20;
                                     break;
                                 }
 
-                                _ref19 = Result || {}, ThirdPaymentReturnInfo = _ref19.ThirdPaymentReturnInfo;
+                                _ref15 = Result || {}, ThirdPaymentReturnInfo = _ref15.ThirdPaymentReturnInfo;
 
                                 if (vType == 1) {
                                     dto.RetailPaymentDetails.forEach(function (v) {
@@ -1583,35 +1396,35 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                         }
                                     });
                                 }
-                                return _context6.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
                             case 20:
                                 if (!(trade == '02')) {
-                                    _context6.next = 22;
+                                    _context5.next = 22;
                                     break;
                                 }
 
-                                return _context6.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
                             case 22:
-                                _context6.next = 27;
+                                _context5.next = 27;
                                 break;
 
                             case 24:
-                                _context6.prev = 24;
-                                _context6.t0 = _context6['catch'](0);
-                                return _context6.abrupt('return', { type: false, data: null, msg: _context6.t0, code: '9999' });
+                                _context5.prev = 24;
+                                _context5.t0 = _context5['catch'](0);
+                                return _context5.abrupt('return', { type: false, data: null, msg: _context5.t0, code: '9999' });
 
                             case 27:
                             case 'end':
-                                return _context6.stop();
+                                return _context5.stop();
                         }
                     }
-                }, _callee6, this, [[0, 24]]);
+                }, _callee5, this, [[0, 24]]);
             }));
 
-            function thirdPay(_x4, _x5, _x6, _x7) {
-                return _ref17.apply(this, arguments);
+            function thirdPay(_x3, _x4, _x5, _x6) {
+                return _ref13.apply(this, arguments);
             }
 
             return thirdPay;
@@ -1622,14 +1435,14 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'thirdPayRefund',
         value: function () {
-            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(type) {
-                var _this13 = this;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type) {
+                var _this12 = this;
 
-                var dto, pay, payment, _enumController$getEn15, TradeType;
+                var dto, pay, payment, _enumController$getEn14, TradeType;
 
-                return _regenerator2.default.wrap(function _callee8$(_context8) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context7.prev = _context7.next) {
                             case 0:
                                 dto = type == 1 ? this.dtoParams.RetailPaymentDetails : this.dtoParams.StorageMutiSettleDetails;
                                 pay = dto && dto.filter(function (v) {
@@ -1641,43 +1454,43 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                         _message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
                                     }, 1000);
                                     payment = pay[0];
-                                    _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn15.TradeType;
+                                    _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn14.TradeType;
 
-                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-                                        var ret, _ref22, msg;
+                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                                        var ret, _ref18, msg;
 
-                                        return _regenerator2.default.wrap(function _callee7$(_context7) {
+                                        return _regenerator2.default.wrap(function _callee6$(_context6) {
                                             while (1) {
-                                                switch (_context7.prev = _context7.next) {
+                                                switch (_context6.prev = _context6.next) {
                                                     case 0:
-                                                        _context7.next = 2;
-                                                        return _this13.thirdPay(type, payment, TradeType.REFUND, dto);
+                                                        _context6.next = 2;
+                                                        return _this12.thirdPay(type, payment, TradeType.REFUND, dto);
 
                                                     case 2:
-                                                        ret = _context7.sent;
-                                                        _ref22 = ret || {}, msg = _ref22.msg;
+                                                        ret = _context6.sent;
+                                                        _ref18 = ret || {}, msg = _ref18.msg;
 
                                                         console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
 
                                                     case 5:
                                                     case 'end':
-                                                        return _context7.stop();
+                                                        return _context6.stop();
                                                 }
                                             }
-                                        }, _callee7, _this13);
+                                        }, _callee6, _this12);
                                     })), 4500);
                                 }
 
                             case 3:
                             case 'end':
-                                return _context8.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee8, this);
+                }, _callee7, this);
             }));
 
-            function thirdPayRefund(_x8) {
-                return _ref20.apply(this, arguments);
+            function thirdPayRefund(_x7) {
+                return _ref16.apply(this, arguments);
             }
 
             return thirdPayRefund;
@@ -1690,35 +1503,35 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context8.prev = _context8.next) {
                             case 0:
-                                _context9.prev = 0;
-                                _context9.t0 = _promise2.default;
-                                _context9.next = 4;
+                                _context8.prev = 0;
+                                _context8.t0 = _promise2.default;
+                                _context8.next = 4;
                                 return this.SettlementApi.QuerySettleResult({ RetailCode: this.dto.Code });
 
                             case 4:
-                                _context9.t1 = _context9.sent;
-                                return _context9.abrupt('return', _context9.t0.resolve.call(_context9.t0, _context9.t1));
+                                _context8.t1 = _context8.sent;
+                                return _context8.abrupt('return', _context8.t0.resolve.call(_context8.t0, _context8.t1));
 
                             case 8:
-                                _context9.prev = 8;
-                                _context9.t2 = _context9['catch'](0);
-                                return _context9.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context8.prev = 8;
+                                _context8.t2 = _context8['catch'](0);
+                                return _context8.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context9.stop();
+                                return _context8.stop();
                         }
                     }
-                }, _callee9, this, [[0, 8]]);
+                }, _callee8, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref23.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1744,18 +1557,18 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(value) {
-                var _ref25, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, checkPaymentPasswordParams, checkPaymentPasswordId, result, count, _result;
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(value) {
+                var _ref21, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, checkPaymentPasswordParams, checkPaymentPasswordId, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
-                        switch (_context10.prev = _context10.next) {
+                        switch (_context9.prev = _context9.next) {
                             case 0:
-                                _ref25 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref25.isNewRetailBCPos;
-                                _context10.prev = 1;
+                                _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
+                                _context9.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context10.next = 23;
+                                    _context9.next = 23;
                                     break;
                                 }
 
@@ -1765,22 +1578,22 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                 memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context10.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context10.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 if (!(cook2[memberStorageId] > 3)) {
-                                    _context10.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context10.abrupt('return', _promise2.default.resolve(message));
+                                return _context9.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;
@@ -1809,11 +1622,11 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                         checkPaymentPasswordId = meStorageCardId;
                                     }
                                 }
-                                _context10.next = 18;
+                                _context9.next = 18;
                                 return this.SettlementApi.checkPaymentPassword(checkPaymentPasswordParams, checkPaymentPasswordId);
 
                             case 18:
-                                result = _context10.sent;
+                                result = _context9.sent;
 
                                 if (!result.data) {
                                     if (cook2) {
@@ -1831,38 +1644,38 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context10.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context9.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
                             case 23:
-                                _context10.next = 25;
+                                _context9.next = 25;
                                 return this.SettlementApi.CheckoutMemberPassword({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } });
 
                             case 25:
-                                _result = _context10.sent;
-                                return _context10.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                                _result = _context9.sent;
+                                return _context9.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
                             case 27:
-                                _context10.next = 32;
+                                _context9.next = 32;
                                 break;
 
                             case 29:
-                                _context10.prev = 29;
-                                _context10.t0 = _context10['catch'](1);
-                                return _context10.abrupt('return', "failed");
+                                _context9.prev = 29;
+                                _context9.t0 = _context9['catch'](1);
+                                return _context9.abrupt('return', "failed");
 
                             case 32:
                             case 'end':
-                                return _context10.stop();
+                                return _context9.stop();
                         }
                     }
-                }, _callee10, this, [[1, 29]]);
+                }, _callee9, this, [[1, 29]]);
             }));
 
-            function validePwd(_x9) {
-                return _ref24.apply(this, arguments);
+            function validePwd(_x8) {
+                return _ref20.apply(this, arguments);
             }
 
             return validePwd;
@@ -1870,7 +1683,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     }]);
     return SettlementStore;
 }(), _initialiseProps = function _initialiseProps() {
-    var _this14 = this;
+    var _this13 = this;
 
     this.paymode = null;
     this.dto = null;
@@ -1883,11 +1696,10 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     _initDefineProp(this, 'newStyle', _descriptor, this);
 
     this.isFull = true;
-    this.creditSalesVoucher = [];
     this.isCanSettleOnQuickKey = true;
 
     this.setCanSettleOnQuickKey = function (value) {
-        _this14.isCanSettleOnQuickKey = value;
+        _this13.isCanSettleOnQuickKey = value;
     };
 
     _initDefineProp(this, 'setNewStyle', _descriptor2, this);
@@ -1903,16 +1715,16 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     this.handleCzkData = function (m) {
         if (!m || !m.StorageCardNo) {
             (0, _mobx.runInAction)(function () {
-                _this14.paymode.currentMode.errinfo = "无效的会员卡号";
+                _this13.paymode.currentMode.errinfo = "无效的会员卡号";
             });
         } else {
             (0, _mobx.runInAction)(function () {
-                _this14.paymode.currentMode.errinfo = "";
-                _this14.paymode.currentMode.memberId = m.ID;
-                _this14.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this14.brefund ? _this14.paymode.receivable : Math.max(_this14.paymode.receivable, 0));
-                _this14.updateEvent();
+                _this13.paymode.currentMode.errinfo = "";
+                _this13.paymode.currentMode.memberId = m.ID;
+                _this13.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this13.brefund ? _this13.paymode.receivable : Math.max(_this13.paymode.receivable, 0));
+                _this13.updateEvent();
                 var message = '';
-                var sum = (0, _reduce3.default)(_this14.paymode.thePaymodes, function (total, cur) {
+                var sum = (0, _reduce3.default)(_this13.paymode.thePaymodes, function (total, cur) {
                     return total + cur.value;
                 }, 0);
                 // 对于卡不用判断会员的一些信息
@@ -1920,11 +1732,11 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 //     message= CheckMemberStorageProcessorBlock.execute(m);
                 // }
                 if (!String.isNullOrEmpty(message)) {
-                    _this14.paymode.currentMode.errinfo = message;
-                } else if (_this14.checkReceived(_this14.paymode.currentMode, "balance")) {
-                    _this14.paymode.currentMode.errinfo = "余额不足";
-                } else if (_this14.paymode.amount > 0 && parseFloat(_this14.paymode.amount) !== sum && _this14.paymode.currentMode.value == 0) {
-                    _this14.paymode.currentMode.errinfo = "实收金额必须录入";
+                    _this13.paymode.currentMode.errinfo = message;
+                } else if (_this13.checkReceived(_this13.paymode.currentMode, "balance")) {
+                    _this13.paymode.currentMode.errinfo = "余额不足";
+                } else if (_this13.paymode.amount > 0 && parseFloat(_this13.paymode.amount) !== sum && _this13.paymode.currentMode.value == 0) {
+                    _this13.paymode.currentMode.errinfo = "实收金额必须录入";
                 } else {
                     // 查询成功后将焦点移入下一个输入框
                     setTimeout(function () {
@@ -1937,20 +1749,20 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     };
 
     this.getCouponList = function (coupon_code) {
-        var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
-            PayStyle = _enumController$getEn16.PayStyle,
-            Differentiate = _enumController$getEn16.Differentiate;
+        var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn15.PayStyle,
+            Differentiate = _enumController$getEn15.Differentiate;
 
         var couponApplyRule = (0, _tplusPoslogin.PosInitData)('CouponApplyRule');
 
-        var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-            CouponApplyRule = _enumController$getEn17.CouponApplyRule;
+        var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+            CouponApplyRule = _enumController$getEn16.CouponApplyRule;
 
         if (couponApplyRule == CouponApplyRule.SHOWN_BY_CUSTOMER && !!coupon_code || couponApplyRule != CouponApplyRule.SHOWN_BY_CUSTOMER) {
-            var dto = _this14.dto;
+            var dto = _this13.dto;
             var promoVoucher = {};
-            _this14.paymode.clearDjqs();
-            _this14.paymode.reCalculationDjqs();
+            _this13.paymode.clearDjqs();
+            _this13.paymode.reCalculationDjqs();
             promoVoucher.coupon_code = coupon_code || "";
             promoVoucher.boName = "Retail";
             promoVoucher.voucherId = dto.ID;
@@ -1958,7 +1770,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
             if (dto.OnlinePaymentAmount) {
                 onlinePaymentAmount = dto.OnlinePaymentAmount;
             }
-            promoVoucher.promoLinks = (0, _filter3.default)(_this14.paymode.currentMode.djqs, function (djq) {
+            promoVoucher.promoLinks = (0, _filter3.default)(_this13.paymode.currentMode.djqs, function (djq) {
                 return djq.checked;
             });
             promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
@@ -2009,20 +1821,20 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 // 促销 end
                 promoVoucher.voucherDetailList.push(detailDTO);
             });
-            return _this14.SettlementApi.findUsefulCouponPromoList(promoVoucher).then(function (result) {
+            return _this13.SettlementApi.findUsefulCouponPromoList(promoVoucher).then(function (result) {
                 if (result && result.length != 0) {
                     result.forEach(function (element) {
-                        var _ref26 = element || {},
-                            couponCode = _ref26.couponCode,
-                            name = _ref26.name,
-                            tieredAmountResult = _ref26.tieredAmountResult,
-                            fromDate = _ref26.fromDate,
-                            dateMount = _ref26.dateMount,
-                            promoMethodEnum = _ref26.promoMethodEnum,
-                            discountPct = _ref26.discountPct,
-                            nominalAmount = _ref26.nominalAmount,
-                            promoId = _ref26.promoId,
-                            id = _ref26.id;
+                        var _ref22 = element || {},
+                            couponCode = _ref22.couponCode,
+                            name = _ref22.name,
+                            tieredAmountResult = _ref22.tieredAmountResult,
+                            fromDate = _ref22.fromDate,
+                            dateMount = _ref22.dateMount,
+                            promoMethodEnum = _ref22.promoMethodEnum,
+                            discountPct = _ref22.discountPct,
+                            nominalAmount = _ref22.nominalAmount,
+                            promoId = _ref22.promoId,
+                            id = _ref22.id;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -2030,22 +1842,22 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                             promoRuleId = tieredAmountResult.promoRuleId,
                             couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
-                        if (result.IsRepelWithPoints && (0, _find3.default)(_this14.paymode.thePaymodes, function (themode) {
+                        if (result.IsRepelWithPoints && (0, _find3.default)(_this13.paymode.thePaymodes, function (themode) {
                             return themode.paymentType == PayStyle.jfdx;
                         })) {
                             _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;
-                            _this14.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);
+                            _this13.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) {
-                        _this14.paymode.calcDjqCheckValue(_this14.paymode.currentMode.djqs[0], _this14.dto, 'single');
+                        _this13.paymode.calcDjqCheckValue(_this13.paymode.currentMode.djqs[0], _this13.dto, 'single');
                     }
                 } else {
                     if (promoVoucher.coupon_code) {
                         _message2.default.info(Differentiate.COUPON + '\u53F7\u4E0D\u5B58\u5728\uFF01');
-                        _this14.getCouponList();
+                        _this13.getCouponList();
                     } else {
                         _message2.default.info('\u6CA1\u6709\u627E\u5230\u53EF\u4F7F\u7528\u7684' + Differentiate.COUPON + '\uFF01');
                     }
@@ -2055,41 +1867,41 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
     };
 
     this.getSettleGift = function () {
-        return _this14.SettlementApi.executeRightsForPos(_this14.billID);
+        return _this13.SettlementApi.executeRightsForPos(_this13.billID);
     };
 
     this.getRefWareHouseList = function () {
-        return _this14.SettlementApi.getRefWareHouseList();
+        return _this13.SettlementApi.getRefWareHouseList();
     };
 
     this.checkCoupon = function () {
-        var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(sn) {
-            var _ref28, isNewRetailBCPos, _enumController$getEn18, PayStyle, Differentiate, params;
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(sn) {
+            var _ref24, isNewRetailBCPos, _enumController$getEn17, PayStyle, Differentiate, params;
 
-            return _regenerator2.default.wrap(function _callee11$(_context11) {
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
                 while (1) {
-                    switch (_context11.prev = _context11.next) {
+                    switch (_context10.prev = _context10.next) {
                         case 0:
-                            _ref28 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref28.isNewRetailBCPos;
+                            _ref24 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
                             if (!isNewRetailBCPos) {
-                                _context11.next = 7;
+                                _context10.next = 7;
                                 break;
                             }
 
-                            _context11.next = 4;
-                            return _this14.getCouponList(sn, 'sinlge');
+                            _context10.next = 4;
+                            return _this13.getCouponList(sn, 'sinlge');
 
                         case 4:
-                            return _context11.abrupt('return', _context11.sent);
+                            return _context10.abrupt('return', _context10.sent);
 
                         case 7:
-                            _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn18.PayStyle, Differentiate = _enumController$getEn18.Differentiate;
+                            _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn17.PayStyle, Differentiate = _enumController$getEn17.Differentiate;
                             params = { request: {
-                                    Uid: _this14.paymode.currentMode.member.uid || '',
+                                    Uid: _this13.paymode.currentMode.member.uid || '',
                                     SN: sn,
-                                    StoreCode: _this14.dto.Idstore,
-                                    Inventories: (0, _map3.default)((0, _filter3.default)(_this14.dto.RetailDetails, function (d) {
+                                    StoreCode: _this13.dto.Idstore,
+                                    Inventories: (0, _map3.default)((0, _filter3.default)(_this13.dto.RetailDetails, function (d) {
                                         return d.Quantity > 0 && !d.IsPresent;
                                     }), function (detail) {
                                         return {
@@ -2109,37 +1921,37 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                                         };
                                     }),
                                     // inventoryCodes:_join(_map(this.dto.RetailDetails,(detail)=>{return detail.Inventory.Code;}),','),
-                                    InventoryClassCodes: (0, _join3.default)((0, _map3.default)((0, _filter3.default)(_this14.dto.RetailDetails, function (d) {
+                                    InventoryClassCodes: (0, _join3.default)((0, _map3.default)((0, _filter3.default)(_this13.dto.RetailDetails, function (d) {
                                         return d.Quantity > 0;
                                     }), function (detail) {
                                         return (detail.Inventory.InventoryClass || { Code: '' }).Code;
                                     }), ','),
-                                    Amount: _this14.paymode.amount
+                                    Amount: _this13.paymode.amount
                                 } };
-                            return _context11.abrupt('return', _this14.SettlementApi.CheckCoupon(params).then(function (result) {
-                                if ((0, _find3.default)(_this14.paymode.currentMode.djqs, function (djq) {
+                            return _context10.abrupt('return', _this13.SettlementApi.CheckCoupon(params).then(function (result) {
+                                if ((0, _find3.default)(_this13.paymode.currentMode.djqs, function (djq) {
                                     return djq.code == result.SN;
                                 })) {
                                     _message2.default.info(Differentiate.COUPON + '\u5DF2\u6DFB\u52A0');
-                                } else if (result.IsRepelWithPoints && (0, _find3.default)(_this14.paymode.thePaymodes, function (themode) {
+                                } else if (result.IsRepelWithPoints && (0, _find3.default)(_this13.paymode.thePaymodes, function (themode) {
                                     return themode.paymentType == PayStyle.jfdx;
                                 })) {
                                     _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
                                 } else {
-                                    _this14.addDjq(result.SN, result.Title, result.ReduceAmount, result.StartAmount, result.LastTS, false, !result.IsRepelWithPoints, result.UMemberID);
+                                    _this13.addDjq(result.SN, result.Title, result.ReduceAmount, result.StartAmount, result.LastTS, false, !result.IsRepelWithPoints, result.UMemberID);
                                 }
                             }));
 
                         case 10:
                         case 'end':
-                            return _context11.stop();
+                            return _context10.stop();
                     }
                 }
-            }, _callee11, _this14);
+            }, _callee10, _this13);
         }));
 
-        return function (_x10) {
-            return _ref27.apply(this, arguments);
+        return function (_x9) {
+            return _ref23.apply(this, arguments);
         };
     }();
 
@@ -2152,17 +1964,17 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 zIndex: 1007,
                 content: content,
                 onOk: function () {
-                    var _ref29 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
+                    var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
                         var ret;
-                        return _regenerator2.default.wrap(function _callee12$(_context12) {
+                        return _regenerator2.default.wrap(function _callee11$(_context11) {
                             while (1) {
-                                switch (_context12.prev = _context12.next) {
+                                switch (_context11.prev = _context11.next) {
                                     case 0:
-                                        _context12.next = 2;
-                                        return _this14.saveMember();
+                                        _context11.next = 2;
+                                        return _this13.saveMember();
 
                                     case 2:
-                                        ret = _context12.sent;
+                                        ret = _context11.sent;
 
                                         if (ret === false) {
                                             resolve(false);
@@ -2172,14 +1984,14 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 
                                     case 4:
                                     case 'end':
-                                        return _context12.stop();
+                                        return _context11.stop();
                                 }
                             }
-                        }, _callee12, _this14);
+                        }, _callee11, _this13);
                     }));
 
                     return function onOk() {
-                        return _ref29.apply(this, arguments);
+                        return _ref25.apply(this, arguments);
                     };
                 }(),
                 onCancel: function onCancel() {
@@ -2191,7 +2003,7 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 
     this.checkIntegralExchangeReturn = function (id) {
         return new _promise2.default(function (resolve, reject) {
-            _this14.SettlementApi.GetNewIntegralExchange({ param: { refVoucherId: id } }).then(function (resp) {
+            _this13.SettlementApi.GetNewIntegralExchange({ param: { refVoucherId: id } }).then(function (resp) {
                 if (resp && resp.expireIntegral > 0) {
                     _tplusComponentsTouch.ModalWraper.confirm({
                         className: 'tplus-confirm-modal',
@@ -2219,17 +2031,17 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 }), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'setNewStyle', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this15 = this;
+        var _this14 = this;
 
         return function () {
             var voucherDefaultPosMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') || 'touch';
-            _this15.newStyle = voucherDefaultPosMode == 'voucher';
+            _this14.newStyle = voucherDefaultPosMode == 'voucher';
         };
     }
 }), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this16 = this;
+        var _this15 = this;
 
         return function (newPass, newPassConfirm) {
             if (!newPass || !newPassConfirm) {
@@ -2239,9 +2051,9 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
                 return _message2.default.warn('您两次输入的密码不一致');
             }
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
-            return _this16.SettlementApi.setWalletPayPassword({
+            return _this15.SettlementApi.setWalletPayPassword({
                 Idstore: idstore,
-                meMemberId: _this16.paymode.currentMode.memberId,
+                meMemberId: _this15.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -2255,135 +2067,135 @@ var SettlementStore = (_class = (_temp = _class2 = function () {
 }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this17 = this;
+        var _this16 = this;
 
         return function () {
-            var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(_this) {
+            var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
                 var _getLoginInfo4, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee13$(_context13) {
+                return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                        switch (_context13.prev = _context13.next) {
+                        switch (_context12.prev = _context12.next) {
                             case 0:
-                                _getLoginInfo4 = _this17.getLoginInfo(), IdStore = _getLoginInfo4.IdStore, StoreCode = _getLoginInfo4.StoreCode;
-                                _context13.next = 3;
-                                return _this17.SettlementApi.GetUmemberDTO({ Idmember: _this17.member.ID, IdStore: IdStore, StoreCode: StoreCode });
+                                _getLoginInfo4 = _this16.getLoginInfo(), IdStore = _getLoginInfo4.IdStore, StoreCode = _getLoginInfo4.StoreCode;
+                                _context12.next = 3;
+                                return _this16.SettlementApi.GetUmemberDTO({ Idmember: _this16.member.ID, IdStore: IdStore, StoreCode: StoreCode });
 
                             case 3:
-                                resp = _context13.sent;
+                                resp = _context12.sent;
 
                                 _this.member = resp;
                                 _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
-                                return _context13.abrupt('return', _promise2.default.resolve(resp));
+                                return _context12.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context13.stop();
+                                return _context12.stop();
                         }
                     }
-                }, _callee13, _this17);
+                }, _callee12, _this16);
             }));
 
-            return function (_x11) {
-                return _ref30.apply(this, arguments);
+            return function (_x10) {
+                return _ref26.apply(this, arguments);
             };
         }();
     }
 }), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this18 = this;
+        var _this17 = this;
 
         return function () {
-            var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(memberId, returnType) {
+            var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId, returnType) {
                 var isOnlyEnabled, result;
-                return _regenerator2.default.wrap(function _callee14$(_context14) {
+                return _regenerator2.default.wrap(function _callee13$(_context13) {
                     while (1) {
-                        switch (_context14.prev = _context14.next) {
+                        switch (_context13.prev = _context13.next) {
                             case 0:
                                 isOnlyEnabled = returnType ? false : true; //非原单退货为false，其他true
                                 // 查看会员卡信息
 
-                                _context14.next = 3;
-                                return _this18.SettlementApi.getCardInfoByMemberId(memberId, isOnlyEnabled);
+                                _context13.next = 3;
+                                return _this17.SettlementApi.getCardInfoByMemberId(memberId, isOnlyEnabled);
 
                             case 3:
-                                result = _context14.sent;
+                                result = _context13.sent;
 
                                 if (!(result && result.data.length)) {
-                                    _context14.next = 21;
+                                    _context13.next = 21;
                                     break;
                                 }
 
                                 if (!(result.data.length === 1)) {
-                                    _context14.next = 10;
+                                    _context13.next = 10;
                                     break;
                                 }
 
-                                _this18.paymode.updateCardInfo(result.data[0]);
-                                return _context14.abrupt('return', result.data);
+                                _this17.paymode.updateCardInfo(result.data[0]);
+                                return _context13.abrupt('return', result.data);
 
                             case 10:
                                 if (!(result.data && result.data.length === 1)) {
-                                    _context14.next = 15;
+                                    _context13.next = 15;
                                     break;
                                 }
 
-                                _this18.paymode.updateCardInfo(result.data[0]);
-                                return _context14.abrupt('return', result.data);
+                                _this17.paymode.updateCardInfo(result.data[0]);
+                                return _context13.abrupt('return', result.data);
 
                             case 15:
                                 if (!(result.data && result.data.length > 1)) {
-                                    _context14.next = 19;
+                                    _context13.next = 19;
                                     break;
                                 }
 
-                                return _context14.abrupt('return', result.data);
+                                return _context13.abrupt('return', result.data);
 
                             case 19:
                                 _message2.default.warn('没有可用储值卡！');
-                                return _context14.abrupt('return', false);
+                                return _context13.abrupt('return', false);
 
                             case 21:
                             case 'end':
-                                return _context14.stop();
+                                return _context13.stop();
                         }
                     }
-                }, _callee14, _this18);
+                }, _callee13, _this17);
             }));
 
-            return function (_x12, _x13) {
-                return _ref31.apply(this, arguments);
+            return function (_x11, _x12) {
+                return _ref27.apply(this, arguments);
             };
         }();
     }
 }), _descriptor6 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this19 = this;
+        var _this18 = this;
 
-        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15() {
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
             var ctMode, cardNo, result;
-            return _regenerator2.default.wrap(function _callee15$(_context15) {
+            return _regenerator2.default.wrap(function _callee14$(_context14) {
                 while (1) {
-                    switch (_context15.prev = _context15.next) {
+                    switch (_context14.prev = _context14.next) {
                         case 0:
-                            ctMode = _this19.paymode && _this19.paymode.currentMode;
+                            ctMode = _this18.paymode && _this18.paymode.currentMode;
                             cardNo = ctMode && ctMode.storageCardNo;
-                            _context15.next = 4;
-                            return _this19.SettlementApi.getCardInfoByCardNo(cardNo);
+                            _context14.next = 4;
+                            return _this18.SettlementApi.getCardInfoByCardNo(cardNo);
 
                         case 4:
-                            result = _context15.sent;
+                            result = _context14.sent;
 
-                            _this19.paymode.updateCardInfo(result && result.data);
+                            _this18.paymode.updateCardInfo(result && result.data);
 
                         case 6:
                         case 'end':
-                            return _context15.stop();
+                            return _context14.stop();
                     }
                 }
-            }, _callee15, _this19);
+            }, _callee14, _this18);
         }));
     }
 }), _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);
@@ -2503,7 +2315,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this20 = this;
+            var _this19 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -2517,9 +2329,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn19.PayStyle,
-                Differentiate = _enumController$getEn19.Differentiate;
+            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn18.PayStyle,
+                Differentiate = _enumController$getEn18.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2547,7 +2359,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this20.checkList.splice(i, 1);
+                        _this19.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -2619,24 +2431,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this20.currentMode.djqs.forEach(function (djq) {
+                        _this19.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
                         });
 
-                        var _ref33 = element || {},
-                            couponCode = _ref33.couponCode,
-                            name = _ref33.name,
-                            tieredAmountResult = _ref33.tieredAmountResult,
-                            fromDate = _ref33.fromDate,
-                            dateMount = _ref33.dateMount,
-                            promoMethodEnum = _ref33.promoMethodEnum,
-                            discountPct = _ref33.discountPct,
-                            nominalAmount = _ref33.nominalAmount,
-                            promoId = _ref33.promoId,
-                            id = _ref33.id,
-                            doorsill = _ref33.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,
@@ -2664,10 +2476,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this20.addDjqs(couponCode, name, true, nominalAmount, promoDiscount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this19.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 {
-                            _this20.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this19.setCouponNum(element.id, couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -2680,8 +2492,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn20.Differentiate;
+            var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn19.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2743,8 +2555,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn21.PayStyle;
+            var _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn20.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -2781,21 +2593,26 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref34 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee16(type, isIntegralExchange) {
-                var _this21 = this;
+            var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
+                var _this20 = this;
 
-                var _ref35, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn22, PayStyle, SettleStyle, key, modes;
+                var _ref31, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee16$(_context16) {
+                return _regenerator2.default.wrap(function _callee15$(_context15) {
                     while (1) {
-                        switch (_context16.prev = _context16.next) {
+                        switch (_context15.prev = _context15.next) {
                             case 0:
                                 // 是否移动端判断
-                                _ref35 = _mutantsUtil.platform || {}, isHorizontalPad = _ref35.isHorizontalPad, isHorizontalSunMi = _ref35.isHorizontalSunMi;
+                                _ref31 = _mutantsUtil.platform || {}, isHorizontalPad = _ref31.isHorizontalPad, isHorizontalSunMi = _ref31.isHorizontalSunMi;
                                 isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
-                                _enumController$getEn22 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn22.PayStyle, SettleStyle = _enumController$getEn22.SettleStyle;
-                                key = type == 1 ? 'MemberStorageSettle' : type == 2 ? 'CreditSales' : isIntegralExchange ? 'IntegralExchangeSettle' : 'CommonSettle';
-                                modes = _mutantsMicrofx.stores.voucherStore.getPaymodes(SettleStyle[key]);
+                                _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 };
+                                _context15.next = 7;
+                                return _settlementApi2.default.GetNewStoreSettleStyles({ param: param });
+
+                            case 7:
+                                modes = _context15.sent;
 
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
@@ -2804,7 +2621,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                         settleLists = isMobileEnvironment ? settleLists.filter(function (v) {
                                             return !v.ThirdPaymentInfo;
                                         }) : settleLists;
-                                        (0, _each3.default)(settleLists, function (mode) {
+                                        (0, _each3.default)(settleLists, function (mode, index) {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
                                             if (mode.Code == PayStyle.hyczk) {
                                                 mode.Name = '储值卡';
@@ -2825,20 +2642,20 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
-                                        _this21.paymodes = paymodes;
+                                        _this20.paymodes = paymodes;
                                     });
                                 }
 
-                            case 6:
+                            case 9:
                             case 'end':
-                                return _context16.stop();
+                                return _context15.stop();
                         }
                     }
-                }, _callee16, this);
+                }, _callee15, this);
             }));
 
-            function setPaymodes(_x14, _x15) {
-                return _ref34.apply(this, arguments);
+            function setPaymodes(_x13, _x14) {
+                return _ref30.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2893,19 +2710,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
 }), _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), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this22 = this;
+        var _this21 = this;
 
         return function () {
-            _this22.checkList = [];
+            _this21.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), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this23 = this;
+        var _this22 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this23.currentMode.djqs.forEach(function (ele) {
+            _this22.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     ele.amount = promoDiscount;
                     promoMethodEnum == "CASH_COUPON" && (ele.nominalAmount = nominalAmount);
@@ -2919,7 +2736,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
 }), _descriptor16 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this24 = this;
+        var _this23 = this;
 
         return function (promoCouponCode, name, IsEnable, nominalAmount, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2942,13 +2759,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this24.currentMode.djqs.push(djq);
+            _this23.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 _this25 = this;
+        var _this24 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
@@ -2971,11 +2788,11 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
             (0, _mobx.runInAction)(function () {
-                _this25.cardNo = m.CardCode;
+                _this24.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this25.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this24.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this25.balance = _this25.rawbalance;
+                    _this24.balance = _this24.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;