tplus-components-touch 3.33.4 → 3.33.8

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _desc2, _value2, _class3, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _desc3, _value3, _class5, _descriptor15, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
+var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _desc2, _value2, _class3, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _desc3, _value3, _class5, _descriptor16, _descriptor17, _descriptor18, _descriptor19, _descriptor20;
 
 var _mobx = require('mobx');
 
@@ -168,6 +168,7 @@ 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;
@@ -466,6 +467,8 @@ var SettlementStore = (_class = function () {
             });
         };
 
+        _initDefineProp(this, 'setVoucherDate', _descriptor5, this);
+
         this.checkIntegralExchangeReturn = function (id) {
             return new _promise2.default(function (resolve, reject) {
                 (0, _tplusApi.tApi)({ param: { refVoucherId: id } }, 'chanjet.RE.NewPos.GetNewIntegralExchange', false, false, { timeout_skip: true }).then(function (resp) {
@@ -601,7 +604,8 @@ var SettlementStore = (_class = function () {
                         authCode: detail.PaymentCode,
                         steadCashIntegral: detail.SteadCashIntegral,
                         overchargesAmount: detail.OverchargesAmount,
-                        boriginReturn: true
+                        boriginReturn: true,
+                        thirdPaymentReturnInfo: detail.ThirdPaymentReturnInfo
                     });
                     _this5.paymode.currentMode = newmode;
                     if (themode.paymentType == PayStyle.djq) {
@@ -948,6 +952,7 @@ 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,
@@ -976,7 +981,7 @@ var SettlementStore = (_class = function () {
             if (type == PayStyle.hyczk || type == PayStyle.jfdx || type == PayStyle.djq) {
                 this.setMaxAmount(type, mode);
             }
-            console.log(mode);
+            console.log('\u5F53\u524D\u64CD\u4F5C\u7ED3\u7B97\u65B9\u5F0F\u4FE1\u606F:' + mode);
             return mode;
         }
     }, {
@@ -1013,15 +1018,6 @@ 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',
@@ -1083,6 +1079,13 @@ 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) {
+                _message2.default.warn('二开支付目前仅支持单一结算。');
+                return;
+            }
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
                 var index = (0, _findLastIndex3.default)(this.paymode.thePaymodes, function (m) {
@@ -1090,8 +1093,6 @@ 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();
         }
@@ -1154,7 +1155,7 @@ var SettlementStore = (_class = function () {
         key: 'commit',
         value: function () {
             var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
-                var _ref11, isNewRetailBCPos, ret, _ref12, _ref12$data, code, returnMsg, state;
+                var ret, _ref11, _ref11$data, code, returnMsg, state, _ret;
 
                 return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
@@ -1170,72 +1171,71 @@ var SettlementStore = (_class = function () {
                                 return _context4.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
-                                _ref11 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref11.isNewRetailBCPos;
-                                _context4.prev = 4;
+                                _context4.prev = 3;
 
                                 if (!(this.type == 1)) {
-                                    _context4.next = 24;
+                                    _context4.next = 23;
                                     break;
                                 }
 
-                                _context4.next = 8;
+                                _context4.next = 7;
                                 return this.findStorageBillValidate();
 
-                            case 8:
+                            case 7:
                                 ret = _context4.sent;
-                                _ref12 = ret || {}, _ref12$data = _ref12.data;
-                                _ref12$data = _ref12$data === undefined ? {} : _ref12$data;
-                                code = _ref12$data.code, returnMsg = _ref12$data.returnMsg;
+                                _ref11 = ret || {}, _ref11$data = _ref11.data;
+                                _ref11$data = _ref11$data === undefined ? {} : _ref11$data;
+                                code = _ref11$data.code, returnMsg = _ref11$data.returnMsg;
 
                                 if (!(code && code == 10001)) {
-                                    _context4.next = 20;
+                                    _context4.next = 19;
                                     break;
                                 }
 
-                                _context4.next = 15;
+                                _context4.next = 14;
                                 return this.repeatStorageModal(returnMsg);
 
-                            case 15:
+                            case 14:
                                 state = _context4.sent;
 
                                 if (!(state === false)) {
-                                    _context4.next = 18;
+                                    _context4.next = 17;
                                     break;
                                 }
 
                                 return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                            case 18:
-                                _context4.next = 22;
+                            case 17:
+                                _context4.next = 21;
                                 break;
 
-                            case 20:
-                                _context4.next = 22;
+                            case 19:
+                                _context4.next = 21;
                                 return this.saveMember();
 
-                            case 22:
+                            case 21:
                                 _context4.next = 32;
                                 break;
 
-                            case 24:
-                                if (!isNewRetailBCPos) {
-                                    _context4.next = 27;
-                                    break;
-                                }
+                            case 23:
+                                _context4.next = 25;
+                                return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
+                            case 25:
                                 _context4.next = 27;
-                                return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
+                                return this.save();
 
                             case 27:
-                                _context4.next = 29;
-                                return this.save();
+                                _ret = _context4.sent;
 
-                            case 29:
-                                if (!isNewRetailBCPos) {
-                                    _context4.next = 32;
+                                if (!(_ret === false)) {
+                                    _context4.next = 30;
                                     break;
                                 }
 
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
+
+                            case 30:
                                 _context4.next = 32;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
@@ -1244,17 +1244,19 @@ var SettlementStore = (_class = function () {
 
                             case 35:
                                 _context4.prev = 35;
-                                _context4.t0 = _context4['catch'](4);
+                                _context4.t0 = _context4['catch'](3);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
+                                //其他支付失败时,处理二开支付情况。
+                                this.thirdPayRefund();
                                 return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
 
-                            case 39:
+                            case 40:
                             case 'end':
                                 return _context4.stop();
                         }
                     }
-                }, _callee4, this, [[4, 35]]);
+                }, _callee4, this, [[3, 35]]);
             }));
 
             function commit(_x3) {
@@ -1316,16 +1318,16 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+            var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                 var _this12 = this;
 
-                var _enumController$getEn16, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
+                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, dtoParams, payList, amount, tradeType, ret, _ref13, type, data, msg, code;
 
                 return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
                         switch (_context5.prev = _context5.next) {
                             case 0:
-                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle;
+                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle, TradeType = _enumController$getEn16.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
                                     _this12.dto.RetailPaymentDetails = [];
@@ -1373,7 +1375,9 @@ var SettlementStore = (_class = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this12.dataSource }
+                                                DataSource: { Id: _this12.dataSource },
+                                                ThirdPaymentInfo: themode.thridPayment || null,
+                                                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) {
@@ -1393,47 +1397,22 @@ var SettlementStore = (_class = function () {
                                             }
                                         }
                                     });
-
-                                    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 }
-                                            });
-                                        }
+                                        _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
+                                        });
                                     }
                                 });
