tplus-components-touch 3.32.8 → 3.33.4

package/dist/components/settlement/settlementStore.js

@@ -168,7 +168,6 @@ var SettlementStore = (_class = function () {
         (0, _classCallCheck3.default)(this, SettlementStore);
         this.paymode = null;
         this.dto = null;
-        this.dtoParams = null;
         this.member = null;
         this.brefund = false;
         this.bquick = false;
@@ -428,6 +427,45 @@ var SettlementStore = (_class = function () {
             };
         }();
 
+        this.repeatStorageModal = function (content) {
+            return new _promise2.default(function (resolve, reject) {
+                _tplusComponentsTouch.ModalWraper.confirm({
+                    title: '',
+                    okText: '继续储值',
+                    className: 'repeat-modal',
+                    zIndex: 1007,
+                    content: content,
+                    onOk: function () {
+                        var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+                            return _regenerator2.default.wrap(function _callee2$(_context2) {
+                                while (1) {
+                                    switch (_context2.prev = _context2.next) {
+                                        case 0:
+                                            _context2.next = 2;
+                                            return _this2.saveMember();
+
+                                        case 2:
+                                            resolve(true);
+
+                                        case 3:
+                                        case 'end':
+                                            return _context2.stop();
+                                    }
+                                }
+                            }, _callee2, _this2);
+                        }));
+
+                        return function onOk() {
+                            return _ref5.apply(this, arguments);
+                        };
+                    }(),
+                    onCancel: function onCancel() {
+                        resolve(false);
+                    }
+                });
+            });
+        };
+
         this.checkIntegralExchangeReturn = function (id) {
             return new _promise2.default(function (resolve, reject) {
                 (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -543,8 +581,8 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn5.PayStyle;
 
-            var _ref5 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref5.isNewRetailBCPos;
+            var _ref6 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref6.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
@@ -569,14 +607,14 @@ var SettlementStore = (_class = function () {
                     if (themode.paymentType == PayStyle.djq) {
                         (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                var _ref6 = djq || {},
-                                    displayText = _ref6.displayText,
-                                    promoRuleId = _ref6.promoRuleId,
-                                    dateMount = _ref6.dateMount,
-                                    promoMethodEnum = _ref6.promoMethodEnum,
-                                    discountPct = _ref6.discountPct,
-                                    promoId = _ref6.promoId,
-                                    id = _ref6.id;
+                                var _ref7 = djq || {},
+                                    displayText = _ref7.displayText,
+                                    promoRuleId = _ref7.promoRuleId,
+                                    dateMount = _ref7.dateMount,
+                                    promoMethodEnum = _ref7.promoMethodEnum,
+                                    discountPct = _ref7.discountPct,
+                                    promoId = _ref7.promoId,
+                                    id = _ref7.id;
 
                                 _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
@@ -684,44 +722,44 @@ var SettlementStore = (_class = function () {
             var IdStore = this.storeInfo.storeID;
             var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
 
-            var _ref7 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref7.isNewRetailBCPos;
+            var _ref8 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref8.isNewRetailBCPos;
 
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
                 address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
-                    var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
+                    var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
                         var data, m;
-                        return _regenerator2.default.wrap(function _callee2$(_context2) {
+                        return _regenerator2.default.wrap(function _callee3$(_context3) {
                             while (1) {
-                                switch (_context2.prev = _context2.next) {
+                                switch (_context3.prev = _context3.next) {
                                     case 0:
                                         data = result.data;
                                         m = data && data.length && data[0];
 
                                         if (!(result && result.data.length)) {
-                                            _context2.next = 25;
+                                            _context3.next = 25;
                                             break;
                                         }
 
                                         if (!(result.data.length === 1)) {
-                                            _context2.next = 14;
+                                            _context3.next = 14;
                                             break;
                                         }
 
                                         if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
-                                            _context2.next = 10;
+                                            _context3.next = 10;
                                             break;
                                         }
 
                                         _this7.paymode.updateCardInfo(m);
                                         _this7.handleCzkData(m);
-                                        return _context2.abrupt('return', result.data);
+                                        return _context3.abrupt('return', result.data);
 
                                     case 10:
-                                        _context2.next = 12;
+                                        _context3.next = 12;
                                         return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
                                             var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
                                             if (data1.enable) {
@@ -734,40 +772,40 @@ var SettlementStore = (_class = function () {
                                         });
 
                                     case 12:
-                                        _context2.next = 25;
+                                        _context3.next = 25;
                                         break;
 
                                     case 14:
                                         if (!(result.data && result.data.length === 1)) {
-                                            _context2.next = 19;
+                                            _context3.next = 19;
                                             break;
                                         }
 
                                         _this7.paymode.updateCardInfo(result.data[0]);
-                                        return _context2.abrupt('return', result.data);
+                                        return _context3.abrupt('return', result.data);
 
                                     case 19:
                                         if (!(result.data && result.data.length > 1)) {
-                                            _context2.next = 23;
+                                            _context3.next = 23;
                                             break;
                                         }
 
-                                        return _context2.abrupt('return', result.data);
+                                        return _context3.abrupt('return', result.data);
 
                                     case 23:
                                         _message2.default.warn('没有可用储值卡！');
-                                        return _context2.abrupt('return', false);
+                                        return _context3.abrupt('return', false);
 
                                     case 25:
                                     case 'end':
-                                        return _context2.stop();
+                                        return _context3.stop();
                                 }
                             }
-                        }, _callee2, _this7);
+                        }, _callee3, _this7);
                     }));
 
                     return function (_x2) {
-                        return _ref8.apply(this, arguments);
+                        return _ref9.apply(this, arguments);
                     };
                 }()
                 // result.data.forEach((m) => {
@@ -910,7 +948,6 @@ var SettlementStore = (_class = function () {
                 name: themode.name,
                 exchangeRate: themode.exchangeRate,
                 calDirection: themode.calDirection,
-                thridPayment: themode.thridPayment,
                 value: value,
                 value2: (0, _utils.getFixedNumber)(themode.calDirection == "88" ? value / themode.exchangeRate : value * themode.exchangeRate),
                 value3: value,
@@ -939,7 +976,7 @@ var SettlementStore = (_class = function () {
             if (type == PayStyle.hyczk || type == PayStyle.jfdx || type == PayStyle.djq) {
                 this.setMaxAmount(type, mode);
             }
-            console.log('\u5F53\u524D\u64CD\u4F5C\u7ED3\u7B97\u65B9\u5F0F\u4FE1\u606F:' + mode);
+            console.log(mode);
             return mode;
         }
     }, {
@@ -976,6 +1013,15 @@ var SettlementStore = (_class = function () {
         key: 'changeFocusOnly',
         value: function changeFocusOnly(type) {
             this.paymode.currentFocus = type;
+            // 获取焦点时带入剩余的值
+            // let mode=_find(this.paymode.thePaymodes,{'paymentType':type});
+            // if(mode && this.isIntegralExchange){
+            //     const shouldSetValue =getFixedNumber(parseFloat(this.paymode.receivable) + parseFloat(mode.value));
+            //     mode.value = shouldSetValue;
+            //     mode.value2 = getFixedNumber(mode.calDirection=="88"?shouldSetValue / mode.exchangeRate:(shouldSetValue * mode.exchangeRate));
+            //     mode.value3 = shouldSetValue;
+            //     this.paymode.calcReserved();
+            // }
         }
     }, {
         key: 'changeClickFocusOnly',
@@ -1037,13 +1083,6 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
 
-            var hasThirdPay = this.paymode.thePaymodes.findIndex(function (v) {
-                return !!v.thridPayment;
-            });
-            if (hasThirdPay > -1 && curMode.thridPayment) {
-                _message2.default.warn('二开支付目前仅支持单一结算。');
-                return;
-            }
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
                 var index = (0, _findLastIndex3.default)(this.paymode.thePaymodes, function (m) {
@@ -1051,6 +1090,8 @@ var SettlementStore = (_class = function () {
                 });
                 pos = index == -1 ? pos : index + 1;
             }
+            // this.paymode.thePaymodes.push(this.genNewMode(type) );
+
             this.paymode.thePaymodes.splice(pos, 0, this.genNewMode(type, this.newStyle && type == PayStyle.hyczk, undefined, isQuick));
             this.paymode.calcReserved();
         }
@@ -1066,83 +1107,158 @@ var SettlementStore = (_class = function () {
             this.paymode.currentFocus = -1;
             this.paymode.calcReserved();
         }
+
+        // 获取储值是否重复, 在commit方法中使用
+
+    }, {
+        key: 'findStorageBillValidate',
+        value: function findStorageBillValidate() {
+            var _this10 = this;
+
+            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle;
+
+            (0, _mobx.runInAction)(function () {
+                _this10.dto.StorageMutiSettleDetails = [];
+                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
+                    return parseFloat(mode.value) != 0;
+                }) : _this10.paymode.thePaymodes;
+                (0, _each3.default)(thePaymodes, function (mode) {
+                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+
+                    var value = parseFloat(mode.value);
+                    var giveChange = null;
+                    if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
+                        value = Math.Add(value, _this10.paymode.receivable);
+                        giveChange = Math.abs(_this10.paymode.receivable);
+                    }
+                    _this10.dto.StorageMutiSettleDetails.push({
+                        Code: mode.paymethodId,
+                        StorageAmount: value,
+                        GiveChange: giveChange,
+                        IdsettleStyle: themode.idSettleStyle,
+                        IdbankAccount: themode.idBankAccount,
+                        PaymentCode: mode.authCode,
+                        DynamicPropertyKeys: [],
+                        DynamicPropertyValues: [],
+                        DataSource: { Id: _this10.dataSource }
+                    });
+                });
+            });
+            return (0, _tplusApi.ccApi)((0, _extends3.default)({}, this.dto), '/marketingtool/Storage/findStorageBillValidate', false, false);
+        }
+
+        //判断是否重复弹框
+
     }, {
         key: 'commit',
         value: function () {
-            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(bTest) {
-                var ret;
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
+                var _ref11, isNewRetailBCPos, ret, _ref12, _ref12$data, code, returnMsg, state;
+
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context3.prev = _context3.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
                                 console.log('settlementStore.commit开始，参数：' + bTest);
 
                                 if (!bTest) {
-                                    _context3.next = 3;
+                                    _context4.next = 3;
                                     break;
                                 }
 
-                                return _context3.abrupt('return', _promise2.default.resolve(true));
+                                return _context4.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _context3.prev = 3;
+                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
+                                _context4.prev = 4;
 
                                 if (!(this.type == 1)) {
-                                    _context3.next = 9;
+                                    _context4.next = 24;
                                     break;
                                 }
 
-                                _context3.next = 7;
+                                _context4.next = 8;
+                                return this.findStorageBillValidate();
+
+                            case 8:
+                                ret = _context4.sent;
+                                _ref12 = ret || {}, _ref12$data = _ref12.data;
+                                _ref12$data = _ref12$data === undefined ? {} : _ref12$data;
+                                code = _ref12$data.code, returnMsg = _ref12$data.returnMsg;
+
+                                if (!(code && code == 10001)) {
+                                    _context4.next = 20;
+                                    break;
+                                }
+
+                                _context4.next = 15;
+                                return this.repeatStorageModal(returnMsg);
+
+                            case 15:
+                                state = _context4.sent;
+
+                                if (!(state === false)) {
+                                    _context4.next = 18;
+                                    break;
+                                }
+
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
+
+                            case 18:
+                                _context4.next = 22;
+                                break;
+
+                            case 20:
+                                _context4.next = 22;
                                 return this.saveMember();
 
-                            case 7:
-                                _context3.next = 18;
+                            case 22:
+                                _context4.next = 32;
                                 break;
 
-                            case 9:
-                                _context3.next = 11;
+                            case 24:
+                                if (!isNewRetailBCPos) {
+                                    _context4.next = 27;
+                                    break;
+                                }
+
+                                _context4.next = 27;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
-                            case 11:
-                                _context3.next = 13;
+                            case 27:
+                                _context4.next = 29;
                                 return this.save();
 
-                            case 13:
-                                ret = _context3.sent;
-
-                                if (!(ret === false)) {
-                                    _context3.next = 16;
+                            case 29:
+                                if (!isNewRetailBCPos) {
+                                    _context4.next = 32;
                                     break;
                                 }
 
-                                return _context3.abrupt('return', _promise2.default.resolve(false));
-
-                            case 16:
-                                _context3.next = 18;
+                                _context4.next = 32;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
-                            case 18:
-                                return _context3.abrupt('return', _promise2.default.resolve(true));
+                            case 32:
+                                return _context4.abrupt('return', _promise2.default.resolve(true));
 
-                            case 21:
-                                _context3.prev = 21;
-                                _context3.t0 = _context3['catch'](3);
+                            case 35:
+                                _context4.prev = 35;
+                                _context4.t0 = _context4['catch'](4);
 
-                                console.error('settlementStore.commit失败，错误信息：' + _context3.t0);
-                                //其他支付失败时,处理二开支付情况。
-                                this.thirdPayRefund();
-                                return _context3.abrupt('return', _promise2.default.resolve(_context3.t0));
+                                console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
+                                return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
 
-                            case 26:
+                            case 39:
                             case 'end':
-                                return _context3.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee3, this, [[3, 21]]);
+                }, _callee4, this, [[4, 35]]);
             }));
 
             function commit(_x3) {
-                return _ref9.apply(this, arguments);
+                return _ref10.apply(this, arguments);
             }
 
             return commit;
@@ -1156,26 +1272,26 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'saveMember',
         value: function saveMember() {
-            var _this10 = this;
+            var _this11 = this;
 
-            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn14.PayStyle;
+            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn15.PayStyle;
 
             (0, _mobx.runInAction)(function () {
-                _this10.dto.StorageMutiSettleDetails = [];
-                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
+                _this11.dto.StorageMutiSettleDetails = [];
+                var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                     return parseFloat(mode.value) != 0;
-                }) : _this10.paymode.thePaymodes;
+                }) : _this11.paymode.thePaymodes;
                 (0, _each3.default)(thePaymodes, function (mode) {
-                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+                    var themode = (0, _find3.default)(_this11.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);
+                    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);
                     }
-                    _this10.dto.StorageMutiSettleDetails.push({
+                    _this11.dto.StorageMutiSettleDetails.push({
                         Code: mode.paymethodId,
                         StorageAmount: value,
                         GiveChange: giveChange,
@@ -1184,7 +1300,7 @@ var SettlementStore = (_class = function () {
                         PaymentCode: mode.authCode,
                         DynamicPropertyKeys: [],
                         DynamicPropertyValues: [],
-                        DataSource: { Id: _this10.dataSource }
+                        DataSource: { Id: _this11.dataSource }
                     });
                 });
             });
@@ -1194,37 +1310,37 @@ var SettlementStore = (_class = function () {
                 IPMSG = JSON.parse(window.localStorage.IPMSG);
             }
             return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                _this10.handlePrint(resp);
+                _this11.handlePrint(resp);
             });
         }
     }, {
         key: 'save',
         value: function () {
-            var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-                var _this11 = this;
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _this12 = this;
 
-                var _enumController$getEn15, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, amount, tradeType, ret, _ref11, type, data, msg, code;
+                var _enumController$getEn16, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
 
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context5.prev = _context5.next) {
                             case 0:
-                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle, TradeType = _enumController$getEn15.TradeType;
+                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this11.dto.RetailPaymentDetails = [];
-                                    _this11.dto.RetailStorageDetails = [];
-                                    _this11.dto.RetailCouponDetails = [];
+                                    _this12.dto.RetailPaymentDetails = [];
+                                    _this12.dto.RetailStorageDetails = [];
+                                    _this12.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
                                     var count = 0;
-                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
+                                    var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this11.paymode.thePaymodes;
+                                    }) : _this12.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             czkSum = Math.Add(czkSum, mode.value);
-                                            _this11.dto.RetailStorageDetails.push({
+                                            _this12.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
                                                 MeStorageCardId: mode.meStorageCardId,
                                                 StoragePaymentAmount: mode.value,
@@ -1233,17 +1349,17 @@ var SettlementStore = (_class = function () {
                                                 Idmember: mode.memberId,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
+                                                DataSource: { Id: _this12.dataSource },
                                                 Password: mode.authCode
                                             });
                                         } else {
                                             var value = parseFloat(mode.value);
                                             var giveChange = null;
-                                            if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
-                                                value = Math.Add(value, _this11.paymode.receivable);
-                                                giveChange = Math.abs(_this11.paymode.receivable);
+                                            if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
+                                                value = Math.Add(value, _this12.paymode.receivable);
+                                                giveChange = Math.abs(_this12.paymode.receivable);
                                             }
-                                            _this11.dto.RetailPaymentDetails.push({
+                                            _this12.dto.RetailPaymentDetails.push({
                                                 Code: mode.paymethodId,
                                                 OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
                                                 Amount: value,
@@ -1257,12 +1373,11 @@ var SettlementStore = (_class = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this11.dataSource },
-                                                ThirdPaymentInfo: themode.thridPayment || null
+                                                DataSource: { Id: _this12.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
-                                                    _this11.dto.RetailCouponDetails.push({
+                                                (0, _each3.default)(_this12.paymode.checkList && _this12.paymode.checkList.length ? _this12.paymode.checkList : mode.djqs, function (djq) {
+                                                    _this12.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
                                                         EnableAmount: djq.doorsill,
@@ -1272,28 +1387,53 @@ var SettlementStore = (_class = function () {
                                                         PromotionId: djq.promoId,
                                                         PromotionRuleId: djq.promoRuleId,
                                                         PromoCouponAllocatedId: djq.id,
-                                                        DataSource: { Id: _this11.dataSource }
+                                                        DataSource: { Id: _this12.dataSource }
                                                     });
                                                 });
                                             }
                                         }
                                     });
-                                    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: _this11.dataSource },
-                                            RetailStorageDetails: _this11.dto.RetailStorageDetails
-                                        });
+
+                                    var _ref14 = _mutantsUtil.platform || {},
+                                        isNewRetailBCPos = _ref14.isNewRetailBCPos;
+
+                                    if (_this12.dto.RetailStorageDetails.length > 0) {
+                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
+                                        if (isNewRetailBCPos) {
+                                            _this12.dto.RetailPaymentDetails.push({
+                                                Code: _this12.paymode.counter,
+                                                OrigAmount: czkSum,
+                                                Amount: czkSum,
+                                                IdsettleStyle: themode.idSettleStyle,
+                                                IdbankAccount: themode.idBankAccount,
+                                                DynamicPropertyKeys: [],
+                                                DynamicPropertyValues: [],
+                                                DataSource: { Id: _this12.dataSource },
+                                                RetailStorageDetails: _this12.dto.RetailStorageDetails
+                                            });
+                                        } else {
+                                            _this12.dto.RetailPaymentDetails.push({
+                                                Code: _this12.paymode.counter,
+                                                OrigAmount: czkSum,
+                                                Amount: czkSum,
+                                                IdsettleStyle: themode.idSettleStyle,
+                                                IdbankAccount: themode.idBankAccount,
+                                                DynamicPropertyKeys: [],
+                                                DynamicPropertyValues: [],
+                                                DataSource: { Id: _this12.dataSource }
+                                            });
+                                        }
                                     }
                                 });
-                                console.log('\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
+                                _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
+
+                                console.log('bc_pos\u73AF\u5883:' + isNewRetailBCPos + ',\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
+
+                                if (!isNewRetailBCPos) {
+                                    _context5.next = 20;
+                                    break;
+                                }
+
                                 // cc结算调用
                                 IPMSG = {};
 
@@ -1301,155 +1441,52 @@ var SettlementStore = (_class = function () {
                                     IPMSG = JSON.parse(window.localStorage.IPMSG);
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
-                                _context4.t1 = this.dto.IdbusiType == 37;
+                                _context5.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context4.t1) {
-                                    _context4.next = 11;
+                                if (!_context5.t1) {
+                                    _context5.next = 13;
                                     break;
                                 }
 
-                                _context4.next = 10;
+                                _context5.next = 12;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 10:
-                                _context4.t1 = _context4.sent;
-
-                            case 11:
-                                _context4.t0 = _context4.t1;
-
-                                if (_context4.t0) {
-                                    _context4.next = 14;
-                                    break;
-                                }
-
-                                _context4.t0 = this.dto.IdbusiType != 37;
-
-                            case 14:
-                                if (!_context4.t0) {
-                                    _context4.next = 33;
-                                    break;
-                                }
-
-                                dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
-                                //处理存在二开支付情况
-
-                                payList = dtoParams.RetailPaymentDetails.filter(function (v) {
-                                    return v.ThirdPaymentInfo;
-                                });
-
-                                if (!(payList && payList.length > 0)) {
-                                    _context4.next = 30;
-                                    break;
-                                }
-
-                                amount = payList[0].Amount;
-                                tradeType = amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context4.next = 22;
-                                return this.thirdPay(tradeType, dtoParams);
-
-                            case 22:
-                                ret = _context4.sent;
-                                _ref11 = ret || {}, type = _ref11.type, data = _ref11.data, msg = _ref11.msg, code = _ref11.code;
-
-                                if (!(type === true)) {
-                                    _context4.next = 28;
-                                    break;
-                                }
-
-                                dtoParams = data;
-                                _context4.next = 30;
-                                break;
-
-                            case 28:
-                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context4.abrupt('return', false);
-
-                            case 30:
-                                this.dtoParams = dtoParams;
-                                console.log('结算信息:', dtoParams);
-                                return _context4.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    var _ref12 = resp || {},
-                                        ID = _ref12.ID;
-
-                                    _this11.setDtoID(ID);
-                                    _this11.billID = ID;
-                                    _this11.paymode.checkList = [];
-                                }));
-
-                            case 33:
-                            case 'end':
-                                return _context4.stop();
-                        }
-                    }
-                }, _callee4, this);
-            }));
-
-            function save() {
-                return _ref10.apply(this, arguments);
-            }
-
-            return save;
-        }()
-        //二开支付
-
-    }, {
-        key: 'thirdPay',
-        value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(status, dto) {
-                var params, ret, _ref14, Code, Message, Result, _ref15, ThirdPaymentReturnInfo;
-
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
-                    while (1) {
-                        switch (_context5.prev = _context5.next) {
-                            case 0:
-                                params = { TradeType: status, dto: dto };
-
-                                console.log('刷卡信息:', (0, _stringify2.default)(params));
-                                _context5.next = 4;
-                                return new _promise2.default(function (resolve, reject) {
-                                    _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
-                                        return resolve(res);
-                                    });
-                                });
-
-                            case 4:
-                                ret = _context5.sent;
+                            case 12:
+                                _context5.t1 = _context5.sent;
 
-                                console.log('刷卡返回信息:', ret);
-                                ret = JSON.parse(ret);
-                                _ref14 = ret || {}, Code = _ref14.Code, Message = _ref14.Message, Result = _ref14.Result;
+                            case 13:
+                                _context5.t0 = _context5.t1;
 
-                                if (!(Code > 0)) {
-                                    _context5.next = 12;
+                                if (_context5.t0) {
+                                    _context5.next = 16;
                                     break;
                                 }
 
-                                return _context5.abrupt('return', { type: false, data: null, msg: Message, code: Code });
+                                _context5.t0 = this.dto.IdbusiType != 37;
 
-                            case 12:
-                                if (!(status == '00')) {
+                            case 16:
+                                if (!_context5.t0) {
                                     _context5.next = 18;
                                     break;
                                 }
 
-                                _ref15 = Result || {}, ThirdPaymentReturnInfo = _ref15.ThirdPaymentReturnInfo;
-
-                                dto.RetailPaymentDetails.forEach(function (v) {
-                                    if (v.ThirdPaymentInfo != null) {
-                                        v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
-                                    }
-                                });
-                                return _context5.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+                                return _context5.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
+                                    _this12.setDtoID(resp.ID);
+                                    _this12.paymode.checkList = [];
+                                    _this12.billID = resp.ID;
+                                }));
 
                             case 18:
-                                if (!(status == '02')) {
-                                    _context5.next = 20;
-                                    break;
-                                }
-
-                                return _context5.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+                                _context5.next = 21;
+                                break;
 
                             case 20:
+                                return _context5.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
+                                    _this12.setDtoID(resp.ID);
+                                    _this12.billID = resp.ID;
+                                }));
+
+                            case 21:
                             case 'end':
                                 return _context5.stop();
                         }
