tplus-components-touch 3.49.2 → 3.51.2

package/dist/components/settlement/settlementStore.js

@@ -45,7 +45,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _desc2, _value2, _class3, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _desc3, _value3, _class5, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21;
+var _desc, _value, _class, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _class2, _temp, _initialiseProps, _desc2, _value2, _class3, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _desc3, _value3, _class5, _descriptor17, _descriptor18, _descriptor19, _descriptor20, _descriptor21;
 
 var _mobx = require('mobx');
 
@@ -117,6 +117,10 @@ var _reduce2 = require('lodash/reduce');
 
 var _reduce3 = _interopRequireDefault(_reduce2);
 
+var _settlementApi = require('./settlementApi');
+
+var _settlementApi2 = _interopRequireDefault(_settlementApi);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _initDefineProp(target, property, descriptor, context) {
@@ -164,350 +168,18 @@ function _initializerWarningHelper(descriptor, context) {
 
 var t = _mutantsMicrofx.i18n.getFixedT(null, 'newretail');
 
-var SettlementStore = (_class = function () {
+var SettlementStore = (_class = (_temp = _class2 = function () {
     // 预售都是全款；预订是否全款，在点击确认支付时计算订金和商品金额计算得出
     function SettlementStore() {
-        var _this2 = this;
-
         (0, _classCallCheck3.default)(this, SettlementStore);
-        this.paymode = null;
-        this.dto = null;
-        this.dtoParams = null;
-        this.member = null;
-        this.brefund = false;
-        this.bquick = false;
-        this.boriginReturn = false;
-
-        _initDefineProp(this, 'newStyle', _descriptor, this);
-
-        this.isFull = true;
-
-        _initDefineProp(this, 'setNewStyle', _descriptor2, this);
-
-        _initDefineProp(this, 'queryPwd', _descriptor3, this);
-
-        _initDefineProp(this, 'updateMemberInfo', _descriptor4, this);
-
-        _initDefineProp(this, 'updateCurrentMode', _descriptor5, this);
-
-        _initDefineProp(this, 'updateCardInfo', _descriptor6, this);
-
-        this.handleCzkData = function (m) {
-            if (!m || !m.StorageCardNo) {
-                (0, _mobx.runInAction)(function () {
-                    _this2.paymode.currentMode.errinfo = "无效的会员卡号";
-                });
-            } else {
-                (0, _mobx.runInAction)(function () {
-                    _this2.paymode.currentMode.errinfo = "";
-                    _this2.paymode.currentMode.memberId = m.ID;
-                    _this2.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this2.brefund ? _this2.paymode.receivable : Math.max(_this2.paymode.receivable, 0));
-                    _this2.updateEvent();
-                    var message = '';
-                    var sum = (0, _reduce3.default)(_this2.paymode.thePaymodes, function (total, cur) {
-                        return total + cur.value;
-                    }, 0);
-                    // 对于卡不用判断会员的一些信息
-                    // if (global.CheckMemberStorageProcessorBlock ) {
-                    //     message= CheckMemberStorageProcessorBlock.execute(m);
-                    // }
-                    if (!String.isNullOrEmpty(message)) {
-                        _this2.paymode.currentMode.errinfo = message;
-                    } else if (_this2.checkReceived(_this2.paymode.currentMode, "balance")) {
-                        _this2.paymode.currentMode.errinfo = "余额不足";
-                    } else if (_this2.paymode.amount > 0 && parseFloat(_this2.paymode.amount) !== sum && _this2.paymode.currentMode.value == 0) {
-                        _this2.paymode.currentMode.errinfo = "实收金额必须录入";
-                    } else {
-                        // 查询成功后将焦点移入下一个输入框
-                        setTimeout(function () {
-                            var nextInput = document.querySelector('.czk .received .input');
-                            nextInput && nextInput.select();
-                        }, 300);
-                    }
-                });
-            }
-        };
-
-        this.getCouponList = function (coupon_code) {
-            var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn.PayStyle,
-                Differentiate = _enumController$getEn.Differentiate;
-
-            var couponApplyRule = (0, _tplusPoslogin.PosInitData)('CouponApplyRule');
-
-            var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
-                CouponApplyRule = _enumController$getEn2.CouponApplyRule;
-
-            if (couponApplyRule == CouponApplyRule.SHOWN_BY_CUSTOMER && !!coupon_code || couponApplyRule != CouponApplyRule.SHOWN_BY_CUSTOMER) {
-                var dto = _this2.dto;
-                var promoVoucher = {};
-                _this2.paymode.clearDjqs();
-                _this2.paymode.reCalculationDjqs();
-                promoVoucher.coupon_code = coupon_code || "";
-                promoVoucher.boName = "Retail";
-                promoVoucher.voucherId = dto.ID;
-                var onlinePaymentAmount = 0;
-                if (dto.OnlinePaymentAmount) {
-                    onlinePaymentAmount = dto.OnlinePaymentAmount;
-                }
-                promoVoucher.promoLinks = (0, _filter3.default)(_this2.paymode.currentMode.djqs, function (djq) {
-                    return djq.checked;
-                });
-                promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
-                promoVoucher.redBlueFlagEnum = "BLUE";
-                promoVoucher.meMemberId = dto.Idmember;
-                promoVoucher.storeFactorId = dto.Idstore;
-                promoVoucher.voucherDetailList = [];
-                dto.RetailDetails.forEach(function (item) {
-                    var detailDTO = {};
-                    detailDTO.uuid = item.Code;
-                    detailDTO.detailBoName = "RetailDetail";
-                    detailDTO.voucherDetailId = item.ID;
-                    detailDTO.productId = item.Idinventory;
-                    detailDTO.uomId = item.Idunit;
-                    detailDTO.productSpecId = item.ProductSpecId;
-                    detailDTO.isManualFreeGift = item.IsPresent;
-                    detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
-                    detailDTO.IsManualChangePrice = item.IsManualChangePrice;
-                    // if(detailDTO.IsManualChangePrice)//如果是手工改价
-                    // {
-                    //     detailDTO.listPrice = item.TaxPrice;
-                    //     detailDTO.netAmountWithTax = item.TaxAmount;
-                    // }
-                    // else
-                    // {
-                    var bookingQuantity = 0;
-                    if (item.BookingQuantity) {
-                        bookingQuantity = item.BookingQuantity;
-                    }
-                    detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
-                    detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
-                    //}
-                    detailDTO.taxRate = item.TaxRate;
-                    detailDTO.quantity = item.Quantity;
-
-                    detailDTO.amountWithTax = item.RetailAmount;
-                    // 促销 start
-                    if (item.PromotionDetails && item.PromotionDetails.length != 0) {
-                        var promoLinks = [];
-                        item.PromotionDetails.forEach(function (promotion) {
-                            promoLinks.push({
-                                promoId: promotion.IdSalesPromotionDTO,
-                                promoRuleId: promotion.PromotionRuleId
-                            });
-                        });
-                        if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
-                    }
-                    // 促销 end
-                    promoVoucher.voucherDetailList.push(detailDTO);
-                });
-
-                return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
-                    if (result && result.length != 0) {
-                        result.forEach(function (element) {
-                            var _ref = element || {},
-                                couponCode = _ref.couponCode,
-                                name = _ref.name,
-                                tieredAmountResult = _ref.tieredAmountResult,
-                                fromDate = _ref.fromDate,
-                                dateMount = _ref.dateMount,
-                                promoMethodEnum = _ref.promoMethodEnum,
-                                discountPct = _ref.discountPct,
-                                nominalAmount = _ref.nominalAmount,
-                                promoId = _ref.promoId,
-                                id = _ref.id;
-
-                            var condValue = tieredAmountResult.condValue,
-                                promoDiscount = tieredAmountResult.promoDiscount,
-                                displayText = tieredAmountResult.displayText,
-                                promoRuleId = tieredAmountResult.promoRuleId,
-                                couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
-
-                            if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
-                                return themode.paymentType == PayStyle.jfdx;
-                            })) {
-                                _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
-                            } else {
-                                var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
-                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" && nominalAmount, promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
-                            }
-                        });
-                        if (promoVoucher.coupon_code) {
-                            _this2.paymode.calcDjqCheckValue(_this2.paymode.currentMode.djqs[0], _this2.dto, 'single');
-                        }
-                    } else {
-                        if (promoVoucher.coupon_code) {
-                            _message2.default.info(Differentiate.COUPON + '\u53F7\u4E0D\u5B58\u5728\uFF01');
-                            _this2.getCouponList();
-                        } else {
-                            _message2.default.info('\u6CA1\u6709\u627E\u5230\u53EF\u4F7F\u7528\u7684' + Differentiate.COUPON + '\uFF01');
-                        }
-                    }
-                });
-            }
-        };
 
-        this.getSettleGift = function () {
-            return (0, _tplusApi.ccApi)({}, '/marketingtool/paygift/executeRightsForPos/' + _this2.billID, false, false, { method: 'get', timeout_skip: true });
-        };
-
-        this.getRefWareHouseList = function () {
-            return (0, _tplusApi.ccApi)({}, '/retail/RetailPos/getRefWareHouseList', false, false);
-        };
-
-        this.checkCoupon = function () {
-            var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(sn) {
-                var _ref3, isNewRetailBCPos, _enumController$getEn3, PayStyle, Differentiate;
-
-                return _regenerator2.default.wrap(function _callee$(_context) {
-                    while (1) {
-                        switch (_context.prev = _context.next) {
-                            case 0:
-                                _ref3 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref3.isNewRetailBCPos;
-
-                                if (!isNewRetailBCPos) {
-                                    _context.next = 7;
-                                    break;
-                                }
-
-                                _context.next = 4;
-                                return _this2.getCouponList(sn, 'sinlge');
-
-                            case 4:
-                                return _context.abrupt('return', _context.sent);
-
-                            case 7:
-                                _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn3.PayStyle, Differentiate = _enumController$getEn3.Differentiate;
-                                return _context.abrupt('return', (0, _tplusApi.tApi)({ request: {
-                                        Uid: _this2.paymode.currentMode.member.uid || '',
-                                        SN: sn,
-                                        StoreCode: _this2.dto.Idstore,
-                                        Inventories: (0, _map3.default)((0, _filter3.default)(_this2.dto.RetailDetails, function (d) {
-                                            return d.Quantity > 0 && !d.IsPresent;
-                                        }), function (detail) {
-                                            return {
-                                                IdInventory: detail.Inventory.ID,
-                                                IdUnit: detail.Idunit,
-                                                Code: detail.Inventory.Code,
-                                                FreeItem0: JSON.getCellValue(detail, "freeitem0"),
-                                                FreeItem1: JSON.getCellValue(detail, "freeitem1"),
-                                                FreeItem2: JSON.getCellValue(detail, "freeitem2"),
-                                                FreeItem3: JSON.getCellValue(detail, "freeitem3"),
-                                                FreeItem4: JSON.getCellValue(detail, "freeitem4"),
-                                                FreeItem5: JSON.getCellValue(detail, "freeitem5"),
-                                                FreeItem6: JSON.getCellValue(detail, "freeitem6"),
-                                                FreeItem7: JSON.getCellValue(detail, "freeitem7"),
-                                                FreeItem8: JSON.getCellValue(detail, "freeitem8"),
-                                                FreeItem9: JSON.getCellValue(detail, "freeitem9")
-                                            };
-                                        }),
-                                        // inventoryCodes:_join(_map(this.dto.RetailDetails,(detail)=>{return detail.Inventory.Code;}),','),
-                                        InventoryClassCodes: (0, _join3.default)((0, _map3.default)((0, _filter3.default)(_this2.dto.RetailDetails, function (d) {
-                                            return d.Quantity > 0;
-                                        }), function (detail) {
-                                            return (detail.Inventory.InventoryClass || { Code: '' }).Code;
-                                        }), ','),
-                                        Amount: _this2.paymode.amount
-                                    } }, 'chanjet.AA.DR.coupon.CheckCoupon', false, false).then(function (result) {
-                                    if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
-                                        return djq.code == result.SN;
-                                    })) {
-                                        _message2.default.info(Differentiate.COUPON + '\u5DF2\u6DFB\u52A0');
-                                    } else if (result.IsRepelWithPoints && (0, _find3.default)(_this2.paymode.thePaymodes, function (themode) {
-                                        return themode.paymentType == PayStyle.jfdx;
-                                    })) {
-                                        _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
-                                    } else {
-                                        _this2.addDjq(result.SN, result.Title, result.ReduceAmount, result.StartAmount, result.LastTS, false, !result.IsRepelWithPoints, result.UMemberID);
-                                    }
-                                }));
-
-                            case 9:
-                            case 'end':
-                                return _context.stop();
-                        }
-                    }
-                }, _callee, _this2);
-            }));
-
-            return function (_x) {
-                return _ref2.apply(this, arguments);
-            };
-        }();
-
-        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 _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
-                            var ret;
-                            return _regenerator2.default.wrap(function _callee2$(_context2) {
-                                while (1) {
-                                    switch (_context2.prev = _context2.next) {
-                                        case 0:
-                                            _context2.next = 2;
-                                            return _this2.saveMember();
-
-                                        case 2:
-                                            ret = _context2.sent;
-
-                                            if (ret === false) {
-                                                resolve(false);
-                                            } else {
-                                                resolve(true);
-                                            }
-
-                                        case 4:
-                                        case 'end':
-                                            return _context2.stop();
-                                    }
-                                }
-                            }, _callee2, _this2);
-                        }));
-
-                        return function onOk() {
-                            return _ref4.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) {
-                    if (resp && resp.expireIntegral > 0) {
-                        _tplusComponentsTouch.ModalWraper.confirm({
-                            className: 'tplus-confirm-modal',
-                            title: "温馨提示",
-                            content: '\u5B58\u5728\u5DF2\u7ECF\u8FC7\u671F\u7684\u79EF\u5206' + resp.expireIntegral + '\u9000\u8D27\u540E\u79EF\u5206\u4E0D\u4F1A\u8FD4\u8FD8\u3002\u662F\u5426\u7EE7\u7EED\u9000\u8D27\uFF1F',
-                            cancelable: false,
-                            onOk: function onOk() {
-                                resolve(true);
-                            },
-                            onCancel: function onCancel() {
-                                reject(false);
-                            }
-                        });
-                    } else {
-                        resolve(true);
-                    }
-                });
-            });
-        };
+        _initialiseProps.call(this);
 
         this.paymode = new PayMode();
         var params = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('cloudPrintArguments');
         if (params) this.cloudPrintArguments = params;
         this.setNewStyle();