-                                _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;
-                                }
-
+                                console.log('\u7ED3\u7B97\u6570\u636E\uFF1A', this.dto);
                                 // cc结算调用
                                 IPMSG = {};
 
@@ -1444,49 +1423,79 @@ var SettlementStore = (_class = function () {
                                 _context5.t1 = this.dto.IdbusiType == 37;
 
                                 if (!_context5.t1) {
-                                    _context5.next = 13;
+                                    _context5.next = 11;
                                     break;
                                 }
 
-                                _context5.next = 12;
+                                _context5.next = 10;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
-                            case 12:
+                            case 10:
                                 _context5.t1 = _context5.sent;
 
-                            case 13:
+                            case 11:
                                 _context5.t0 = _context5.t1;
 
                                 if (_context5.t0) {
-                                    _context5.next = 16;
+                                    _context5.next = 14;
                                     break;
                                 }
 
                                 _context5.t0 = this.dto.IdbusiType != 37;
 
-                            case 16:
+                            case 14:
                                 if (!_context5.t0) {
-                                    _context5.next = 18;
+                                    _context5.next = 33;
                                     break;
                                 }
 
-                                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;
-                                }));
+                                dtoParams = (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } });
+                                //处理存在二开支付情况
 
-                            case 18:
-                                _context5.next = 21;
+                                payList = dtoParams.RetailPaymentDetails.filter(function (v) {
+                                    return v.ThirdPaymentInfo;
+                                });
+
+                                if (!(payList && payList.length > 0)) {
+                                    _context5.next = 30;
+                                    break;
+                                }
+
+                                amount = payList[0].Amount;
+                                tradeType = amount > 0 ? TradeType.PAY : TradeType.REFUND;
+                                _context5.next = 22;
+                                return this.thirdPay(tradeType, dtoParams);
+
+                            case 22:
+                                ret = _context5.sent;
+                                _ref13 = ret || {}, type = _ref13.type, data = _ref13.data, msg = _ref13.msg, code = _ref13.code;
+
+                                if (!(type === true)) {
+                                    _context5.next = 28;
+                                    break;
+                                }
+
+                                dtoParams = data;
+                                _context5.next = 30;
                                 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 28:
+                                _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
+                                return _context5.abrupt('return', false);
+
+                            case 30:
+                                this.dtoParams = dtoParams;
+                                console.log('结算信息:', dtoParams);
+                                return _context5.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
+                                    var _ref14 = resp || {},
+                                        ID = _ref14.ID;
+
+                                    _this12.setDtoID(ID);
+                                    _this12.billID = ID;
+                                    _this12.paymode.checkList = [];
                                 }));
 
-                            case 21:
+                            case 33:
                             case 'end':
                                 return _context5.stop();
                         }
@@ -1495,16 +1504,162 @@ var SettlementStore = (_class = function () {
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref12.apply(this, arguments);
             }
 
             return save;
         }()
+
+        //裁剪二开支付数据
+
     }, {
-        key: 'setVoucherDate',
-        value: function setVoucherDate() {
-            this.dto.VoucherDate = new Date();
+        key: 'removeThirdPayDto',
+        value: function removeThirdPayDto(dto) {
+            var data = (0, _extends3.default)({}, dto);
+            delete data['DynamicPropertyKeys'];
+            delete data['DynamicPropertyValues'];
+            return data;
         }
+
+        //二开支付
+
+    }, {
+        key: 'thirdPay',
+        value: function () {
+            var _ref15 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(status, dto) {
+                var cto, params, ret, _ref16, Code, Message, Result, _ref17, ThirdPaymentReturnInfo;
+
+                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                    while (1) {
+                        switch (_context6.prev = _context6.next) {
+                            case 0:
+                                cto = this.removeThirdPayDto(dto);
+                                params = { TradeType: status, dto: cto };
+
+                                console.log('刷卡信息:', (0, _stringify2.default)(params));
+                                _context6.next = 5;
+                                return new _promise2.default(function (resolve, reject) {
+                                    _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
+                                        return resolve(res);
+                                    });
+                                });
+
+                            case 5:
+                                ret = _context6.sent;
+
+                                console.log('刷卡返回信息:', ret);
+                                ret = JSON.parse(ret);
+                                _ref16 = ret || {}, Code = _ref16.Code, Message = _ref16.Message, Result = _ref16.Result;
+
+                                if (!(Code > 0)) {
+                                    _context6.next = 13;
+                                    break;
+                                }
+
+                                return _context6.abrupt('return', { type: false, data: null, msg: Message, code: Code });
+
+                            case 13:
+                                if (!(status == '00')) {
+                                    _context6.next = 19;
+                                    break;
+                                }
+
+                                _ref17 = Result || {}, ThirdPaymentReturnInfo = _ref17.ThirdPaymentReturnInfo;
+
+                                dto.RetailPaymentDetails.forEach(function (v) {
+                                    if (v.ThirdPaymentInfo != null) {
+                                        v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
+                                    }
+                                });
+                                return _context6.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+
+                            case 19:
+                                if (!(status == '02')) {
+                                    _context6.next = 21;
+                                    break;
+                                }
+
+                                return _context6.abrupt('return', { type: true, data: dto, msg: Message, code: Code });
+
+                            case 21:
+                            case 'end':
+                                return _context6.stop();
+                        }
+                    }
+                }, _callee6, this);
+            }));
+
+            function thirdPay(_x4, _x5) {
+                return _ref15.apply(this, arguments);
+            }
+
+            return thirdPay;
+        }()
+
+        //二开支付强制退款情况
+
+    }, {
+        key: 'thirdPayRefund',
+        value: function () {
+            var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                var _this13 = this;
+
+                var dto, pay, _enumController$getEn17, TradeType;
+
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
+                    while (1) {
+                        switch (_context8.prev = _context8.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$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
+
+                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
+                                        var ret, _ref20, msg;
+
+                                        return _regenerator2.default.wrap(function _callee7$(_context7) {
+                                            while (1) {
+                                                switch (_context7.prev = _context7.next) {
+                                                    case 0:
+                                                        _context7.next = 2;
+                                                        return _this13.thirdPay(TradeType.REFUND, dto);
+
+                                                    case 2:
+                                                        ret = _context7.sent;
+                                                        _ref20 = ret || {}, msg = _ref20.msg;
+
+                                                        console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
+
+                                                    case 5:
+                                                    case 'end':
+                                                        return _context7.stop();
+                                                }
+                                            }
+                                        }, _callee7, _this13);
+                                    })), 4500);
+                                }
+
+                            case 3:
+                            case 'end':
+                                return _context8.stop();
+                        }
+                    }
+                }, _callee8, this);
+            }));
+
+            function thirdPayRefund() {
+                return _ref18.apply(this, arguments);
+            }
+
+            return thirdPayRefund;
+        }()
     }, {
         key: 'setDtoID',
         value: function setDtoID(id) {
@@ -1513,35 +1668,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+            var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context9.prev = _context9.next) {
                             case 0:
-                                _context6.prev = 0;
-                                _context6.t0 = _promise2.default;
-                                _context6.next = 4;
+                                _context9.prev = 0;
+                                _context9.t0 = _promise2.default;
+                                _context9.next = 4;
                                 return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
 
                             case 4:
-                                _context6.t1 = _context6.sent;
-                                return _context6.abrupt('return', _context6.t0.resolve.call(_context6.t0, _context6.t1));
+                                _context9.t1 = _context9.sent;
+                                return _context9.abrupt('return', _context9.t0.resolve.call(_context9.t0, _context9.t1));
 
                             case 8:
-                                _context6.prev = 8;
-                                _context6.t2 = _context6['catch'](0);
-                                return _context6.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context9.prev = 8;
+                                _context9.t2 = _context9['catch'](0);
+                                return _context9.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context6.stop();
+                                return _context9.stop();
                         }
                     }
