tplus-components-touch 3.26.17 → 3.26.21

package/dist/components/settlement/settlementStore.js

@@ -692,18 +692,28 @@ var SettlementStore = (_class = function () {
                                         data = result.data;
                                         m = data && data.length && data[0];
 
+                                        if (!(result && result.data.length)) {
+                                            _context2.next = 14;
+                                            break;
+                                        }
+
+                                        if (!(result.data.length === 1)) {
+                                            _context2.next = 13;
+                                            break;
+                                        }
+
                                         if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
-                                            _context2.next = 7;
+                                            _context2.next = 9;
                                             break;
                                         }
 
                                         _this7.paymode.updateCardInfo(m);
                                         _this7.handleCzkData(m);
-                                        _context2.next = 9;
+                                        _context2.next = 11;
                                         break;
 
-                                    case 7:
-                                        _context2.next = 9;
+                                    case 9:
+                                        _context2.next = 11;
                                         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) {
@@ -714,7 +724,14 @@ var SettlementStore = (_class = function () {
                                             }
                                         });
 
-                                    case 9:
+                                    case 11:
+                                        _context2.next = 14;
+                                        break;
+
+                                    case 13:
+                                        return _context2.abrupt('return', result.data);
+
+                                    case 14:
                                     case 'end':
                                         return _context2.stop();
                                 }
@@ -725,7 +742,14 @@ var SettlementStore = (_class = function () {
                     return function (_x2) {
                         return _ref8.apply(this, arguments);
                     };
-                }());
+                }()
+                // result.data.forEach((m) => {
+                //     if (m.CardTypeEnum === 'BALANCE_CARD') {
+                //         // 会员概念改为卡，把这些字段都放开
+                //         this.paymode.updateCardInfo(m);
+                //     }
+                // })
+                );
             } else {
                 address = 'AA.DR.newRetailMember.SearchMember';
                 return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
@@ -1474,7 +1498,7 @@ var SettlementStore = (_class = function () {
                                 break;
 
                             case 20:
-                                if (!(cardStatusEnum === 'BINDING')) {
+                                if (!(cardStatusEnum === 'BINDING' && this.member && this.member.ID === memberId)) {
                                     _context6.next = 26;
                                     break;
                                 }
@@ -1630,16 +1654,24 @@ var SettlementStore = (_class = function () {
                             case 2:
                                 result = _context8.sent;
 
-                                if (result && result.data.length) {
-                                    result.data.forEach(function (m) {
-                                        if (m.CardTypeEnum === 'BALANCE_CARD') {
-                                            // 会员概念改为卡，把这些字段都放开
-                                            _this14.paymode.updateCardInfo(m);
-                                        }
-                                    });
+                                if (!(result && result.data.length)) {
+                                    _context8.next = 9;
+                                    break;
                                 }
 
-                            case 4:
+                                if (!(result.data.length === 1)) {
+                                    _context8.next = 8;
+                                    break;
+                                }
+
+                                _this14.paymode.updateCardInfo(result.data[0]);
+                                _context8.next = 9;
+                                break;
+
+                            case 8:
+                                return _context8.abrupt('return', result.data);
+
+                            case 9:
                             case 'end':
                                 return _context8.stop();
                         }