@@ -1457,77 +1494,17 @@ var SettlementStore = (_class = function () {
                 }, _callee5, this);
             }));
 
-            function thirdPay(_x4, _x5) {
+            function save() {
                 return _ref13.apply(this, arguments);
             }
 
-            return thirdPay;
+            return save;
         }()
-
-        //二开支付强制退款情况
-
     }, {
-        key: 'thirdPayRefund',
-        value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
-                var _this12 = this;
-
-                var dto, pay, _enumController$getEn16, TradeType;
-
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
-                    while (1) {
-                        switch (_context7.prev = _context7.next) {
-                            case 0:
-                                dto = this.dtoParams;
-                                pay = dto && dto.RetailPaymentDetails.filter(function (v) {
-                                    return v.ThirdPaymentInfo;
-                                });
-
-                                if (pay && pay.length > 0) {
-                                    setTimeout(function () {
-                                        _message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
-                                    }, 1000);
-                                    _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn16.TradeType;
-
-                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-                                        var ret, _ref18, msg;
-
-                                        return _regenerator2.default.wrap(function _callee6$(_context6) {
-                                            while (1) {
-                                                switch (_context6.prev = _context6.next) {
-                                                    case 0:
-                                                        _context6.next = 2;
-                                                        return _this12.thirdPay(TradeType.REFUND, dto);
-
-                                                    case 2:
-                                                        ret = _context6.sent;
-                                                        _ref18 = ret || {}, msg = _ref18.msg;
-
-                                                        console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
-
-                                                    case 5:
-                                                    case 'end':
-                                                        return _context6.stop();
-                                                }
-                                            }
-                                        }, _callee6, _this12);
-                                    })), 4500);
-                                }
-
-                            case 3:
-                            case 'end':
-                                return _context7.stop();
-                        }
-                    }
-                }, _callee7, this);
-            }));
-
-            function thirdPayRefund() {
-                return _ref16.apply(this, arguments);
-            }
-
-            return thirdPayRefund;
-        }()
+        key: 'setVoucherDate',
+        value: function setVoucherDate() {
+            this.dto.VoucherDate = new Date();
+        }
     }, {
         key: 'setDtoID',
         value: function setDtoID(id) {
@@ -1536,35 +1513,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-                return _regenerator2.default.wrap(function _callee8$(_context8) {
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context6.prev = _context6.next) {
                             case 0:
-                                _context8.prev = 0;
-                                _context8.t0 = _promise2.default;
-                                _context8.next = 4;
+                                _context6.prev = 0;
+                                _context6.t0 = _promise2.default;
+                                _context6.next = 4;
                                 return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
 
                             case 4:
-                                _context8.t1 = _context8.sent;
-                                return _context8.abrupt('return', _context8.t0.resolve.call(_context8.t0, _context8.t1));
+                                _context6.t1 = _context6.sent;
+                                return _context6.abrupt('return', _context6.t0.resolve.call(_context6.t0, _context6.t1));
 
                             case 8:
-                                _context8.prev = 8;
-                                _context8.t2 = _context8['catch'](0);
-                                return _context8.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context6.prev = 8;
+                                _context6.t2 = _context6['catch'](0);
+                                return _context6.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context8.stop();
+                                return _context6.stop();
                         }
                     }
-                }, _callee8, this, [[0, 8]]);
+                }, _callee6, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref19.apply(this, arguments);
+                return _ref16.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1590,18 +1567,18 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            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, result, count, _result;
+            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(value) {
+                var _ref18, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context7.prev = _context7.next) {
                             case 0:
-                                _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
-                                _context9.prev = 1;
+                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
+                                _context7.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context9.next = 33;
+                                    _context7.next = 33;
                                     break;
                                 }
 