-                }, _callee6, this, [[0, 8]]);
+                }, _callee9, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref16.apply(this, arguments);
+                return _ref21.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1567,18 +1722,18 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            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;
+            var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(value) {
+                var _ref23, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                     while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context10.prev = _context10.next) {
                             case 0:
-                                _ref18 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref18.isNewRetailBCPos;
-                                _context7.prev = 1;
+                                _ref23 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref23.isNewRetailBCPos;
+                                _context10.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context7.next = 33;
+                                    _context10.next = 33;
                                     break;
                                 }
 
@@ -1588,60 +1743,60 @@ var SettlementStore = (_class = function () {
                                 memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context7.next = 12;
+                                    _context10.next = 12;
                                     break;
                                 }
 
                                 if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context7.next = 12;
+                                    _context10.next = 12;
                                     break;
                                 }
 
                                 if (!(cook2[memberStorageId] > 3)) {
-                                    _context7.next = 12;
+                                    _context10.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context7.abrupt('return', _promise2.default.resolve(message));
+                                return _context10.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')) {
-                                    _context7.next = 20;
+                                    _context10.next = 20;
                                     break;
                                 }
 
-                                _context7.next = 17;
+                                _context10.next = 17;
                                 return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
 
                             case 17:
-                                result = _context7.sent;
-                                _context7.next = 29;
+                                result = _context10.sent;
+                                _context10.next = 29;
                                 break;
 
                             case 20:
                                 if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
