tplus-components-touch 3.39.2 → 3.39.5

package/dist/components/settlement/settlementStore.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Member = exports.PayMode = exports.default = undefined;
 
+var _isInteger = require('babel-runtime/core-js/number/is-integer');
+
+var _isInteger2 = _interopRequireDefault(_isInteger);
+
 var _defineProperty = require('babel-runtime/core-js/object/define-property');
 
 var _defineProperty2 = _interopRequireDefault(_defineProperty);
@@ -741,7 +745,10 @@ var SettlementStore = (_class = function () {
                             TotalTaxAmount: this.paymode.amount,
                             BalanceTaxAmount: this.paymode.currentMode.value
                         } }, 'AA.DR.newRetailMember.CalculdateIntegralSteadCash', false, false).then(function (result) {
-                        _this6.paymode.currentMode.steadCashIntegral = result.Integral;
+                        // 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.overchargesAmount = result.Amount - _this6.paymode.currentMode.value;
                     });
                 } else {
@@ -991,6 +998,9 @@ var SettlementStore = (_class = function () {
                         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.integralCashOverOrderAmount;
                     _this8.updateEvent();
                     if (_this8.checkReceived(_this8.paymode.currentMode, "exchangable")) {
                         (0, _mobx.runInAction)(function () {
@@ -1688,12 +1698,12 @@ var SettlementStore = (_class = function () {
             return data;
         }
 
-        /**
-         * 二开支付
-         * vType：1零售单、2储值单
-         * payment：结算方式
-         * trade：00表示结算、02表示退款
-         * dto：结算数据集合
+        /**
+         * 二开支付
+         * vType：1零售单、2储值单
+         * payment：结算方式
+         * trade：00表示结算、02表示退款
+         * dto：结算数据集合
         */
 
     }, {
@@ -2593,6 +2603,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
             } else if (parseFloat(v) > 0 && parseFloat(v) > (max || 0)) {
                 this.currentMode.errinfo = "余额不足";
             }
+            // 如果是积分抵现的一些判断
+            if (this.currentMode.paymentType === PayStyle.jfdx) {
+                if (this.currentMode.integralCashOverOrderAmount === true) {
+                    this.currentMode.steadCashIntegral = Math.ceil(this.currentMode.value / this.currentMode.cashAmount) * this.currentMode.perIntegral;
+                } else if (this.currentMode.integralCashOverOrderAmount === false) {
+                    var v1 = this.currentMode.value / this.currentMode.cashAmount;
+                    if ((0, _isInteger2.default)(v1)) {
+                        this.currentMode.steadCashIntegral = Math.floor(this.currentMode.value / this.currentMode.cashAmount) * this.currentMode.perIntegral;
+                    } else {
+                        this.currentMode.errinfo = '\u8BF7\u6309\u7167\u79EF\u5206\u62B5\u73B0\u89C4\u5219' + this.currentMode.perIntegral + '\u79EF\u5206\u62B5\u7528' + this.currentMode.cashAmount + '\u5143\u8F93\u5165\u91D1\u989D';
+                    }
+                }
+            }
         }
     }, {
         key: 'calcMemberBalance',