tplus-components-touch 3.44.6 → 3.44.9

package/dist/components/settlement/settlementStore.js

@@ -748,7 +748,7 @@ var SettlementStore = (_class = function () {
                         // this.paymode.currentMode.steadCashIntegral=result.Integral;
                         // this.paymode.currentMode.perIntegral=result.perIntegral;
                         // this.paymode.currentMode.cashAmount=result.cashAmount;
-                        _this6.paymode.currentMode.integralCashOverOrderAmount = result.integralCashOverOrderAmount;
+                        _this6.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
                         _this6.paymode.currentMode.overchargesAmount = result.Amount - _this6.paymode.currentMode.value;
                     });
                 } else {
@@ -954,7 +954,7 @@ var SettlementStore = (_class = function () {
                     _this8.paymode.currentMode.member.setExchangable(result.MaxAmount);
                     _this8.paymode.currentMode.perIntegral = result.perIntegral;
                     _this8.paymode.currentMode.cashAmount = result.cashAmount;
-                    _this8.paymode.currentMode.integralCashOverOrderAmount = result.integralCashOverOrderAmount;
+                    _this8.paymode.currentMode.integralCashOverOrderAmount = result.isIntegralCashOverOrderAmount;
                     _this8.updateEvent();
                     if (_this8.checkReceived(_this8.paymode.currentMode, "exchangable")) {
                         (0, _mobx.runInAction)(function () {
@@ -1222,7 +1222,7 @@ var SettlementStore = (_class = function () {
 
                             case 9:
                                 if (!(status == 1)) {
-                                    _context4.next = 30;
+                                    _context4.next = 31;
                                     break;
                                 }
 
@@ -1254,7 +1254,7 @@ var SettlementStore = (_class = function () {
                                 return _context4.abrupt('return', _promise2.default.resolve(false));
 
                             case 22:
-                                _context4.next = 28;
+                                _context4.next = 29;
                                 break;
 
                             case 24:
@@ -1264,41 +1264,44 @@ var SettlementStore = (_class = function () {
                             case 26:
                                 ret1 = _context4.sent;
 
-                                if (ret1 === false) {
-                                    _promise2.default.resolve(false);
+                                if (!(ret1 === false)) {
+                                    _context4.next = 29;
+                                    break;
                                 }
 
-                            case 28:
-                                _context4.next = 39;
+                                return _context4.abrupt('return', _promise2.default.resolve(false));
+
+                            case 29:
+                                _context4.next = 40;
                                 break;
 
-                            case 30:
-                                _context4.next = 32;
+                            case 31:
+                                _context4.next = 33;
                                 return _mutantsMicrofx.stores.offlineSys.generatorCode(this.dto);
 
-                            case 32:
-                                _context4.next = 34;
+                            case 33:
+                                _context4.next = 35;
                                 return this.save();
 
-                            case 34:
+                            case 35:
                                 ret2 = _context4.sent;
 
                                 if (!(ret2 === false)) {
-                                    _context4.next = 37;
+                                    _context4.next = 38;
                                     break;
                                 }
 
                                 return _context4.abrupt('return', _promise2.default.resolve(false));
 
-                            case 37:
-                                _context4.next = 39;
+                            case 38:
+                                _context4.next = 40;
                                 return _mutantsMicrofx.stores.offlineSys.retailSequenceUpload();
 
-                            case 39:
+                            case 40:
                                 return _context4.abrupt('return', _promise2.default.resolve(true));
 
-                            case 42:
-                                _context4.prev = 42;
+                            case 43:
+                                _context4.prev = 43;
                                 _context4.t0 = _context4['catch'](4);
 
                                 console.error('settlementStore.commit失败，错误信息：' + _context4.t0);
@@ -1306,12 +1309,12 @@ var SettlementStore = (_class = function () {
                                 this.thirdPayRefund(status == 1 ? 2 : 1);
                                 return _context4.abrupt('return', _promise2.default.resolve(_context4.t0));
 
-                            case 47:
+                            case 48:
                             case 'end':
                                 return _context4.stop();
                         }
                     }
-                }, _callee4, this, [[4, 42]]);
+                }, _callee4, this, [[4, 43]]);
             }));
 
             function commit(_x3) {
@@ -1653,12 +1656,12 @@ var SettlementStore = (_class = function () {
             return data;
         }
 
-        /**
-         * 二开支付
-         * vType：1零售单、2储值单
-         * payment：结算方式
-         * trade：00表示结算、02表示退款
-         * dto：结算数据集合
+        /**
+         * 二开支付
+         * vType：1零售单、2储值单
+         * payment：结算方式
+         * trade：00表示结算、02表示退款
+         * dto：结算数据集合
         */
 
     }, {