-                                    _context7.next = 26;
+                                    _context10.next = 26;
                                     break;
                                 }
 
-                                _context7.next = 23;
+                                _context10.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 = _context7.sent;
-                                _context7.next = 29;
+                                result = _context10.sent;
+                                _context10.next = 29;
                                 break;
 
                             case 26:
-                                _context7.next = 28;
+                                _context10.next = 28;
                                 return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
 
                             case 28:
-                                result = _context7.sent;
+                                result = _context10.sent;
 
                             case 29:
                                 if (!result.data) {
@@ -1660,38 +1815,38 @@ var SettlementStore = (_class = function () {
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context7.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context10.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
                             case 33:
-                                _context7.next = 35;
+                                _context10.next = 35;
                                 return (0, _tplusApi.tApi)({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
                                     } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
 
                             case 35:
-                                _result = _context7.sent;
-                                return _context7.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                                _result = _context10.sent;
+                                return _context10.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
                             case 37:
-                                _context7.next = 42;
+                                _context10.next = 42;
                                 break;
 
                             case 39:
-                                _context7.prev = 39;
-                                _context7.t0 = _context7['catch'](1);
-                                return _context7.abrupt('return', "failed");
+                                _context10.prev = 39;
+                                _context10.t0 = _context10['catch'](1);
+                                return _context10.abrupt('return', "failed");
 
                             case 42:
                             case 'end':
-                                return _context7.stop();
+                                return _context10.stop();
                         }
                     }
-                }, _callee7, this, [[1, 39]]);
+                }, _callee10, this, [[1, 39]]);
             }));
 