+        this.SettlementApi = _settlementApi2.default;
     } //type==2
 
 
@@ -521,7 +193,7 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'init',
         value: function init(context, amounthandler, datasource, storeinfo, bquick, amount, type, data, payModeKey) {
-            var _this3 = this;
+            var _this2 = this;
 
             this.setNewStyle();
             this.type = type;
@@ -534,17 +206,17 @@ var SettlementStore = (_class = function () {
                 (0, _mobx.runInAction)(function () {
                     // 单品金额抹零
                     if (global.DealSingleRowAmountSettingProcessorBlock) {
-                        global.DealSingleRowAmountSettingProcessorBlock.execute(_this3.dto);
+                        global.DealSingleRowAmountSettingProcessorBlock.execute(_this2.dto);
                     }
 
-                    var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
-                        PayStyle = _enumController$getEn4.PayStyle;
+                    var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
+                        PayStyle = _enumController$getEn.PayStyle;
 
                     var isQuickCash = bquick && payModeKey == PayStyle.xianjin;
 
                     // 成交金额抹零
                     if (global.DealAmountSettingProcessorBlock) {
-                        global.DealAmountSettingProcessorBlock.execute(_this3.dto, isQuickCash);
+                        global.DealAmountSettingProcessorBlock.execute(_this2.dto, isQuickCash);
                     }
                 });
                 // this.member=context.stores && context.stores.memberStore && context.stores.memberStore.member;
@@ -559,9 +231,9 @@ var SettlementStore = (_class = function () {
                     PreSellOrBook = _getLoginInfo.PreSellOrBook,
                     PercentageWhenBook = _getLoginInfo.PercentageWhenBook;
 
-                var _ref5 = this.dto || {},
-                    IdbusiType = _ref5.IdbusiType,
-                    DistributionMode = _ref5.DistributionMode;
+                var _ref = this.dto || {},
+                    IdbusiType = _ref.IdbusiType,
+                    DistributionMode = _ref.DistributionMode;
 
                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                     this.paymode.bookMaxValue = value;
@@ -571,7 +243,7 @@ var SettlementStore = (_class = function () {
                 }
                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK') {
                     (0, _mobx.runInAction)(function () {
-                        _this3.dto.PrepaidAmount = value;
+                        _this2.dto.PrepaidAmount = value;
                     });
                 }
                 //预订计算快递或同城配送运费
@@ -607,13 +279,13 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setModes',
         value: function setModes() {
-            var _this4 = this;
+            var _this3 = this;
 
             (0, _each3.default)(this.paymode.paymodes, function (p) {
-                if ((0, _findIndex3.default)(_this4.paymode.thePaymodes, function (mode) {
+                if ((0, _findIndex3.default)(_this3.paymode.thePaymodes, function (mode) {
                     return p.paymentType == mode.paymentType;
                 }) == -1) {
-                    _this4.addPay(p.paymentType);
+                    _this3.addPay(p.paymentType);
                 }
             });
             if (!this.boriginReturn && this.paymode.thePaymodes.length > 0) {
@@ -630,18 +302,18 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'initByOriginReturn',
         value: function initByOriginReturn() {
-            var _this5 = this;
+            var _this4 = this;
 
-            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn5.PayStyle;
+            var _enumController$getEn2 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn2.PayStyle;
 
-            var _ref6 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref6.isNewRetailBCPos;
+            var _ref2 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref2.isNewRetailBCPos;
 
             console.log(this.dto, 'dto==========');
             this.paymode.checkList = [];
             (0, _each3.default)(this.dto.RetailPaymentDetails, function (detail) {
-                var themode = (0, _find3.default)(_this5.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
+                var themode = (0, _find3.default)(_this4.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
                 if (detail.SettleStyle.Code === PayStyle.hyczk && !themode) {
                     _tplusComponentsTouch.ModalWraper.info({
                         title: '温馨提示',
@@ -651,33 +323,33 @@ var SettlementStore = (_class = function () {
                     });
                 }
                 if (themode && themode.paymentType && themode.paymentType != PayStyle.hyczk) {
-                    var newmode = (0, _extends3.default)({}, _this5.genNewMode(themode.paymentType, false, detail.Amount), {
+                    var newmode = (0, _extends3.default)({}, _this4.genNewMode(themode.paymentType, false, detail.Amount), {
                         authCode: detail.PaymentCode,
                         steadCashIntegral: detail.SteadCashIntegral,
                         overchargesAmount: detail.OverchargesAmount,
                         boriginReturn: true,
                         thirdPaymentReturnInfo: detail.ThirdPaymentReturnInfo
                     });
-                    _this5.paymode.currentMode = newmode;
+                    _this4.paymode.currentMode = newmode;
                     if (themode.paymentType == PayStyle.djq) {
-                        (0, _each3.default)(_this5.dto.RetailCouponDetails, function (djq) {
+                        (0, _each3.default)(_this4.dto.RetailCouponDetails, function (djq) {
                             if (isNewRetailBCPos) {
-                                var _ref7 = djq || {},
-                                    displayText = _ref7.displayText,
-                                    promoRuleId = _ref7.promoRuleId,
-                                    dateMount = _ref7.dateMount,
-                                    promoMethodEnum = _ref7.promoMethodEnum,
-                                    discountPct = _ref7.discountPct,
-                                    promoId = _ref7.promoId,
-                                    id = _ref7.id;
-
-                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
+                                var _ref3 = djq || {},
+                                    displayText = _ref3.displayText,
+                                    promoRuleId = _ref3.promoRuleId,
+                                    dateMount = _ref3.dateMount,
+                                    promoMethodEnum = _ref3.promoMethodEnum,
+                                    discountPct = _ref3.discountPct,
+                                    promoId = _ref3.promoId,
+                                    id = _ref3.id;
+
+                                _this4.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this4.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this4.addDjq(djq.CouponCode, djq.CouponTitle, true, null, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
-                    _this5.paymode.thePaymodes.push(newmode);
+                    _this4.paymode.thePaymodes.push(newmode);
                 }
             });
             (0, _each3.default)(this.dto.RetailStorageDetails, function (detail) {
@@ -691,7 +363,7 @@ var SettlementStore = (_class = function () {
                         meStorageCardId = detail.DynamicPropertyValues[index].MeStorageCardId;
                     }
                 });
-                var newmode = (0, _extends3.default)({}, _this5.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
+                var newmode = (0, _extends3.default)({}, _this4.genNewMode(PayStyle.hyczk, false, detail.StoragePaymentAmount), {
                     member: new Member(detail.Member ? detail.Member : null),
                     authCode: detail.Password ? detail.Password : null,
                     balance: balanceAmount,
@@ -699,7 +371,7 @@ var SettlementStore = (_class = function () {
                     meStorageCardId: meStorageCardId ? meStorageCardId : detail.MeStorageCardId,
                     storageCardNo: storageCardNo ? storageCardNo : detail.StorageCardNo
                 });
-                _this5.paymode.thePaymodes.push(newmode);
+                _this4.paymode.thePaymodes.push(newmode);
             });
             this.paymode.calcReserved();
         }
@@ -721,10 +393,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'changeFocusAndAddPay',
         value: function changeFocusAndAddPay(type, bookType) {
-            var _this6 = this;
+            var _this5 = this;
 
-            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn6.PayStyle;
+            var _enumController$getEn3 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn3.PayStyle;
 
             this.paymode.currentFocus = type;
             if (this.paymode.currentMode) {
@@ -740,16 +412,16 @@ var SettlementStore = (_class = function () {
                     }
 
                     //抵现积分
-                    (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
+                    this.SettlementApi.CalculdateIntegralSteadCash({ IntegralSteadCashParams: {
                             Idmember: this.paymode.currentMode.memberId,
                             TotalTaxAmount: this.paymode.amount,
                             BalanceTaxAmount: this.paymode.currentMode.value
-                        } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
+                        } }).then(function (result) {
                         // this.paymode.currentMode.steadCashIntegral=result.Integral;
                         // this.paymode.currentMode.perIntegral=result.perIntegral;
                         // this.paymode.currentMode.cashAmount=result.cashAmount;
-                        _this6.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
-                        _this6.paymode.currentMode.overchargesAmount = result.Amount - _this6.paymode.currentMode.value;
+                        _this5.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
+                        _this5.paymode.currentMode.overchargesAmount = result.Amount - _this5.paymode.currentMode.value;
                     });
                 } else {
                     this.addPayDirectly(this.paymode.currentMode);
@@ -772,52 +444,51 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'loadCzk',
         value: function loadCzk(v, returnType) {
-            var _this7 = this;
+            var _this6 = this;
 
             if ((0, _trim3.default)(v) === "") {
                 (0, _mobx.runInAction)(function () {
-                    _this7.paymode.currentMode.errinfo = "请输入储值卡";
+                    _this6.paymode.currentMode.errinfo = "请输入储值卡";
                 });
                 return;
             }
             var isOnlyEnabled = returnType ? false : true; //非原单退货为false，其他true
-            var address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + isOnlyEnabled;
-            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 _callee3(result) {
+            return this.SettlementApi.getCardInfoByCardNo(v, isOnlyEnabled).then(function () {
+                var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(result) {
                     var data, m;
-                    return _regenerator2.default.wrap(function _callee3$(_context3) {
+                    return _regenerator2.default.wrap(function _callee$(_context) {
                         while (1) {
-                            switch (_context3.prev = _context3.next) {
+                            switch (_context.prev = _context.next) {
                                 case 0:
                                     data = result.data;
                                     m = data && data.length && data[0];
 
                                     if (!(result && result.data.length)) {
-                                        _context3.next = 25;
+                                        _context.next = 25;
                                         break;
                                     }
 
                                     if (!(result.data.length === 1)) {
-                                        _context3.next = 14;
+                                        _context.next = 14;
                                         break;
                                     }
 
                                     if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
-                                        _context3.next = 10;
+                                        _context.next = 10;
                                         break;
                                     }
 
-                                    _this7.paymode.updateCardInfo(m);
-                                    _this7.handleCzkData(m);
-                                    return _context3.abrupt('return', result.data);
+                                    _this6.paymode.updateCardInfo(m);
+                                    _this6.handleCzkData(m);
+                                    return _context.abrupt('return', result.data);
 
                                 case 10:
-                                    _context3.next = 12;
-                                    return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
+                                    _context.next = 12;
+                                    return _this6.SettlementApi.validateRetailStorageCard({ dto: _this6.dto, meStorageCardId: m.MeStorageCardId }).then(function (result1) {
                                         var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
                                         if (data1.enable) {
-                                            _this7.paymode.updateCardInfo(m);
-                                            _this7.handleCzkData(m);
+                                            _this6.paymode.updateCardInfo(m);
+                                            _this6.handleCzkData(m);
                                             return result1.data;
                                         } else {
                                             _message2.default.warn(data1.disableReason);
@@ -825,40 +496,40 @@ var SettlementStore = (_class = function () {
                                     });
 
                                 case 12:
-                                    _context3.next = 25;
+                                    _context.next = 25;
                                     break;
 
                                 case 14:
                                     if (!(result.data && result.data.length === 1)) {
-                                        _context3.next = 19;
+                                        _context.next = 19;
                                         break;
                                     }
 
-                                    _this7.paymode.updateCardInfo(result.data[0]);
-                                    return _context3.abrupt('return', result.data);
+                                    _this6.paymode.updateCardInfo(result.data[0]);
+                                    return _context.abrupt('return', result.data);
 
                                 case 19:
                                     if (!(result.data && result.data.length > 1)) {
-                                        _context3.next = 23;
+                                        _context.next = 23;
                                         break;
                                     }
 
-                                    return _context3.abrupt('return', result.data);
+                                    return _context.abrupt('return', result.data);
 
                                 case 23:
                                     _message2.default.warn('没有可用储值卡！');
-                                    return _context3.abrupt('return', false);
+                                    return _context.abrupt('return', false);
 
                                 case 25:
                                 case 'end':
-                                    return _context3.stop();
+                                    return _context.stop();
                             }
                         }
-                    }, _callee3, _this7);
+                    }, _callee, _this6);
                 }));
 
-                return function (_x2) {
-                    return _ref8.apply(this, arguments);
+                return function (_x) {
+                    return _ref4.apply(this, arguments);
                 };
             }());
         }
@@ -894,8 +565,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setCurrentMode',
         value: function setCurrentMode(id, type, append) {
-            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn7.PayStyle;
+            var _enumController$getEn4 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn4.PayStyle;
 
             var mode = (0, _find3.default)(this.paymode.thePaymodes, { paymethodId: id });
             if (mode) {
@@ -911,10 +582,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'afterSetCurrentMode',
         value: function afterSetCurrentMode(type) {
-            var _this8 = this;
+            var _this7 = this;
 
-            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn8.PayStyle;
+            var _enumController$getEn5 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn5.PayStyle;
 
             if (type == PayStyle.djq) {
                 this.paymode.calcDjqValue();
@@ -946,19 +617,19 @@ var SettlementStore = (_class = function () {
                     value = this.paymode.amount;
                 }
 
-                (0, _tplusApi.tApi)({ IntegralSteadCashParams: {
+                this.SettlementApi.CalculdateIntegralSteadCash({ IntegralSteadCashParams: {
                         Idmember: this.paymode.currentMode.memberId,
                         TotalTaxAmount: value,
                         BalanceTaxAmount: value
-                    } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
-                    _this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
-                    _this8.paymode.currentMode.perIntegral = result.perIntegral;
-                    _this8.paymode.currentMode.cashAmount = result.cashAmount;
-                    _this8.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
-                    _this8.updateEvent();
-                    if (_this8.checkReceived(_this8.paymode.currentMode, "exchangable")) {
+                    } }).then(function (result) {
+                    _this7.paymode.currentMode.member.setExchangable(result.MaxAmount);
+                    _this7.paymode.currentMode.perIntegral = result.perIntegral;
+                    _this7.paymode.currentMode.cashAmount = result.cashAmount;
+                    _this7.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
+                    _this7.updateEvent();
+                    if (_this7.checkReceived(_this7.paymode.currentMode, "exchangable")) {
                         (0, _mobx.runInAction)(function () {
-                            _this8.paymode.currentMode.errinfo = '余额不足';
+                            _this7.paymode.currentMode.errinfo = '余额不足';
                         });
                     }
                 });
@@ -972,8 +643,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'genNewMode',
         value: function genNewMode(type, notwithm, v, isQuick) {
-            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn9.PayStyle;
+            var _enumController$getEn6 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn6.PayStyle;
 
             var value = (0, _utils.getFixedNumber)(v || (this.brefund ? this.paymode.receivable : Math.max(this.paymode.receivable, 0)));
             var themode = (0, _find3.default)(this.paymode.paymodes, { 'paymentType': type });
@@ -1019,10 +690,10 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'setMaxAmount',
         value: function setMaxAmount(type, mode) {
-            var _this9 = this;
+            var _this8 = this;
 
-            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn10.PayStyle;
+            var _enumController$getEn7 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn7.PayStyle;
 
             var sum = 0;
             if (type == PayStyle.hyczk) {
@@ -1043,16 +714,16 @@ var SettlementStore = (_class = function () {
                 (0, _mobx.runInAction)(function () {
 
                     //预售储值结算应包含运费
-                    var BuyerPayFreight = _this9.dto.BuyerPayFreight;
-                    var DistributionMode = _this9.dto.DistributionMode;
+                    var BuyerPayFreight = _this8.dto.BuyerPayFreight;
+                    var DistributionMode = _this8.dto.DistributionMode;
                     var value = 0;
                     if ((DistributionMode.Id == 'ELECTRONIC' || DistributionMode.Id == 'CITY_DISTRIBUTE') && BuyerPayFreight && BuyerPayFreight > 0 && type == PayStyle.hyczk) {
-                        value = (0, _utils.getFixedNumber)(parseFloat(_this9.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
+                        value = (0, _utils.getFixedNumber)(parseFloat(_this8.context.viewModel.getViewItem('Voucher').availableAmount) + parseFloat(BuyerPayFreight));
                     } else {
-                        value = _this9.context.viewModel.getViewItem('Voucher').availableAmount;
+                        value = _this8.context.viewModel.getViewItem('Voucher').availableAmount;
                     }
                     mode.maxamount = (0, _utils.getFixedNumber)(Math.Minus(value, sum));
-                    _this9.updateEvent();
+                    _this8.updateEvent();
                 });
             });
         }
@@ -1099,8 +770,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'addPayDirectly',
         value: function addPayDirectly(pay) {
-            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn11.PayStyle;
+            var _enumController$getEn8 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn8.PayStyle;
 
             if (!(0, _find3.default)(this.paymode.thePaymodes, { paymethodId: pay.paymethodId })) {
                 var pos = this.paymode.thePaymodes.length;
@@ -1118,8 +789,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'addPay',
         value: function addPay(type, bookType, isQuick) {
-            var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn12.PayStyle;
+            var _enumController$getEn9 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn9.PayStyle;
 
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
@@ -1134,8 +805,8 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'delPay',
         value: function delPay(index, bookType) {
-            var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn13.PayStyle;
+            var _enumController$getEn10 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn10.PayStyle;
 
             (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
                 return mode.paymethodId === index;
@@ -1149,26 +820,26 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'findStorageBillValidate',
         value: function findStorageBillValidate() {
-            var _this10 = this;
+            var _this9 = this;
 
-            var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
-                PayStyle = _enumController$getEn14.PayStyle;
+            var _enumController$getEn11 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn11.PayStyle;
 
             (0, _mobx.runInAction)(function () {
-                _this10.dto.StorageMutiSettleDetails = [];
-                var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
+                _this9.dto.StorageMutiSettleDetails = [];
+                var thePaymodes = _this9.newStyle ? (0, _filter3.default)(_this9.paymode.thePaymodes, function (mode) {
                     return parseFloat(mode.value) != 0;
-                }) : _this10.paymode.thePaymodes;
+                }) : _this9.paymode.thePaymodes;
                 (0, _each3.default)(thePaymodes, function (mode) {
-                    var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
+                    var themode = (0, _find3.default)(_this9.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 && _this9.paymode.receivable < 0 && value > Math.abs(_this9.paymode.receivable)) {
+                        value = Math.Add(value, _this9.paymode.receivable);
+                        giveChange = Math.abs(_this9.paymode.receivable);
                     }
-                    _this10.dto.StorageMutiSettleDetails.push({
+                    _this9.dto.StorageMutiSettleDetails.push({
                         Code: mode.paymethodId,
                         StorageAmount: value,
                         GiveChange: giveChange,
@@ -1177,11 +848,11 @@ var SettlementStore = (_class = function () {
                         PaymentCode: mode.authCode,
                         DynamicPropertyKeys: [],
                         DynamicPropertyValues: [],
-                        DataSource: { Id: _this10.dataSource }
+                        DataSource: { Id: _this9.dataSource }
                     });
                 });
             });
-            return (0, _tplusApi.ccApi)((0, _extends3.default)({}, this.dto), '/marketingtool/Storage/findStorageBillValidate', false, false);
+            return this.SettlementApi.findStorageBillValidate((0, _extends3.default)({}, this.dto));
         }
 
         //判断是否重复弹框
@@ -1189,136 +860,136 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'commit',
         value: function () {
-            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
-                var status, paylist, ret, _ref10, _ref10$data, code, returnMsg, state, ret1, ret2;
+            var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(bTest) {
+                var status, paylist, ret, _ref6, _ref6$data, code, returnMsg, state, ret1, ret2;
 
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee2$(_context2) {
                     while (1) {
-                        switch (_context4.prev = _context4.next) {
+                        switch (_context2.prev = _context2.next) {
                             case 0:
                                 console.log('settlementStore.commit开始，参数：' + bTest);
 
                                 if (!bTest) {
-                                    _context4.next = 3;
+                                    _context2.next = 3;
                                     break;
                                 }
 
-                                return _context4.abrupt('return', _promise2.default.resolve(true));
+                                return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 3:
                                 status = this.type;
-                                _context4.prev = 4;
+                                _context2.prev = 4;
                                 paylist = this.paymode.thePaymodes.filter(function (v) {
                                     return !!v.thridPayment && Math.abs(v.value) > 0;
                                 }) || [];
 
                                 if (!(paylist && paylist.length > 1)) {
-                                    _context4.next = 9;
+                                    _context2.next = 9;
                                     break;
                                 }
 
                                 _message2.default.warn('二开支付目前仅支持单一结算方式。');
-                                return _context4.abrupt('return', _promise2.default.resolve(false));
+                                return _context2.abrupt('return', _promise2.default.resolve(false));
 
                             case 9:
                                 if (!(status == 1)) {
-                                    _context4.next = 31;
+                                    _context2.next = 31;
                                     break;
                                 }
 
-                                _context4.next = 12;
+                                _context2.next = 12;
                                 return this.findStorageBillValidate();
 
                             case 12:
-                                ret = _context4.sent;
-                                _ref10 = ret || {}, _ref10$data = _ref10.data;
-                                _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
-                                code = _ref10$data.code, returnMsg = _ref10$data.returnMsg;
+                                ret = _context2.sent;
+                                _ref6 = ret || {}, _ref6$data = _ref6.data;
+                                _ref6$data = _ref6$data === undefined ? {} : _ref6$data;
+                                code = _ref6$data.code, returnMsg = _ref6$data.returnMsg;
 
                                 if (!(code && code == 10001)) {
-                                    _context4.next = 24;
+                                    _context2.next = 24;
                                     break;
                                 }
 
-                                _context4.next = 19;
+                                _context2.next = 19;
                                 return this.repeatStorageModal(returnMsg);
 
                             case 19:
-                                state = _context4.sent;
+                                state = _context2.sent;
 
                                 if (!(state === false)) {
-                                    _context4.next = 22;
+                                    _context2.next = 22;
                                     break;
                                 }
 
-                                return _context4.abrupt('return', _promise2.default.resolve(false));
+                                return _context2.abrupt('return', _promise2.default.resolve(false));
 
                             case 22:
-                                _context4.next = 29;
+                                _context2.next = 29;
                                 break;
 
                             case 24:
-                                _context4.next = 26;
+                                _context2.next = 26;
                                 return this.saveMember();
 
                             case 26:
-                                ret1 = _context4.sent;
+                                ret1 = _context2.sent;
 
                                 if (!(ret1 === false)) {
-                                    _context4.next = 29;
+                                    _context2.next = 29;
                                     break;
                                 }
 
-                                return _context4.abrupt('return', _promise2.default.resolve(false));
+                                return _context2.abrupt('return', _promise2.default.resolve(false));
 
                             case 29:
-                                _context4.next = 40;
+                                _context2.next = 40;
                                 break;
 
                             case 31:
-                                _context4.next = 33;
+                                _context2.next = 33;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
                             case 33:
-                                _context4.next = 35;
+                                _context2.next = 35;
                                 return this.save();
 
                             case 35:
-                                ret2 = _context4.sent;
+                                ret2 = _context2.sent;
 
                                 if (!(ret2 === false)) {
-                                    _context4.next = 38;
+                                    _context2.next = 38;
                                     break;
                                 }
 
-                                return _context4.abrupt('return', _promise2.default.resolve(false));
+                                return _context2.abrupt('return', _promise2.default.resolve(false));
 
                             case 38:
-                                _context4.next = 40;
+                                _context2.next = 40;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
                             case 40:
-                                return _context4.abrupt('return', _promise2.default.resolve(true));
+                                return _context2.abrupt('return', _promise2.default.resolve(true));
 
                             case 43:
-                                _context4.prev = 43;
-                                _context4.t0 = _context4['catch'](4);
+                                _context2.prev = 43;
+                                _context2.t0 = _context2['catch'](4);
 
-                                console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
+                                console.error('settlementStore.commit失败，错误信息：' + _context2.t0);
                                 //其他支付失败时,处理二开支付情况。
                                 this.thirdPayRefund(status == 1 ? 2 : 1);
-                                return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
+                                return _context2.abrupt('return', _promise2.default.resolve(_context2.t0));
 
                             case 48:
                             case 'end':
-                                return _context4.stop();
+                                return _context2.stop();
                         }
                     }
-                }, _callee4, this, [[4, 43]]);
+                }, _callee2, this, [[4, 43]]);
             }));
 
-            function commit(_x3) {
-                return _ref9.apply(this, arguments);
+            function commit(_x2) {
+                return _ref5.apply(this, arguments);
             }
 
             return commit;
@@ -1332,32 +1003,32 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'saveMember',
         value: function () {
-            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-                var _this11 = this;
+            var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
+                var _this10 = this;
 
-                var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
+                var _enumController$getEn12, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref8, type, data, msg, code;
 
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
+                return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                        switch (_context5.prev = _context5.next) {
+                        switch (_context3.prev = _context3.next) {
                             case 0:
-                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn15.PayStyle, TradeType = _enumController$getEn15.TradeType;
+                                _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn12.PayStyle, TradeType = _enumController$getEn12.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this11.dto.StorageMutiSettleDetails = [];
-                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
+                                    _this10.dto.StorageMutiSettleDetails = [];
+                                    var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this11.paymode.thePaymodes;
+                                    }) : _this10.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode) {
-                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
 
                                         var value = parseFloat(mode.value);
                                         var giveChange = null;
-                                        if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
-                                            value = Math.Add(value, _this11.paymode.receivable);
-                                            giveChange = Math.abs(_this11.paymode.receivable);
+                                        if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
+                                            value = Math.Add(value, _this10.paymode.receivable);
+                                            giveChange = Math.abs(_this10.paymode.receivable);
                                         }
-                                        _this11.dto.StorageMutiSettleDetails.push({
+                                        _this10.dto.StorageMutiSettleDetails.push({
                                             Code: mode.paymethodId,
                                             StorageAmount: value,
                                             GiveChange: giveChange,
@@ -1366,7 +1037,7 @@ var SettlementStore = (_class = function () {
                                             PaymentCode: mode.authCode,
                                             DynamicPropertyKeys: [],
                                             DynamicPropertyValues: [],
-                                            DataSource: { Id: _this11.dataSource },
+                                            DataSource: { Id: _this10.dataSource },
                                             ThirdPaymentInfo: themode.thridPayment || null,
                                             ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                         });
@@ -1386,49 +1057,49 @@ var SettlementStore = (_class = function () {
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context5.next = 19;
+                                    _context3.next = 19;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.StorageAmount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context5.next = 11;
+                                _context3.next = 11;
                                 return this.thirdPay(2, payment, tradeType, dtoParams);
 
                             case 11:
-                                ret = _context5.sent;
-                                _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
+                                ret = _context3.sent;
+                                _ref8 = ret || {}, type = _ref8.type, data = _ref8.data, msg = _ref8.msg, code = _ref8.code;
 
                                 if (!(type === true)) {
-                                    _context5.next = 17;
+                                    _context3.next = 17;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context5.next = 19;
+                                _context3.next = 19;
                                 break;
 
                             case 17:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context5.abrupt('return', false);
+                                return _context3.abrupt('return', false);
 
                             case 19:
                                 this.dtoParams = dtoParams;
                                 console.log('储值结算信息:', dtoParams);
-                                return _context5.abrupt('return', (0, _tplusApi.tApi)({ dto: dtoParams }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
-                                    _this11.handlePrint(resp);
+                                return _context3.abrupt('return', this.SettlementApi.INewRetailMemberStorageSave({ dto: dtoParams }).then(function (resp) {
+                                    _this10.handlePrint(resp);
                                 }));
 
                             case 22:
                             case 'end':
-                                return _context5.stop();
+                                return _context3.stop();
                         }
                     }
-                }, _callee5, this);
+                }, _callee3, this);
             }));
 
             function saveMember() {
-                return _ref11.apply(this, arguments);
+                return _ref7.apply(this, arguments);
             }
 
             return saveMember;
@@ -1436,31 +1107,31 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'save',
         value: function () {
-            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
-                var _this12 = this;
+            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                var _this11 = this;
 
-                var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref14, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
+                var _enumController$getEn13, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref10, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref11, type, data, msg, code;
 
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
-                        switch (_context6.prev = _context6.next) {
+                        switch (_context4.prev = _context4.next) {
                             case 0:
-                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn16.PayStyle, TradeType = _enumController$getEn16.TradeType;
+                                _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle, TradeType = _enumController$getEn13.TradeType;
 
                                 (0, _mobx.runInAction)(function () {
-                                    _this12.dto.RetailPaymentDetails = [];
-                                    _this12.dto.RetailStorageDetails = [];
-                                    _this12.dto.RetailCouponDetails = [];
+                                    _this11.dto.RetailPaymentDetails = [];
+                                    _this11.dto.RetailStorageDetails = [];
+                                    _this11.dto.RetailCouponDetails = [];
                                     var czkSum = 0;
                                     var count = 0;
-                                    var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
+                                    var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
                                         return parseFloat(mode.value) != 0;
-                                    }) : _this12.paymode.thePaymodes;
+                                    }) : _this11.paymode.thePaymodes;
                                     (0, _each3.default)(thePaymodes, function (mode, index) {
-                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
                                         if (mode.paymentType == PayStyle.hyczk) {
                                             czkSum = Math.Add(czkSum, mode.value);
-                                            _this12.dto.RetailStorageDetails.push({
+                                            _this11.dto.RetailStorageDetails.push({
                                                 Code: mode.paymethodId,
                                                 MeStorageCardId: mode.meStorageCardId,
                                                 StoragePaymentAmount: mode.value,
@@ -1469,17 +1140,17 @@ var SettlementStore = (_class = function () {
                                                 Idmember: mode.memberId,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this12.dataSource },
+                                                DataSource: { Id: _this11.dataSource },
                                                 Password: mode.authCode
                                             });
                                         } else {
                                             var value = parseFloat(mode.value);
                                             var giveChange = null;
-                                            if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
-                                                value = Math.Add(value, _this12.paymode.receivable);
-                                                giveChange = Math.abs(_this12.paymode.receivable);
+                                            if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
+                                                value = Math.Add(value, _this11.paymode.receivable);
+                                                giveChange = Math.abs(_this11.paymode.receivable);
                                             }
-                                            _this12.dto.RetailPaymentDetails.push({
+                                            _this11.dto.RetailPaymentDetails.push({
                                                 Code: mode.paymethodId,
                                                 OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
                                                 Amount: value,
@@ -1493,14 +1164,14 @@ var SettlementStore = (_class = function () {
                                                 OverchargesAmount: mode.overchargesAmount,
                                                 DynamicPropertyKeys: [],
                                                 DynamicPropertyValues: [],
-                                                DataSource: { Id: _this12.dataSource },
+                                                DataSource: { Id: _this11.dataSource },
                                                 ThirdPaymentInfo: themode.thridPayment || null,
                                                 SettleStyle: { Name: mode.name },
                                                 ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this12.paymode.checkList && _this12.paymode.checkList.length ? _this12.paymode.checkList : mode.djqs, function (djq) {
-                                                    _this12.dto.RetailCouponDetails.push({
+                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : mode.djqs, function (djq) {
+                                                    _this11.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
                                                         EnableAmount: djq.doorsill,
@@ -1510,24 +1181,24 @@ var SettlementStore = (_class = function () {
                                                         PromotionId: djq.promoId,
                                                         PromotionRuleId: djq.promoRuleId,
                                                         PromoCouponAllocatedId: djq.id,
-                                                        DataSource: { Id: _this12.dataSource }
+                                                        DataSource: { Id: _this11.dataSource }
                                                     });
                                                 });
                                             }
                                         }
                                     });
-                                    if (_this12.dto.RetailStorageDetails.length > 0) {
-                                        var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
-                                        _this12.dto.RetailPaymentDetails.push({
-                                            Code: _this12.paymode.counter,
+                                    if (_this11.dto.RetailStorageDetails.length > 0) {
+                                        var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
+                                        _this11.dto.RetailPaymentDetails.push({
+                                            Code: _this11.paymode.counter,
                                             OrigAmount: czkSum,
                                             Amount: czkSum,
                                             IdsettleStyle: themode.idSettleStyle,
                                             IdbankAccount: themode.idBankAccount,
                                             DynamicPropertyKeys: [],
                                             DynamicPropertyValues: [],
-                                            DataSource: { Id: _this12.dataSource },
-                                            RetailStorageDetails: _this12.dto.RetailStorageDetails
+                                            DataSource: { Id: _this11.dataSource },
+                                            RetailStorageDetails: _this11.dto.RetailStorageDetails
                                         });
                                     }
                                 });
@@ -1540,7 +1211,7 @@ var SettlementStore = (_class = function () {
                                 }
                                 RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
                                 _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
-                                _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode;
+                                _ref10 = this.dto || {}, IdbusiType = _ref10.IdbusiType, DistributionMode = _ref10.DistributionMode;
 
                                 if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
                                     prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
@@ -1552,35 +1223,35 @@ var SettlementStore = (_class = function () {
 
                                     this.isFull = fullPayment == prepaidAmount; // 是否全款
                                     (0, _mobx.runInAction)(function () {
-                                        _this12.dto.PrepaidAmount = prepaidAmount;
+                                        _this11.dto.PrepaidAmount = prepaidAmount;
                                     });
                                 }
-                                _context6.t1 = this.dto.IdbusiType == 37;
+                                _context4.t1 = this.dto.IdbusiType == 37;
 
-                                if (!_context6.t1) {
-                                    _context6.next = 14;
+                                if (!_context4.t1) {
+                                    _context4.next = 14;
                                     break;
                                 }
 
-                                _context6.next = 13;
+                                _context4.next = 13;
                                 return this.checkIntegralExchangeReturn(this.dto.RetailDetails[0].ReturnSourceId);
 
                             case 13:
-                                _context6.t1 = _context6.sent;
+                                _context4.t1 = _context4.sent;
 
                             case 14:
-                                _context6.t0 = _context6.t1;
+                                _context4.t0 = _context4.t1;
 
-                                if (_context6.t0) {
-                                    _context6.next = 17;
+                                if (_context4.t0) {
+                                    _context4.next = 17;
                                     break;
                                 }
 
-                                _context6.t0 = this.dto.IdbusiType != 37;
+                                _context4.t0 = this.dto.IdbusiType != 37;
 
                             case 17:
-                                if (!_context6.t0) {
-                                    _context6.next = 36;
+                                if (!_context4.t0) {
+                                    _context4.next = 36;
                                     break;
                                 }
 
@@ -1592,54 +1263,59 @@ var SettlementStore = (_class = function () {
                                 });
 
                                 if (!(payList && payList.length > 0)) {
-                                    _context6.next = 33;
+                                    _context4.next = 33;
                                     break;
                                 }
 
                                 payment = payList[0];
                                 tradeType = payment && payment.Amount > 0 ? TradeType.PAY : TradeType.REFUND;
-                                _context6.next = 25;
+                                _context4.next = 25;
                                 return this.thirdPay(1, payment, tradeType, dtoParams);
 
                             case 25:
-                                ret = _context6.sent;
-                                _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
+                                ret = _context4.sent;
+                                _ref11 = ret || {}, type = _ref11.type, data = _ref11.data, msg = _ref11.msg, code = _ref11.code;
 
                                 if (!(type === true)) {
-                                    _context6.next = 31;
+                                    _context4.next = 31;
                                     break;
                                 }
 
                                 dtoParams = data;
-                                _context6.next = 33;
+                                _context4.next = 33;
                                 break;
 
                             case 31:
                                 _message2.default.warn('\u5237\u5361\u652F\u4ED8\u5931\u8D25,\u9519\u8BEF\u7801:' + code);
-                                return _context6.abrupt('return', false);
+                                return _context4.abrupt('return', false);
 
                             case 33:
                                 this.dtoParams = dtoParams;
                                 console.log('结算信息:', dtoParams);
-                                return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
-                                    var _ref16 = resp || {},
-                                        ID = _ref16.ID;
-
-                                    _this12.setDtoID(ID);
-                                    _this12.billID = ID;
-                                    _this12.paymode.checkList = [];
+                                return _context4.abrupt('return', this.SettlementApi.retailPosSettle({
+                                    dto: dtoParams,
+                                    cip: IPMSG.query || "",
+                                    longitude: IPMSG.longitude || "",
+                                    latitude: IPMSG.latitude || ""
+                                }).then(function (resp) {
+                                    var _ref12 = resp || {},
+                                        ID = _ref12.ID;
+
+                                    _this11.setDtoID(ID);
+                                    _this11.billID = ID;
+                                    _this11.paymode.checkList = [];
                                 }));
 
                             case 36:
                             case 'end':
-                                return _context6.stop();
+                                return _context4.stop();
                         }
                     }
-                }, _callee6, this);
+                }, _callee4, this);
             }));
 
             function save() {
-                return _ref13.apply(this, arguments);
+                return _ref9.apply(this, arguments);
             }
 
             return save;
@@ -1667,19 +1343,19 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'thirdPay',
         value: function () {
-            var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
-                var cto, params, ret, _ref18, Code, _Message, Result, _ref19, ThirdPaymentReturnInfo;
+            var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(vType, payment, trade, dto) {
+                var cto, params, ret, _ref14, Code, _Message, Result, _ref15, ThirdPaymentReturnInfo;
 
-                return _regenerator2.default.wrap(function _callee7$(_context7) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context5.prev = _context5.next) {
                             case 0:
-                                _context7.prev = 0;
+                                _context5.prev = 0;
                                 cto = this.removeThirdPayDto(dto);
                                 params = { VoucherType: vType, Payment: payment, TradeType: trade, dto: cto };
 
                                 console.log('刷卡信息:', (0, _stringify2.default)(params));
-                                _context7.next = 6;
+                                _context5.next = 6;
                                 return new _promise2.default(function (resolve, reject) {
                                     _mutantsMicrofx.nativeMs.setIpcRendererMethod('ThirdPayment', (0, _extends3.default)({}, params), function (res) {
                                         return resolve(res);
@@ -1687,26 +1363,26 @@ var SettlementStore = (_class = function () {
                                 });
 
                             case 6:
-                                ret = _context7.sent;
+                                ret = _context5.sent;
 
                                 console.log('刷卡返回信息:', ret);
                                 ret = JSON.parse(ret);
-                                _ref18 = ret || {}, Code = _ref18.Code, _Message = _ref18.Message, Result = _ref18.Result;
+                                _ref14 = ret || {}, Code = _ref14.Code, _Message = _ref14.Message, Result = _ref14.Result;
 
                                 if (!(Code > 0)) {
-                                    _context7.next = 14;
+                                    _context5.next = 14;
                                     break;
                                 }
 
-                                return _context7.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
 
                             case 14:
                                 if (!(trade == '00')) {
-                                    _context7.next = 20;
+                                    _context5.next = 20;
                                     break;
                                 }
 
-                                _ref19 = Result || {}, ThirdPaymentReturnInfo = _ref19.ThirdPaymentReturnInfo;
+                                _ref15 = Result || {}, ThirdPaymentReturnInfo = _ref15.ThirdPaymentReturnInfo;
 
                                 if (vType == 1) {
                                     dto.RetailPaymentDetails.forEach(function (v) {
@@ -1721,35 +1397,35 @@ var SettlementStore = (_class = function () {
                                         }
                                     });
                                 }
-                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
                             case 20:
                                 if (!(trade == '02')) {
-                                    _context7.next = 22;
+                                    _context5.next = 22;
                                     break;
                                 }
 
-                                return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
+                                return _context5.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
                             case 22:
-                                _context7.next = 27;
+                                _context5.next = 27;
                                 break;
 
                             case 24:
-                                _context7.prev = 24;
-                                _context7.t0 = _context7['catch'](0);
-                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0, code: '9999' });
+                                _context5.prev = 24;
+                                _context5.t0 = _context5['catch'](0);
+                                return _context5.abrupt('return', { type: false, data: null, msg: _context5.t0, code: '9999' });
 
                             case 27:
                             case 'end':
-                                return _context7.stop();
+                                return _context5.stop();
                         }
                     }
-                }, _callee7, this, [[0, 24]]);
+                }, _callee5, this, [[0, 24]]);
             }));
 
-            function thirdPay(_x4, _x5, _x6, _x7) {
-                return _ref17.apply(this, arguments);
+            function thirdPay(_x3, _x4, _x5, _x6) {
+                return _ref13.apply(this, arguments);
             }
 
             return thirdPay;
@@ -1760,14 +1436,14 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'thirdPayRefund',
         value: function () {
-            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
-                var _this13 = this;
+            var _ref16 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type) {
+                var _this12 = this;
 
-                var dto, pay, payment, _enumController$getEn17, TradeType;
+                var dto, pay, payment, _enumController$getEn14, TradeType;
 
-                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:
                                 dto = type == 1 ? this.dtoParams.RetailPaymentDetails : this.dtoParams.StorageMutiSettleDetails;
                                 pay = dto && dto.filter(function (v) {
@@ -1779,43 +1455,43 @@ var SettlementStore = (_class = function () {
                                         _message2.default.warn("支付出现异常，将发起刷卡退款。", { duration: 4.5 });
                                     }, 1000);
                                     payment = pay[0];
-                                    _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
+                                    _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn14.TradeType;
 
-                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-                                        var ret, _ref22, msg;
+                                    setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                                        var ret, _ref18, msg;
 
-                                        return _regenerator2.default.wrap(function _callee8$(_context8) {
+                                        return _regenerator2.default.wrap(function _callee6$(_context6) {
                                             while (1) {
-                                                switch (_context8.prev = _context8.next) {
+                                                switch (_context6.prev = _context6.next) {
                                                     case 0:
-                                                        _context8.next = 2;
-                                                        return _this13.thirdPay(type, payment, TradeType.REFUND, dto);
+                                                        _context6.next = 2;
+                                                        return _this12.thirdPay(type, payment, TradeType.REFUND, dto);
 
                                                     case 2:
-                                                        ret = _context8.sent;
-                                                        _ref22 = ret || {}, msg = _ref22.msg;
+                                                        ret = _context6.sent;
+                                                        _ref18 = ret || {}, msg = _ref18.msg;
 
                                                         console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
 
                                                     case 5:
                                                     case 'end':
-                                                        return _context8.stop();
+                                                        return _context6.stop();
                                                 }
                                             }
-                                        }, _callee8, _this13);
+                                        }, _callee6, _this12);
                                     })), 4500);
                                 }
 
                             case 3:
                             case 'end':
-                                return _context9.stop();
+                                return _context7.stop();
                         }
                     }
-                }, _callee9, this);
+                }, _callee7, this);
             }));
 
-            function thirdPayRefund(_x8) {
-                return _ref20.apply(this, arguments);
+            function thirdPayRefund(_x7) {
+                return _ref16.apply(this, arguments);
             }
 
             return thirdPayRefund;
@@ -1828,35 +1504,35 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'querySettleResult',
         value: function () {
-            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
-                return _regenerator2.default.wrap(function _callee10$(_context10) {
+            var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
-                        switch (_context10.prev = _context10.next) {
+                        switch (_context8.prev = _context8.next) {
                             case 0:
-                                _context10.prev = 0;
-                                _context10.t0 = _promise2.default;
-                                _context10.next = 4;
-                                return (0, _tplusApi.tApi)({ RetailCode: this.dto.Code }, 'chanjet.RE.newRetail.QuerySettleResult', false, false, { timeout_skip: true });
+                                _context8.prev = 0;
+                                _context8.t0 = _promise2.default;
+                                _context8.next = 4;
+                                return this.SettlementApi.QuerySettleResult({ RetailCode: this.dto.Code });
 
                             case 4:
-                                _context10.t1 = _context10.sent;
-                                return _context10.abrupt('return', _context10.t0.resolve.call(_context10.t0, _context10.t1));
+                                _context8.t1 = _context8.sent;
+                                return _context8.abrupt('return', _context8.t0.resolve.call(_context8.t0, _context8.t1));
 
                             case 8:
-                                _context10.prev = 8;
-                                _context10.t2 = _context10['catch'](0);
-                                return _context10.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
+                                _context8.prev = 8;
+                                _context8.t2 = _context8['catch'](0);
+                                return _context8.abrupt('return', _promise2.default.resolve({ Flag: "1" }));
 
                             case 11:
                             case 'end':
-                                return _context10.stop();
+                                return _context8.stop();
                         }
                     }
-                }, _callee10, this, [[0, 8]]);
+                }, _callee8, this, [[0, 8]]);
             }));
 
             function querySettleResult() {
-                return _ref23.apply(this, arguments);
+                return _ref19.apply(this, arguments);
             }
 
             return querySettleResult;
@@ -1882,18 +1558,18 @@ var SettlementStore = (_class = function () {
     }, {
         key: 'validePwd',
         value: function () {
-            var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
-                var _ref25, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
+            var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(value) {
+                var _ref21, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, checkPaymentPasswordParams, checkPaymentPasswordId, result, count, _result;
 
-                return _regenerator2.default.wrap(function _callee11$(_context11) {
+                return _regenerator2.default.wrap(function _callee9$(_context9) {
                     while (1) {
-                        switch (_context11.prev = _context11.next) {
+                        switch (_context9.prev = _context9.next) {
                             case 0:
-                                _ref25 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref25.isNewRetailBCPos;
-                                _context11.prev = 1;
+                                _ref21 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref21.isNewRetailBCPos;
+                                _context9.prev = 1;
 
                                 if (!isNewRetailBCPos) {
-                                    _context11.next = 33;
+                                    _context9.next = 23;
                                     break;
                                 }
 
@@ -1903,62 +1579,56 @@ var SettlementStore = (_class = function () {
                                 memberStorageId = this.paymode.currentMode.meStorageCardId;
 
                                 if (!cook2) {
-                                    _context11.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 if (!cook2.hasOwnProperty(memberStorageId + "")) {
-                                    _context11.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 if (!(cook2[memberStorageId] > 3)) {
-                                    _context11.next = 12;
+                                    _context9.next = 12;
                                     break;
                                 }
 
                                 message = '今日密码错误已达上限，不可使用储值消费，请明日再试，如忘记请重置密码或修改密码。';
-                                return _context11.abrupt('return', _promise2.default.resolve(message));
+                                return _context9.abrupt('return', _promise2.default.resolve(message));
 
                             case 12:
                                 _paymode$currentMode = this.paymode.currentMode, cardTypeEnum = _paymode$currentMode.cardTypeEnum, memberId = _paymode$currentMode.memberId, meStorageCardId = _paymode$currentMode.meStorageCardId, cardStatusEnum = _paymode$currentMode.cardStatusEnum;
-                                result = null;
-
-                                if (!(cardTypeEnum === 'BALANCE_CARD')) {
-                                    _context11.next = 20;
-                                    break;
-                                }
-
-                                _context11.next = 17;
-                                return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + memberId, false, false);
-
-                            case 17:
-                                result = _context11.sent;
-                                _context11.next = 29;
-                                break;
-
-                            case 20:
-                                if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
-                                    _context11.next = 26;
-                                    break;
+                                checkPaymentPasswordParams = {};
+                                checkPaymentPasswordId = null;
+
+                                if (cardTypeEnum === 'BALANCE_CARD') {
+                                    checkPaymentPasswordParams = {
+                                        md5Password: _tplusApi.User.pwdEncrypt(value.pwd),
+                                        cardType: cardTypeEnum
+                                    };
+                                    checkPaymentPasswordId = memberId;
+                                } else {
+                                    if (cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId) {
+                                        checkPaymentPasswordParams = {
+                                            md5Password: _tplusApi.User.pwdEncrypt(value.pwd),
+                                            password: value.pwd,
+                                            cardType: cardTypeEnum
+                                        };
+                                        checkPaymentPasswordId = meStorageCardId;
+                                    } else {
+                                        checkPaymentPasswordParams = {
+                                            password: value.pwd,
+                                            cardType: cardTypeEnum
+                                        };
+                                        checkPaymentPasswordId = meStorageCardId;
+                                    }
                                 }
+                                _context9.next = 18;
+                                return this.SettlementApi.checkPaymentPassword(checkPaymentPasswordParams, checkPaymentPasswordId);
 
-                                _context11.next = 23;
-                                return (0, _tplusApi.ccApi)({ md5Password: _tplusApi.User.pwdEncrypt(value.pwd), password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
-
-                            case 23:
-                                result = _context11.sent;
-                                _context11.next = 29;
-                                break;
-
-                            case 26:
-                                _context11.next = 28;
-                                return (0, _tplusApi.ccApi)({ password: value.pwd, cardType: cardTypeEnum }, '/member/MeMemberWallet/checkPaymentPassword/' + meStorageCardId, false, false);
+                            case 18:
+                                result = _context9.sent;
 
-                            case 28:
-                                result = _context11.sent;
-
-                            case 29:
                                 if (!result.data) {
                                     if (cook2) {
                                         if (cook2.hasOwnProperty(memberStorageId + "")) {
@@ -1975,45 +1645,381 @@ var SettlementStore = (_class = function () {
                                     this.setCookie('errorPwd', '', -1);
                                     this.setCookie('errorPwd', (0, _stringify2.default)(cook2));
                                 }
-                                return _context11.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
+                                return _context9.abrupt('return', _promise2.default.resolve(result.data ? "" : message));
 
-                            case 33:
-                                _context11.next = 35;
-                                return (0, _tplusApi.tApi)({ "CheckoutParams": {
+                            case 23:
+                                _context9.next = 25;
+                                return this.SettlementApi.CheckoutMemberPassword({ "CheckoutParams": {
                                         "Idmember": value.id,
                                         "Password": value.pwd
-                                    } }, 'AA.DR.newRetailMember.CheckoutMemberPassword', false, false);
+                                    } });
 
-                            case 35:
-                                _result = _context11.sent;
-                                return _context11.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
+                            case 25:
+                                _result = _context9.sent;
+                                return _context9.abrupt('return', _promise2.default.resolve(_result.Success ? "" : _result.Message));
 
-                            case 37:
-                                _context11.next = 42;
+                            case 27:
+                                _context9.next = 32;
                                 break;
 
-                            case 39:
-                                _context11.prev = 39;
-                                _context11.t0 = _context11['catch'](1);
-                                return _context11.abrupt('return', "failed");
+                            case 29:
+                                _context9.prev = 29;
+                                _context9.t0 = _context9['catch'](1);
+                                return _context9.abrupt('return', "failed");
 
-                            case 42:
+                            case 32:
                             case 'end':
-                                return _context11.stop();
+                                return _context9.stop();
                         }
                     }
-                }, _callee11, this, [[1, 39]]);
+                }, _callee9, this, [[1, 29]]);
             }));
 
-            function validePwd(_x9) {
-                return _ref24.apply(this, arguments);
+            function validePwd(_x8) {
+                return _ref20.apply(this, arguments);
             }
 
             return validePwd;
         }()
     }]);
     return SettlementStore;
-}(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'newStyle', [_mobx.observable], {
+}(), _initialiseProps = function _initialiseProps() {
+    var _this13 = this;
+
+    this.paymode = null;
+    this.dto = null;
+    this.dtoParams = null;
+    this.member = null;
+    this.brefund = false;
+    this.bquick = false;
+    this.boriginReturn = false;
+
+    _initDefineProp(this, 'newStyle', _descriptor, this);
+
+    this.isFull = true;
+
+    _initDefineProp(this, 'setNewStyle', _descriptor2, this);
+
+    _initDefineProp(this, 'queryPwd', _descriptor3, this);
+
+    _initDefineProp(this, 'updateMemberInfo', _descriptor4, this);
+
+    _initDefineProp(this, 'updateCurrentMode', _descriptor5, this);
+
+    _initDefineProp(this, 'updateCardInfo', _descriptor6, this);
+
+    this.handleCzkData = function (m) {
+        if (!m || !m.StorageCardNo) {
+            (0, _mobx.runInAction)(function () {
+                _this13.paymode.currentMode.errinfo = "无效的会员卡号";
+            });
+        } else {
+            (0, _mobx.runInAction)(function () {
+                _this13.paymode.currentMode.errinfo = "";
+                _this13.paymode.currentMode.memberId = m.ID;
+                _this13.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this13.brefund ? _this13.paymode.receivable : Math.max(_this13.paymode.receivable, 0));
+                _this13.updateEvent();
+                var message = '';
+                var sum = (0, _reduce3.default)(_this13.paymode.thePaymodes, function (total, cur) {
+                    return total + cur.value;
+                }, 0);
+                // 对于卡不用判断会员的一些信息
+                // if (global.CheckMemberStorageProcessorBlock ) {
+                //     message= CheckMemberStorageProcessorBlock.execute(m);
+                // }
+                if (!String.isNullOrEmpty(message)) {
+                    _this13.paymode.currentMode.errinfo = message;
+                } else if (_this13.checkReceived(_this13.paymode.currentMode, "balance")) {
+                    _this13.paymode.currentMode.errinfo = "余额不足";
+                } else if (_this13.paymode.amount > 0 && parseFloat(_this13.paymode.amount) !== sum && _this13.paymode.currentMode.value == 0) {
+                    _this13.paymode.currentMode.errinfo = "实收金额必须录入";
+                } else {
+                    // 查询成功后将焦点移入下一个输入框
+                    setTimeout(function () {
+                        var nextInput = document.querySelector('.czk .received .input');
+                        nextInput && nextInput.select();
+                    }, 300);
+                }
+            });
+        }
+    };
+
+    this.getCouponList = function (coupon_code) {
+        var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+            PayStyle = _enumController$getEn15.PayStyle,
+            Differentiate = _enumController$getEn15.Differentiate;
+
+        var couponApplyRule = (0, _tplusPoslogin.PosInitData)('CouponApplyRule');
+
+        var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
+            CouponApplyRule = _enumController$getEn16.CouponApplyRule;
+
+        if (couponApplyRule == CouponApplyRule.SHOWN_BY_CUSTOMER && !!coupon_code || couponApplyRule != CouponApplyRule.SHOWN_BY_CUSTOMER) {
+            var dto = _this13.dto;
+            var promoVoucher = {};
+            _this13.paymode.clearDjqs();
+            _this13.paymode.reCalculationDjqs();
+            promoVoucher.coupon_code = coupon_code || "";
+            promoVoucher.boName = "Retail";
+            promoVoucher.voucherId = dto.ID;
+            var onlinePaymentAmount = 0;
+            if (dto.OnlinePaymentAmount) {
+                onlinePaymentAmount = dto.OnlinePaymentAmount;
+            }
+            promoVoucher.promoLinks = (0, _filter3.default)(_this13.paymode.currentMode.djqs, function (djq) {
+                return djq.checked;
+            });
+            promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
+            promoVoucher.redBlueFlagEnum = "BLUE";
+            promoVoucher.meMemberId = dto.Idmember;
+            promoVoucher.storeFactorId = dto.Idstore;
+            promoVoucher.voucherDetailList = [];
+            dto.RetailDetails.forEach(function (item) {
+                var detailDTO = {};
+                detailDTO.uuid = item.Code;
+                detailDTO.detailBoName = "RetailDetail";
+                detailDTO.voucherDetailId = item.ID;
+                detailDTO.productId = item.Idinventory;
+                detailDTO.uomId = item.Idunit;
+                detailDTO.productSpecId = item.ProductSpecId;
+                detailDTO.isManualFreeGift = item.IsPresent;
+                detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
+                detailDTO.IsManualChangePrice = item.IsManualChangePrice;
+                // if(detailDTO.IsManualChangePrice)//如果是手工改价
+                // {
+                //     detailDTO.listPrice = item.TaxPrice;
+                //     detailDTO.netAmountWithTax = item.TaxAmount;
+                // }
+                // else
+                // {
+                var bookingQuantity = 0;
+                if (item.BookingQuantity) {
+                    bookingQuantity = item.BookingQuantity;
+                }
+                detailDTO.listPrice = JSON.getCellValue(item, "listPrice");
+                detailDTO.netAmountWithTax = Math.Multiply(detailDTO.listPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                //}
+                detailDTO.taxRate = item.TaxRate;
+                detailDTO.quantity = item.Quantity;
+
+                detailDTO.amountWithTax = item.RetailAmount;
+                // 促销 start
+                if (item.PromotionDetails && item.PromotionDetails.length != 0) {
+                    var promoLinks = [];
+                    item.PromotionDetails.forEach(function (promotion) {
+                        promoLinks.push({
+                            promoId: promotion.IdSalesPromotionDTO,
+                            promoRuleId: promotion.PromotionRuleId
+                        });
+                    });
+                    if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
+                }
+                // 促销 end
+                promoVoucher.voucherDetailList.push(detailDTO);
+            });
+            return _this13.SettlementApi.findUsefulCouponPromoList(promoVoucher).then(function (result) {
+                if (result && result.length != 0) {
+                    result.forEach(function (element) {
+                        var _ref22 = element || {},
+                            couponCode = _ref22.couponCode,
+                            name = _ref22.name,
+                            tieredAmountResult = _ref22.tieredAmountResult,
+                            fromDate = _ref22.fromDate,
+                            dateMount = _ref22.dateMount,
+                            promoMethodEnum = _ref22.promoMethodEnum,
+                            discountPct = _ref22.discountPct,
+                            nominalAmount = _ref22.nominalAmount,
+                            promoId = _ref22.promoId,
+                            id = _ref22.id;
+
+                        var condValue = tieredAmountResult.condValue,
+                            promoDiscount = tieredAmountResult.promoDiscount,
+                            displayText = tieredAmountResult.displayText,
+                            promoRuleId = tieredAmountResult.promoRuleId,
+                            couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
+
+                        if (result.IsRepelWithPoints && (0, _find3.default)(_this13.paymode.thePaymodes, function (themode) {
+                            return themode.paymentType == PayStyle.jfdx;
+                        })) {
+                            _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
+                        } else {
+                            var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
+                            _this13.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" && nominalAmount, promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
+                        }
+                    });
+                    if (promoVoucher.coupon_code) {
+                        _this13.paymode.calcDjqCheckValue(_this13.paymode.currentMode.djqs[0], _this13.dto, 'single');
+                    }
+                } else {
+                    if (promoVoucher.coupon_code) {
+                        _message2.default.info(Differentiate.COUPON + '\u53F7\u4E0D\u5B58\u5728\uFF01');
+                        _this13.getCouponList();
+                    } else {
+                        _message2.default.info('\u6CA1\u6709\u627E\u5230\u53EF\u4F7F\u7528\u7684' + Differentiate.COUPON + '\uFF01');
+                    }
+                }
+            });
+        }
+    };
+
+    this.getSettleGift = function () {
+        return _this13.SettlementApi.executeRightsForPos(_this13.billID);
+    };
+
+    this.getRefWareHouseList = function () {
+        return _this13.SettlementApi.getRefWareHouseList();
+    };
+
+    this.checkCoupon = function () {
+        var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(sn) {
+            var _ref24, isNewRetailBCPos, _enumController$getEn17, PayStyle, Differentiate, params;
+
+            return _regenerator2.default.wrap(function _callee10$(_context10) {
+                while (1) {
+                    switch (_context10.prev = _context10.next) {
+                        case 0:
+                            _ref24 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref24.isNewRetailBCPos;
+
+                            if (!isNewRetailBCPos) {
+                                _context10.next = 7;
+                                break;
+                            }
+
+                            _context10.next = 4;
+                            return _this13.getCouponList(sn, 'sinlge');
+
+                        case 4:
+                            return _context10.abrupt('return', _context10.sent);
+
+                        case 7:
+                            _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn17.PayStyle, Differentiate = _enumController$getEn17.Differentiate;
+                            params = { request: {
+                                    Uid: _this13.paymode.currentMode.member.uid || '',
+                                    SN: sn,
+                                    StoreCode: _this13.dto.Idstore,
+                                    Inventories: (0, _map3.default)((0, _filter3.default)(_this13.dto.RetailDetails, function (d) {
+                                        return d.Quantity > 0 && !d.IsPresent;
+                                    }), function (detail) {
+                                        return {
+                                            IdInventory: detail.Inventory.ID,
+                                            IdUnit: detail.Idunit,
+                                            Code: detail.Inventory.Code,
+                                            FreeItem0: JSON.getCellValue(detail, "freeitem0"),
+                                            FreeItem1: JSON.getCellValue(detail, "freeitem1"),
+                                            FreeItem2: JSON.getCellValue(detail, "freeitem2"),
+                                            FreeItem3: JSON.getCellValue(detail, "freeitem3"),
+                                            FreeItem4: JSON.getCellValue(detail, "freeitem4"),
+                                            FreeItem5: JSON.getCellValue(detail, "freeitem5"),
+                                            FreeItem6: JSON.getCellValue(detail, "freeitem6"),
+                                            FreeItem7: JSON.getCellValue(detail, "freeitem7"),
+                                            FreeItem8: JSON.getCellValue(detail, "freeitem8"),
+                                            FreeItem9: JSON.getCellValue(detail, "freeitem9")
+                                        };
+                                    }),
+                                    // inventoryCodes:_join(_map(this.dto.RetailDetails,(detail)=>{return detail.Inventory.Code;}),','),
+                                    InventoryClassCodes: (0, _join3.default)((0, _map3.default)((0, _filter3.default)(_this13.dto.RetailDetails, function (d) {
+                                        return d.Quantity > 0;
+                                    }), function (detail) {
+                                        return (detail.Inventory.InventoryClass || { Code: '' }).Code;
+                                    }), ','),
+                                    Amount: _this13.paymode.amount
+                                } };
+                            return _context10.abrupt('return', _this13.SettlementApi.CheckCoupon(params).then(function (result) {
+                                if ((0, _find3.default)(_this13.paymode.currentMode.djqs, function (djq) {
+                                    return djq.code == result.SN;
+                                })) {
+                                    _message2.default.info(Differentiate.COUPON + '\u5DF2\u6DFB\u52A0');
+                                } else if (result.IsRepelWithPoints && (0, _find3.default)(_this13.paymode.thePaymodes, function (themode) {
+                                    return themode.paymentType == PayStyle.jfdx;
+                                })) {
+                                    _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
+                                } else {
+                                    _this13.addDjq(result.SN, result.Title, result.ReduceAmount, result.StartAmount, result.LastTS, false, !result.IsRepelWithPoints, result.UMemberID);
+                                }
+                            }));
+
+                        case 10:
+                        case 'end':
+                            return _context10.stop();
+                    }
+                }
+            }, _callee10, _this13);
+        }));
+
+        return function (_x9) {
+            return _ref23.apply(this, arguments);
+        };
+    }();
+
+    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 _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11() {
+                        var ret;
+                        return _regenerator2.default.wrap(function _callee11$(_context11) {
+                            while (1) {
+                                switch (_context11.prev = _context11.next) {
+                                    case 0:
+                                        _context11.next = 2;
+                                        return _this13.saveMember();
+
+                                    case 2:
+                                        ret = _context11.sent;
+
+                                        if (ret === false) {
+                                            resolve(false);
+                                        } else {
+                                            resolve(true);
+                                        }
+
+                                    case 4:
+                                    case 'end':
+                                        return _context11.stop();
+                                }
+                            }
+                        }, _callee11, _this13);
+                    }));
+
+                    return function onOk() {
+                        return _ref25.apply(this, arguments);
+                    };
+                }(),
+                onCancel: function onCancel() {
+                    resolve(false);
+                }
+            });
+        });
+    };
+
+    this.checkIntegralExchangeReturn = function (id) {
+        return new _promise2.default(function (resolve, reject) {
+            _this13.SettlementApi.GetNewIntegralExchange({ param: { refVoucherId: id } }).then(function (resp) {
+                if (resp && resp.expireIntegral > 0) {
+                    _tplusComponentsTouch.ModalWraper.confirm({
+                        className: 'tplus-confirm-modal',
+                        title: "温馨提示",
+                        content: '\u5B58\u5728\u5DF2\u7ECF\u8FC7\u671F\u7684\u79EF\u5206' + resp.expireIntegral + '\u9000\u8D27\u540E\u79EF\u5206\u4E0D\u4F1A\u8FD4\u8FD8\u3002\u662F\u5426\u7EE7\u7EED\u9000\u8D27\uFF1F',
+                        cancelable: false,
+                        onOk: function onOk() {
+                            resolve(true);
+                        },
+                        onCancel: function onCancel() {
+                            reject(false);
+                        }
+                    });
+                } else {
+                    resolve(true);
+                }
+            });
+        });
+    };
+}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'newStyle', [_mobx.observable], {
     enumerable: true,
     initializer: function initializer() {
         return true;
@@ -2024,7 +2030,8 @@ var SettlementStore = (_class = function () {
         var _this14 = this;
 
         return function () {
-            _this14.newStyle = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') == 'voucher';
+            var voucherDefaultPosMode = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('voucherDefaultPosMode') || 'touch';
+            _this14.newStyle = voucherDefaultPosMode == 'voucher';
         };
     }
 }), _descriptor3 = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
@@ -2040,13 +2047,13 @@ var SettlementStore = (_class = function () {
                 return _message2.default.warn('您两次输入的密码不一致');
             }
             var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
-            return (0, _tplusApi.ccApi)({
+            return _this15.SettlementApi.setWalletPayPassword({
                 Idstore: idstore,
                 meMemberId: _this15.paymode.currentMode.memberId,
                 oldPassword: null,
                 newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
                 dataSource: "POS"
-            }, '/member/MeMemberWallet/setWalletPayPassword', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
+            }).then(function (resp) {
                 if (resp.successful) {
                     return true;
                 }
@@ -2068,7 +2075,7 @@ var SettlementStore = (_class = function () {
                             case 0:
                                 _getLoginInfo4 = _this16.getLoginInfo(), IdStore = _getLoginInfo4.IdStore, StoreCode = _getLoginInfo4.StoreCode;
                                 _context12.next = 3;
-                                return (0, _tplusApi.tApi)({ Idmember: _this16.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
+                                return _this16.SettlementApi.GetUmemberDTO({ Idmember: _this16.member.ID, IdStore: IdStore, StoreCode: StoreCode });
 
                             case 3:
                                 resp = _context12.sent;
@@ -2103,9 +2110,10 @@ var SettlementStore = (_class = function () {
                         switch (_context13.prev = _context13.next) {
                             case 0:
                                 isOnlyEnabled = returnType ? false : true; //非原单退货为false，其他true
+                                // 查看会员卡信息
 
                                 _context13.next = 3;
-                                return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + isOnlyEnabled, false, false, { method: 'get' });
+                                return _this17.SettlementApi.getCardInfoByMemberId(memberId, isOnlyEnabled);
 
                             case 3:
                                 result = _context13.sent;
@@ -2171,7 +2179,7 @@ var SettlementStore = (_class = function () {
                             ctMode = _this18.paymode && _this18.paymode.currentMode;
                             cardNo = ctMode && ctMode.storageCardNo;
                             _context14.next = 4;
-                            return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + cardNo, false, false, { method: 'get', timeout_skip: true });
+                            return _this18.SettlementApi.getCardInfoByCardNo(cardNo);
 
                         case 4:
                             result = _context14.sent;
@@ -2414,7 +2422,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                 promoVoucher.voucherDetailList.push(detailDTO);
             });
             promoVoucher.promoLinks = this.checkList;
-            return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
+            return this.SettlementApi.findUsefulCouponPromoList(promoVoucher).then(function (result) {
                 if (result && result.length != 0) {
                     result.forEach(function (element, index) {
                         var djq1 = false;
@@ -2596,7 +2604,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context15.next = 7;
-                                return (0, _tplusApi.tApi)({ param: param }, 'chanjet.RE.NewPos.GetNewStoreSettleStyles', false, false);
+                                return _settlementApi2.default.GetNewStoreSettleStyles({ param: param });
 
                             case 7:
                                 modes = _context15.sent;