tplus-components-touch 3.26.21 → 3.26.25

package/dist/components/settlement/settlementStore.js

@@ -209,8 +209,10 @@ var SettlementStore = (_class = function () {
                         _this2.paymode.currentMode.errinfo = "实收金额必须录入";
                     } else {
                         // 查询成功后将焦点移入下一个输入框
-                        var nextInput = document.querySelector('.czk .received .input');
-                        nextInput && nextInput.select();
+                        setTimeout(function () {
+                            var nextInput = document.querySelector('.czk .received .input');
+                            nextInput && nextInput.select();
+                        }, 300);
                     }
                 });
             }
@@ -681,7 +683,7 @@ var SettlementStore = (_class = function () {
             var address = '';
             if (isNewRetailBCPos) {
                 // address = '/member/memberProfile/FindByStorageCode/'+v;
-                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v;
+                address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
                 return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
                     var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(result) {
                         var data, m;
@@ -693,45 +695,63 @@ var SettlementStore = (_class = function () {
                                         m = data && data.length && data[0];
 
                                         if (!(result && result.data.length)) {
-                                            _context2.next = 14;
+                                            _context2.next = 25;
                                             break;
                                         }
 
                                         if (!(result.data.length === 1)) {
-                                            _context2.next = 13;
+                                            _context2.next = 14;
                                             break;
                                         }
 
                                         if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
-                                            _context2.next = 9;
+                                            _context2.next = 10;
                                             break;
                                         }
 
                                         _this7.paymode.updateCardInfo(m);
                                         _this7.handleCzkData(m);
-                                        _context2.next = 11;
-                                        break;
+                                        return _context2.abrupt('return', result.data);
 
-                                    case 9:
-                                        _context2.next = 11;
+                                    case 10:
+                                        _context2.next = 12;
                                         return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
                                             var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
                                             if (data1.enable) {
                                                 _this7.paymode.updateCardInfo(m);
                                                 _this7.handleCzkData(m);
+                                                return result1.data;
                                             } else {
                                                 _message2.default.warn(data1.disableReason);
                                             }
                                         });
 
-                                    case 11:
-                                        _context2.next = 14;
+                                    case 12:
+                                        _context2.next = 25;
                                         break;
 
-                                    case 13:
+                                    case 14:
+                                        if (!(result.data && result.data.length === 1)) {
+                                            _context2.next = 19;
+                                            break;
+                                        }
+
+                                        _this7.paymode.updateCardInfo(result.data[0]);
                                         return _context2.abrupt('return', result.data);
 
-                                    case 14:
+                                    case 19:
+                                        if (!(result.data && result.data.length > 1)) {
+                                            _context2.next = 23;
+                                            break;
+                                        }
+
+                                        return _context2.abrupt('return', result.data);
+
+                                    case 23:
+                                        _message2.default.warn('没有可用储值卡！');
+                                        return _context2.abrupt('return', false);
+
+                                    case 25:
                                     case 'end':
                                         return _context2.stop();
                                 }
@@ -877,22 +897,7 @@ var SettlementStore = (_class = function () {
 
             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 });
-            var balance = null;
-            var rawbalance = null;
-            var storageCardNo = null;
             var memberId = this.member && this.member.ID ? this.member.ID : null;
-            var cardTypeEnum = null;
-            var walletEnabled = null;
-            var meStorageCardId = null;
-            if (type === PayStyle.hyczk) {
-                // 会员概念改为卡，把这些字段都放开
-                cardTypeEnum = this.member.CardTypeEnum ? this.member.CardTypeEnum : null;
-                walletEnabled = this.member.WalletEnabled ? this.member.WalletEnabled : null;
-                storageCardNo = this.member.StorageCardNo ? this.member.StorageCardNo : null;
-                balance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
-                rawbalance = this.member.BalanceStorage ? this.member.BalanceStorage : null;
-                meStorageCardId = this.member.MeStorageCardId ? this.member.MeStorageCardId : null;
-            }
             var mode = (0, _mobx.observable)({
                 paymethodId: this.paymode.counter,
                 name: themode.name,
@@ -905,13 +910,7 @@ var SettlementStore = (_class = function () {
                 paymentType: type,
                 djqs: [],
                 card: null,
-                cardTypeEnum: !notwithm ? cardTypeEnum : null,
-                walletEnabled: !notwithm ? walletEnabled : null,
                 memberId: !notwithm ? memberId : null,
-                meStorageCardId: !notwithm ? meStorageCardId : null,
-                storageCardNo: !notwithm ? storageCardNo : null,
-                balance: !notwithm ? balance : null,
-                rawbalance: !notwithm ? rawbalance : null,
                 member: new Member(!notwithm ? this.member : null),
                 authCode: '',
                 steadCashIntegral: null,
@@ -921,7 +920,7 @@ var SettlementStore = (_class = function () {
             if (type == PayStyle.hyczk) {
                 if (!mode.storageCardNo) {
                     (0, _mobx.runInAction)(function () {
-                        mode.errinfo = '未录入储值卡';
+                        mode.errinfo = '未录入手机号或储值卡号';
                     });
                 } else if (this.checkReceived(mode, "balance")) {
                     (0, _mobx.runInAction)(function () {
@@ -1649,29 +1648,46 @@ var SettlementStore = (_class = function () {
                         switch (_context8.prev = _context8.next) {
                             case 0:
                                 _context8.next = 2;
-                                return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId, false, false, { method: 'get' });
+                                return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
 
                             case 2:
                                 result = _context8.sent;
 
                                 if (!(result && result.data.length)) {
-                                    _context8.next = 9;
+                                    _context8.next = 20;
                                     break;
                                 }
 
                                 if (!(result.data.length === 1)) {
-                                    _context8.next = 8;
+                                    _context8.next = 9;
                                     break;
                                 }
 
                                 _this14.paymode.updateCardInfo(result.data[0]);
-                                _context8.next = 9;
-                                break;
-
-                            case 8:
                                 return _context8.abrupt('return', result.data);
 
                             case 9:
+                                if (!(result.data && result.data.length === 1)) {
+                                    _context8.next = 14;
+                                    break;
+                                }
+
+                                _this14.paymode.updateCardInfo(result.data[0]);
+                                return _context8.abrupt('return', result.data);
+
+                            case 14:
+                                if (!(result.data && result.data.length > 1)) {
+                                    _context8.next = 18;
+                                    break;
+                                }
+
+                                return _context8.abrupt('return', result.data);
+
+                            case 18:
+                                _message2.default.warn('没有可用储值卡！');
+                                return _context8.abrupt('return', false);
+
+                            case 20:
                             case 'end':
                                 return _context8.stop();
                         }