-            function validePwd(_x4) {
-                return _ref17.apply(this, arguments);
+            function validePwd(_x6) {
+                return _ref22.apply(this, arguments);
             }
 
             return validePwd;
@@ -1701,7 +1856,7 @@ var SettlementStore = (_class = function () {
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this13 = this;
+        var _this14 = this;
 
         return function (newPass, newPassConfirm) {
             if (!newPass || !newPassConfirm) {
@@ -1713,7 +1868,7 @@ var SettlementStore = (_class = function () {
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
             return (0, _tplusApi.ccApi)({
                 Idstore: idstore,
-                meMemberId: _this13.paymode.currentMode.memberId,
+                meMemberId: _this14.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
@@ -1727,134 +1882,143 @@ var SettlementStore = (_class = 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), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this14 = this;
+        var _this15 = this;
 
         return function () {
-            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(_this) {
+            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(_this) {
                 var _getLoginInfo, IdStore, StoreCode, resp;
 
-                return _regenerator2.default.wrap(function _callee8$(_context8) {
+                return _regenerator2.default.wrap(function _callee11$(_context11) {
                     while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context11.prev = _context11.next) {
                             case 0:
-                                _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
-                                _context8.next = 3;
-                                return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
+                                _getLoginInfo = _this15.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
+                                _context11.next = 3;
+                                return (0, _tplusApi.tApi)({ Idmember: _this15.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
 
                             case 3:
-                                resp = _context8.sent;
+                                resp = _context11.sent;
 
                                 _this.member = resp;
                                 _this.paymode.updateMemberStorageCardNo(resp.StorageCardNo, resp.WalletEnabled);
-                                return _context8.abrupt('return', _promise2.default.resolve(resp));
+                                return _context11.abrupt('return', _promise2.default.resolve(resp));
 
                             case 7:
                             case 'end':
-                                return _context8.stop();
+                                return _context11.stop();
                         }
                     }
-                }, _callee8, _this14);
+                }, _callee11, _this15);
             }));
 
-            return function (_x5) {
-                return _ref19.apply(this, arguments);
+            return function (_x7) {
+                return _ref24.apply(this, arguments);
             };
         }();
     }
 }), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'updateCurrentMode', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this15 = this;
+        var _this16 = this;
 
         return function () {
-            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(memberId) {
+            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(memberId) {
                 var result;
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+                return _regenerator2.default.wrap(function _callee12$(_context12) {
                     while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context12.prev = _context12.next) {
                             case 0:
-                                _context9.next = 2;
+                                _context12.next = 2;
                                 return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
 
                             case 2:
-                                result = _context9.sent;
+                                result = _context12.sent;
 
                                 if (!(result && result.data.length)) {
-                                    _context9.next = 20;
+                                    _context12.next = 20;
                                     break;
                                 }
 
                                 if (!(result.data.length === 1)) {
-                                    _context9.next = 9;
+                                    _context12.next = 9;
                                     break;
                                 }
 
-                                _this15.paymode.updateCardInfo(result.data[0]);
-                                return _context9.abrupt('return', result.data);
+                                _this16.paymode.updateCardInfo(result.data[0]);
+                                return _context12.abrupt('return', result.data);
 
                             case 9:
                                 if (!(result.data && result.data.length === 1)) {
-                                    _context9.next = 14;
+                                    _context12.next = 14;
                                     break;
                                 }
 
-                                _this15.paymode.updateCardInfo(result.data[0]);
-                                return _context9.abrupt('return', result.data);
+                                _this16.paymode.updateCardInfo(result.data[0]);
+                                return _context12.abrupt('return', result.data);
 
                             case 14:
                                 if (!(result.data && result.data.length > 1)) {
-                                    _context9.next = 18;
+                                    _context12.next = 18;
                                     break;
                                 }
 
-                                return _context9.abrupt('return', result.data);
+                                return _context12.abrupt('return', result.data);
 
                             case 18:
                                 _message2.default.warn('没有可用储值卡！');
-                                return _context9.abrupt('return', false);
+                                return _context12.abrupt('return', false);
 
                             case 20:
                             case 'end':
-                                return _context9.stop();
+                                return _context12.stop();
                         }
                     }
-                }, _callee9, _this15);
+                }, _callee12, _this16);
             }));
 
-            return function (_x6) {
-                return _ref20.apply(this, arguments);
+            return function (_x8) {
+                return _ref25.apply(this, arguments);
             };
         }();
     }
 }), _descriptor4 = _applyDecoratedDescriptor(_class.prototype, 'updateCardInfo', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this16 = this;
+        var _this17 = this;
 
-        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
+        return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13() {
             var address, result;
-            return _regenerator2.default.wrap(function _callee10$(_context10) {
+            return _regenerator2.default.wrap(function _callee13$(_context13) {
                 while (1) {
-                    switch (_context10.prev = _context10.next) {
+                    switch (_context13.prev = _context13.next) {
                         case 0:
-                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this16.paymode.currentMode.storageCardNo;
-                            _context10.next = 3;
+                            address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this17.paymode.currentMode.storageCardNo;
+                            _context13.next = 3;
                             return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
 
                         case 3:
-                            result = _context10.sent;
+                            result = _context13.sent;
 
-                            _this16.paymode.updateCardInfo(result.data);
+                            _this17.paymode.updateCardInfo(result.data);
 
                         case 5:
                         case 'end':
-                            return _context10.stop();
+                            return _context13.stop();
                     }
                 }
-            }, _callee10, _this16);
+            }, _callee13, _this17);
         }));
     }
-}), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _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);
+}), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _descriptor5 = _applyDecoratedDescriptor(_class.prototype, 'setVoucherDate', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this18 = this;
+
+        return function () {
+            _this18.dto.VoucherDate = new Date();
+        };
+    }
+}), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
 exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
     //应收
@@ -1868,19 +2032,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
         this.onlineamount = 0;
         this.maxamount = 0;
 