@@ -1611,60 +1588,60 @@ var SettlementStore = (_class = function () {
                                 memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context9.next = 12;
+                                    _context7.next = 12;
                                     break;
                                 }
 
                                 if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context9.next = 12;
+                                    _context7.next = 12;
                                     break;
                                 }
 
                                 if (!(cook2[memberStorageId] > 3)) {
-                                    _context9.next = 12;
+                                    _context7.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context9.abrupt('return', _promise2.default.resolve(message));
+                                return _context7.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
                                 _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
                                 result = null;
 
                                 if (!(cardTypeEnum === 'BALANCE_CARD')) {
-                                    _context9.next = 20;
+                                    _context7.next = 20;
                                     break;
                                 }
 
-                                _context9.next = 17;
+                                _context7.next = 17;
                                 return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
 
                             case 17:
-                                result = _context9.sent;
-                                _context9.next = 29;
+                                result = _context7.sent;
+                                _context7.next = 29;
                                 break;
 
                             case 20:
                                 if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
-                                    _context9.next = 26;
+                                    _context7.next = 26;
                                     break;
                                 }
 
-                                _context9.next = 23;
+                                _context7.next = 23;
                                 return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 23:
-                                result = _context9.sent;
-                                _context9.next = 29;
+                                result = _context7.sent;
+                                _context7.next = 29;
                                 break;
 
                             case 26:
