tplus-components-touch 3.22.11 → 3.22.15

package/dist/components/settlement/settlementStore.js

@@ -279,7 +279,7 @@ var SettlementStore = (_class = function () {
                                 var _ref2 = _mutantsUtil.platform || {},
                                     isNewRetailBCPos = _ref2.isNewRetailBCPos;
 
-                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : isNewRetailBCPos && discountPct > 0 ? 0 : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
+                                _this2.addDjq(couponCode, name, IsEnable, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, true, 1);
                             }
                         });
                         if (promoVoucher.coupon_code) {
@@ -493,6 +493,7 @@ var SettlementStore = (_class = function () {
             var _ref5 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref5.isNewRetailBCPos;
 
+            console.log(this.dto, 'dto==========');
             (0, _each3.default)(this.dto.RetailPaymentDetails, function (detail) {
                 var themode = (0, _find3.default)(_this5.paymode.paymodes, { 'idSettleStyle': detail.IdsettleStyle });
                 if (detail.SettleStyle.Code === PayStyle.hyczk && !themode) {
@@ -667,7 +668,7 @@ var SettlementStore = (_class = function () {
                             } else {
                                 // 查询成功后将焦点移入下一个输入框
                                 var nextInput = document.querySelector('.czk .received .input');
-                                nextInput && nextInput.focus();
+                                nextInput && nextInput.select();
                             }
                         });
                     }
@@ -1169,7 +1170,7 @@ var SettlementStore = (_class = function () {
                                                 DataSource: { Id: _this11.dataSource }
                                             });
                                             if (mode.paymentType == PayStyle.djq) {
-                                                (0, _each3.default)(_this11.paymode.checkList, function (djq) {
+                                                (0, _each3.default)(_this11.paymode.checkList && _this11.paymode.checkList.length ? _this11.paymode.checkList : _this11.paymode.currentMode.djqs, function (djq) {
                                                     _this11.dto.RetailCouponDetails.push({
                                                         CouponCode: djq.promoCouponCode,
                                                         ReductionAmount: djq.amount,
@@ -1640,40 +1641,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
             if (!q1.checked) {
                 this.checkList.forEach(function (ele, i) {
                     if (ele.id === q1.id) {
-                        // this.checkList.forEach((ele1) => {
-                        //     if(ele.discountPct > 0) {
-                        //         this.currentMode.receivable = this.currentMode.receivable + ele.amount / (1 - discountPct);
-                        //     } else {
-                        //         this.currentMode.receivable = this.currentMode.receivable + ele.amount;
-                        //     }
-                        // })
-                        // if(ele.discountPct > 0) {
-                        //     this.currentMode.receivable = 100;
-                        // } else {
-                        //     this.currentMode.receivable = this.currentMode.receivable + ele.amount;
-                        // }
                         _this14.checkList.splice(i, 1);
                     }
                 });
             } else {
-                if (q1.discountPct > 0) {
-                    q1.amount = 0;
-                }
                 this.checkList.push(q1);
             }
 
-            var copy1 = (0, _cloneDeep2.default)(this.receivable);
-            this.checkList.forEach(function (ele, i) {
-                if (ele.discountPct > 0) {
-                    ele.amount = (1 - ele.discountPct) * copy1;
-                    copy1 -= ele.amount;
-                } else {
-                    copy1 -= ele.amount;
-                }
+            this.checkList.forEach(function (ele) {
                 sum = Math.Add(sum, ele.amount);
             });
             this.currentMode.value = (0, _utils.getFixedNumber)(Math.min(this.receivable, sum, this.currentMode.maxamount));
-            this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - this.currentMode.value);
+            console.log(this.receivable, sum, Math.min(this.receivable, sum, this.currentMode.maxamount), 'sum---------');
+            this.currentMode.receivable = (0, _utils.getFixedNumber)(this.receivable - Math.min(this.receivable, sum, this.currentMode.maxamount));
             this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
             if (params === 'single') {
                 return;
@@ -1728,15 +1708,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
             promoVoucher.promoLinks = this.checkList;
             return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
                 if (result && result.length != 0) {
-                    result.forEach(function (element) {
-                        var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
-                            return djq.id === element.id;
+                    result.forEach(function (element, index) {
+                        var djq1 = false;
+                        _this14.currentMode.djqs.forEach(function (djq) {
+                            if (element.id === djq.id) {
+                                djq1 = true;
+                            }
                         });
-                        if (element.id === 1632121650020355) {
-                            var djq2 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq, index) {
-                                djq.id === element.id;
-                            });
-                        }
 
                         var _ref21 = element || {},
                             couponCode = _ref21.couponCode,
@@ -1757,7 +1735,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             promoRuleId = tieredAmountResult.promoRuleId,
                             couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
-                        if (!djq1.length) {
+                        if (!djq1) {
                             // this.currentMode.djqs.push({
                             //     promoCouponCode: element.CouponCode,
                             //     name: element.CouponTitle,
@@ -1778,8 +1756,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
                             //     id
                             // })
                             _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                            djq1 = false;
                         } else {
-                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum, promoMethodEnum, nominalAmount, promoDiscount);
                             // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
                             // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
                         }
@@ -1994,9 +1973,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
     initializer: function initializer() {
         var _this17 = this;
 
-        return function (id, couponNum, code) {
+        return function (id, couponNum, promoMethodEnum, nominalAmount, promoDiscount) {
             _this17.currentMode.djqs.forEach(function (ele) {
                 if (ele.id === id) {
+                    promoMethodEnum == "CASH_COUPON" ? ele.amount = nominalAmount : ele.amount = promoDiscount;
                     ele.couponCategoryEnum = couponNum;
                     var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
                     ele.IsEnable = IsEnable;