-        _initDefineProp(this, 'currentFocus', _descriptor5, this);
+        _initDefineProp(this, 'currentFocus', _descriptor6, this);
 
-        _initDefineProp(this, 'received', _descriptor6, this);
+        _initDefineProp(this, 'received', _descriptor7, this);
 
-        _initDefineProp(this, 'receivable', _descriptor7, this);
+        _initDefineProp(this, 'receivable', _descriptor8, this);
 
-        _initDefineProp(this, 'paymodes', _descriptor8, this);
+        _initDefineProp(this, 'paymodes', _descriptor9, this);
 
-        _initDefineProp(this, 'thePaymodes', _descriptor9, this);
+        _initDefineProp(this, 'thePaymodes', _descriptor10, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor10, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor11, this);
 
-        _initDefineProp(this, 'balance', _descriptor11, this);
+        _initDefineProp(this, 'balance', _descriptor12, this);
 
         this.currentMode = null;
         this.checkList = [];
@@ -1889,11 +2053,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
             hotKey: "Ctrl+M"
         };
 
-        _initDefineProp(this, 'calcCheckList', _descriptor12, this);
+        _initDefineProp(this, 'calcCheckList', _descriptor13, this);
 
-        _initDefineProp(this, 'setCouponNum', _descriptor13, this);
+        _initDefineProp(this, 'setCouponNum', _descriptor14, this);
 
-        _initDefineProp(this, 'addDjqs', _descriptor14, this);
+        _initDefineProp(this, 'addDjqs', _descriptor15, this);
     }
     // @observable store = null;
 
@@ -1952,7 +2116,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqCheckValue',
         value: function calcDjqCheckValue(q1, dto, params) {
-            var _this17 = this;
+            var _this19 = this;
 
             var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
             var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1966,12 +2130,12 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 this.checkList = [];
             }
 
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref27 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref27.isNewRetailBCPos;
 
-            var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn17.PayStyle,
-                Differentiate = _enumController$getEn17.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) {
@@ -1999,7 +2163,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        _this17.checkList.splice(i, 1);
+                        _this19.checkList.splice(i, 1);
                     }
                 });
             } else {
@@ -2071,24 +2235,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
-                        _this17.currentMode.djqs.forEach(function (djq) {
+                        _this19.currentMode.djqs.forEach(function (djq) {
                             if (element.id === djq.id) {
                                 djq1 = true;
                             }
                         });
 
-                        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 _ref28 = element || {},
+                            couponCode = _ref28.couponCode,
+                            name = _ref28.name,
+                            tieredAmountResult = _ref28.tieredAmountResult,
+                            fromDate = _ref28.fromDate,
+                            dateMount = _ref28.dateMount,
+                            promoMethodEnum = _ref28.promoMethodEnum,
+                            discountPct = _ref28.discountPct,
+                            nominalAmount = _ref28.nominalAmount,
+                            promoId = _ref28.promoId,
+                            id = _ref28.id,
+                            doorsill = _ref28.doorsill;
 
                         var condValue = tieredAmountResult.condValue,
                             promoDiscount = tieredAmountResult.promoDiscount,
@@ -2116,10 +2280,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
                             //     id
                             // })
-                            _this17.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            _this19.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
                             djq1 = false;
                         } else {
-                            _this17.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
+                            _this19.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -2132,11 +2296,11 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'calcDjqValue',
         value: function calcDjqValue(q1) {
-            var _ref24 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref24.isNewRetailBCPos;
+            var _ref29 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref29.isNewRetailBCPos;
 
-            var _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(),
-                Differentiate = _enumController$getEn18.Differentiate;
+            var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn19.Differentiate;
 
             if (q1) {
                 if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -2198,8 +2362,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.currentMode.errinfo = '';
             var sum = this.amount;
 
-            var _enumController$getEn19 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn19.PayStyle;
+            var _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn20.PayStyle;
 
             this.thePaymodes && this.thePaymodes.forEach(function (mode) {
                 if (mode.paymentType === PayStyle.hyczk) {
@@ -2223,30 +2387,29 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(type, isIntegralExchange) {
-                var _this18 = this;
+            var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14(type, isIntegralExchange) {
+                var _this20 = this;
 
-                var _enumController$getEn20, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
-                return _regenerator2.default.wrap(function _callee11$(_context11) {
+                return _regenerator2.default.wrap(function _callee14$(_context14) {
                     while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context14.prev = _context14.next) {
                             case 0:
-                                _enumController$getEn20 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn20.settleStyleType, PayStyle = _enumController$getEn20.PayStyle;
+                                _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 };
-                                _context11.next = 5;
+                                _context14.next = 5;
                                 return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
 
                             case 5:
-                                modes = _context11.sent;
+                                modes = _context14.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 = '储值卡';
                                             }
@@ -2261,24 +2424,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"
+                                                calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88",
+                                                thridPayment: mode.ThirdPaymentInfo
                                             });
                                         });
-                                        _this18.paymodes = paymodes;
-                                        //modes.QuickSettleStyles
+                                        _this20.paymodes = paymodes;
                                     });
                                 }
 
                             case 7:
                             case 'end':
-                                return _context11.stop();
+                                return _context14.stop();
                         }
                     }
-                }, _callee11, this);
+                }, _callee14, this);
             }));
 