-                                _context9.next = 28;
+                                _context7.next = 28;
                                 return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 28:
-                                result = _context9.sent;
+                                result = _context7.sent;
 
                             case 29:
                                 if (!result.data) {
@@ -1683,38 +1660,38 @@ var SettlementStore = (_class = function () {
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context9.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context7.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
                             case 33:
-                                _context9.next = 35;
+                                _context7.next = 35;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
                             case 35:
-                                _result = _context9.sent;
-                                return _context9.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                                _result = _context7.sent;
+                                return _context7.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
                             case 37:
-                                _context9.next = 42;
+                                _context7.next = 42;
                                 break;
 
                             case 39:
-                                _context9.prev = 39;
-                                _context9.t0 = _context9['catch'](1);
-                                return _context9.abrupt('return', "failed");
+                                _context7.prev = 39;
+                                _context7.t0 = _context7['catch'](1);
+                                return _context7.abrupt('return', "failed");
 
                             case 42:
                             case 'end':
-                                return _context9.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee9, this, [[1, 39]]);
+                }, _callee7, this, [[1, 39]]);
             }));
 
-            function validePwd(_x6) {
-                return _ref20.apply(this, arguments);
+            function validePwd(_x4) {
+                return _ref17.apply(this, arguments);
             }
 
             return validePwd;
@@ -1753,34 +1730,34 @@ var SettlementStore = (_class = function () {
         var _this14 = this;
 
         return function () {
-            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(_this) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
-                        switch (_context10.prev = _context10.next) {
+                        switch (_context8.prev = _context8.next) {
                             case 0:
                                 _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context10.next = 3;
+                                _context8.next = 3;
                                 return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context10.sent;
+                                resp = _context8.sent;
 
                                 _this.member = resp;
                                 _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
-                                return _context10.abrupt('return', _promise2.default.resolve(resp));
+                                return _context8.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context10.stop();
+                                return _context8.stop();
                         }
                     }
-                }, _callee10, _this14);
+                }, _callee8, _this14);
             }));
 
