tplus-components-touch 3.33.12 → 3.33.16

package/dist/components/settlement/settlementStore.js

@@ -1079,13 +1079,6 @@ var SettlementStore = (_class = function () {
             var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
                 PayStyle = _enumController$getEn12.PayStyle;
 
-            var hasThirdPay = this.paymode.thePaymodes.filter(function (v) {
-                return !!v.thridPayment && v.value > 0;
-            }) || [];
-            if (hasThirdPay && hasThirdPay.length > 0) {
-                _message2.default.warn('二开支付目前仅支持单一结算。');
-                return;
-            }
             var pos = this.paymode.thePaymodes.length;
             if (type == PayStyle.hyczk) {
                 var index = (0, _findLastIndex3.default)(this.paymode.thePaymodes, function (m) {
@@ -1174,7 +1167,7 @@ var SettlementStore = (_class = function () {
                                 status = this.type;
                                 _context4.prev = 4;
                                 paylist = this.paymode.thePaymodes.filter(function (v) {
-                                    return !!v.thridPayment && v.value > 0;
+                                    return !!v.thridPayment && Math.abs(v.value) > 0;
                                 }) || [];
 
                                 if (!(paylist && paylist.length > 1)) {
@@ -1329,7 +1322,8 @@ var SettlementStore = (_class = function () {
                                             DynamicPropertyKeys: [],
                                             DynamicPropertyValues: [],
                                             DataSource: { Id: _this11.dataSource },
-                                            ThirdPaymentInfo: themode.thridPayment || null
+                                            ThirdPaymentInfo: themode.thridPayment || null,
+                                            ThirdPaymentReturnInfo: mode.thirdPaymentReturnInfo || null
                                         });
                                     });
                                 });
@@ -1645,7 +1639,7 @@ var SettlementStore = (_class = function () {
                                 return _context7.abrupt('return', { type: false, data: null, msg: _Message, code: Code });
 
                             case 14:
-                                if (!(status == '00')) {
+                                if (!(trade == '00')) {
                                     _context7.next = 20;
                                     break;
                                 }
@@ -1654,13 +1648,13 @@ var SettlementStore = (_class = function () {
 
                                 if (vType == 1) {
                                     dto.RetailPaymentDetails.forEach(function (v) {
-                                        if (v.ThirdPaymentInfo != null) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.Amount) > 0) {
                                             v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
                                         }
                                     });
                                 } else if (vType == 2) {
                                     dto.StorageMutiSettleDetails.forEach(function (v) {
-                                        if (v.ThirdPaymentInfo != null) {
+                                        if (v.ThirdPaymentInfo != null && Math.abs(v.StorageAmount) > 0) {
                                             v.ThirdPaymentReturnInfo = ThirdPaymentReturnInfo;
                                         }
                                     });
@@ -1668,7 +1662,7 @@ var SettlementStore = (_class = function () {
                                 return _context7.abrupt('return', { type: true, data: dto, msg: _Message, code: Code });
 
                             case 20:
-                                if (!(status == '02')) {
+                                if (!(trade == '02')) {
                                     _context7.next = 22;
                                     break;
                                 }
@@ -1682,7 +1676,7 @@ var SettlementStore = (_class = function () {
                             case 24:
                                 _context7.prev = 24;
                                 _context7.t0 = _context7['catch'](0);
-                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0 });
+                                return _context7.abrupt('return', { type: false, data: null, msg: _context7.t0, code: '9999' });
 
                             case 27:
                             case 'end':