-            function setPaymodes(_x7, _x8) {
-                return _ref25.apply(this, arguments);
+            function setPaymodes(_x9, _x10) {
+                return _ref30.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -2295,57 +2458,57 @@ var PayMode = exports.PayMode = (_class3 = function () {
         }
     }]);
     return PayMode;
-}(), (_descriptor5 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
+}(), (_descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'currentFocus', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return "";
     }
-}), _descriptor6 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'received', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor7 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'receivable', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return 0;
     }
-}), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'paymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'thePaymodes', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return [];
     }
-}), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return null;
     }
-}), _descriptor11 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return null;
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor12 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this19 = this;
+        var _this21 = this;
 
         return function () {
-            _this19.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), _descriptor13 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+}), _applyDecoratedDescriptor(_class3.prototype, 'updateMemberStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateMemberStorageCardNo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updateCardInfo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'updateCardInfo'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this20 = this;
+        var _this22 = this;
 
         return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
-            _this20.currentMode.djqs.forEach(function (ele) {
+            _this22.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
                     promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
@@ -2355,10 +2518,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             });
         };
     }
-}), _descriptor14 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
     enumerable: true,
     initializer: function initializer() {
-        var _this21 = this;
+        var _this23 = this;
 
         return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
             var djq = {
@@ -2380,25 +2543,25 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 couponCategoryEnum: couponCategoryEnum,
                 id: id
             };
-            _this21.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 _this22 = this;
+        var _this24 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor15, this);
+        _initDefineProp(this, 'cardNo', _descriptor16, this);
 
-        _initDefineProp(this, 'balance', _descriptor16, this);
+        _initDefineProp(this, 'balance', _descriptor17, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor17, this);
+        _initDefineProp(this, 'exchangable', _descriptor18, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor18, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor19, this);
 
-        _initDefineProp(this, 'storageCardNo', _descriptor19, this);
+        _initDefineProp(this, 'storageCardNo', _descriptor20, this);
 
         if (m) {
             this.id = m.ID;
@@ -2409,15 +2572,15 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref26 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref26.isNewRetailBCPos;
+            var _ref31 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref31.isNewRetailBCPos;
 
             (0, _mobx.runInAction)(function () {
-                _this22.cardNo = m.CardCode;
+                _this24.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this22.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this24.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this22.balance = _this22.rawbalance;
+                    _this24.balance = _this24.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -2439,19 +2602,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor15 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor17 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor18 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor19 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
+}), _descriptor20 = _applyDecoratedDescriptor(_class5.prototype, 'storageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype)), _class5);