-            return function (_x7) {
-                return _ref22.apply(this, arguments);
+            return function (_x5) {
+                return _ref19.apply(this, arguments);
             };
         }();
     }
@@ -1790,62 +1767,62 @@ var SettlementStore = (_class = function () {
         var _this15 = this;
 
         return function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(memberId) {
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(memberId) {
                 var result;
-                return _regenerator2.default.wrap(function _callee11$(_context11) {
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context9.prev = _context9.next) {
                             case 0:
-                                _context11.next = 2;
+                                _context9.next = 2;
                                 return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
 
                             case 2:
-                                result = _context11.sent;
+                                result = _context9.sent;
 
                                 if (!(result && result.data.length)) {
-                                    _context11.next = 20;
+                                    _context9.next = 20;
                                     break;
                                 }
 
                                 if (!(result.data.length === 1)) {
-                                    _context11.next = 9;
+                                    _context9.next = 9;
                                     break;
                                 }
 
                                 _this15.paymode.updateCardInfo(result.data[0]);
-                                return _context11.abrupt('return', result.data);
+                                return _context9.abrupt('return', result.data);
 
                             case 9:
                                 if (!(result.data && result.data.length === 1)) {
-                                    _context11.next = 14;
+                                    _context9.next = 14;
                                     break;
                                 }
 
                                 _this15.paymode.updateCardInfo(result.data[0]);
-                                return _context11.abrupt('return', result.data);
+                                return _context9.abrupt('return', result.data);
 
                             case 14:
                                 if (!(result.data && result.data.length > 1)) {
-                                    _context11.next = 18;
+                                    _context9.next = 18;
                                     break;
                                 }
 
-                                return _context11.abrupt('return', result.data);
+                                return _context9.abrupt('return', result.data);
 
                             case 18:
                                 _message2.default.warn('没有可用储值卡！');
-                                return _context11.abrupt('return', false);
+                                return _context9.abrupt('return', false);
 
                             case 20:
                             case 'end':
-                                return _context11.stop();
+                                return _context9.stop();
                         }
                     }
-                }, _callee11, _this15);
+                }, _callee9, _this15);
             }));
 
-            return function (_x8) {
-                return _ref23.apply(this, arguments);
+            return function (_x6) {
+                return _ref20.apply(this, arguments);
             };
         }();
     }
@@ -1854,30 +1831,30 @@ var SettlementStore = (_class = function () {
     initializer: function initializer() {
         var _this16 = this;
 
-        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12() {
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
             var address, result;
-            return _regenerator2.default.wrap(function _callee12$(_context12) {
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
                 while (1) {
-                    switch (_context12.prev = _context12.next) {
+                    switch (_context10.prev = _context10.next) {
                         case 0:
                             address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this16.paymode.currentMode.storageCardNo;
-                            _context12.next = 3;
+                            _context10.next = 3;
                             return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
 
                         case 3:
-                            result = _context12.sent;
+                            result = _context10.sent;
 
                             _this16.paymode.updateCardInfo(result.data);
 
                         case 5:
                         case 'end':
-                            return _context12.stop();
+                            return _context10.stop();
                     }
                 }
-            }, _callee12, _this16);
+            }, _callee10, _this16);
         }));
     }
-}), _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);
+}), _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, 'setVoucherDate', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setVoucherDate'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
 exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
     //应收
@@ -1989,8 +1966,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref25 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref25.isNewRetailBCPos;
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
 
             var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn17.PayStyle,
@@ -2100,18 +2077,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             }
                         });
 
-                        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,
-                            doorsill = _ref26.doorsill;
+                        var _ref23 = element || {},
+                            couponCode = _ref23.couponCode,
+                            name = _ref23.name,
+                            tieredAmountResult = _ref23.tieredAmountResult,
+                            fromDate = _ref23.fromDate,
+                            dateMount = _ref23.dateMount,
+                            promoMethodEnum = _ref23.promoMethodEnum,
+                            discountPct = _ref23.discountPct,
+                            nominalAmount = _ref23.nominalAmount,
+                            promoId = _ref23.promoId,
+                            id = _ref23.id,
+                            doorsill = _ref23.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -2155,8 +2132,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref27 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref27.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
             var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
                 Differentiate = _enumController$getEn18.Differentiate;
@@ -2246,29 +2223,30 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(type, isIntegralExchange) {
+            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(type, isIntegralExchange) {
                 var _this18 = this;
 
                 var _enumController$getEn20, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee13$(_context13) {
+                return _regenerator2.default.wrap(function _callee11$(_context11) {
                     while (1) {
-                        switch (_context13.prev = _context13.next) {
+                        switch (_context11.prev = _context11.next) {
                             case 0:
                                 _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn20.settleStyleType, PayStyle = _enumController$getEn20.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
-                                _context13.next = 5;
+                                _context11.next = 5;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
                             case 5:
-                                modes = _context13.sent;
+                                modes = _context11.sent;
 
                                 if (modes) {
                                     (0, _mobx.runInAction)(function () {
                                         var paymodes = [];
                                         (0, _each3.default)(modes.SettleStyles, function (mode, index) {
                                             //产品需求确认会员储值卡结算方式前端展示统一调整为“储值卡"  tuzha by 2020-07-08
+
                                             if (mode.Code == PayStyle.hyczk) {
                                                 mode.Name = '储值卡';
                                             }
@@ -2283,24 +2261,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                                 idBankAccount: mode.IdBankAccount,
                                                 exchangeRate: mode.Currency ? mode.Currency.ExchangeRate : 1,
                                                 idCurrency: mode.Currency ? mode.Currency.ID : -1,
-                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
-                                                thridPayment: mode.ThirdPaymentInfo
+                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
                                             });
                                         });
                                         _this18.paymodes = paymodes;
+                                        //modes.QuickSettleStyles
                                     });
                                 }
 
                             case 7:
                             case 'end':
-                                return _context13.stop();
+                                return _context11.stop();
                         }
                     }
-                }, _callee13, this);
+                }, _callee11, this);
             }));
 
-            function setPaymodes(_x9, _x10) {
-                return _ref28.apply(this, arguments);
+            function setPaymodes(_x7, _x8) {
+                return _ref25.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2431,8 +2409,8 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref29 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref29.isNewRetailBCPos;
+            var _ref26 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref26.isNewRetailBCPos;
 
             (0, _mobx.runInAction)(function () {
                 _this22.cardNo = m.CardCode;