tplus-components-touch 3.18.12 → 3.21.1

package/dist/components/settlement/settlement.less

@@ -337,6 +337,37 @@
         font-size: 20px;
       }
     }
+    .col4 {
+      width: 496px;
+      margin-left: 16px;
+      border-bottom: 1px solid #E6E6EB;
+      .ant-btn {
+        margin-right: 2px;
+        padding: 0 10px;
+        font-size: 14px;
+        border: none;
+        border-bottom: 2px solid;
+        border-radius: 0;
+        margin-bottom: -1px;
+        position: relative;
+      }
+      .couponBorder {
+        border-color: #E6E6EB;
+        &::after{
+          position: absolute;
+          bottom: -1px;
+          left: 0px;
+          content: '';
+          width: 100%;
+          height: 1px;
+          border-bottom: 1px solid white;
+        }
+      }
+      .couponTip {
+        color: #F83A41;
+        font-size: 12px;
+      }
+    }
   }
   .djq2outer{
     padding-top:8px;
@@ -429,7 +460,10 @@
             left: -5px;
         }
         .djqLeftCash{
-           background-image: linear-gradient(-137deg, #FD6E21 0%, #F9365D 100%);
+          //  background-image: linear-gradient(-137deg, #FD6E21 0%, #F9365D 100%);
+        }
+        .djqLeftCashGrey {
+          background-image: linear-gradient(137deg, #CBCAC9 0%, #B0B0B0 100%);
         }
         .djqLeftDiscount{
            background-image: linear-gradient(-137deg, #FF8F36 0%, #FD6B59 100%);
@@ -442,15 +476,15 @@
           background-color: #FFFFFF;
           border-radius: 1px 4px 4px 1px;
           text-align: left;
-          text-indent: 20px;
+          text-indent: 14px;
           cursor: pointer;
           .name{
             // padding-left:23px;
             padding-top:16px;
             padding-bottom: 19px;
             font-size: 17px;
-            color: #333333;
             line-height: 16px;
+            width: 136px;
           }
           .info{
             // padding-left:23px;
@@ -459,17 +493,35 @@
             color: #333333;
             line-height: 13px;
           }
-          .info_red{
-            color: #F5372F;
+          .noxuanzhong {
+            position: absolute;
+            top: 12px;
+            right: 12px;
+            border: 1px solid #979797;
+            border-radius: 0.83px;
+            width: 18px;
+            height: 18px;
+          }
+          .noxuanzhong1 {
+            position: absolute;
+            top: 6px;
+            right: 6px;
+            border: 1px solid #979797;
+            border-radius: 0.83px;
+            width: 18px;
+            height: 18px;
+            background: #F0F0F0;
           }
-
         }
 
         .djqRightSelected{
-          background:#FFFFFF url('http://newretail-static-pro-bj.oss-cn-beijing-internal.aliyuncs.com/pos/img/shiyong.png') no-repeat !important;
-          background-position: right bottom !important;
-          .name{
-            color:#FE7351;
+          // background:#FFFFFF url('http://newretail-static-pro-bj.oss-cn-beijing-internal.aliyuncs.com/pos/img/shiyong.png') no-repeat !important;
+          // background-position: right bottom !important;
+          .checkIcon {
+            font-size: 20px;
+            position: absolute;
+            top: 6px;
+            right: 6px;
           }
         }
       }

package/dist/components/settlement/settlementStore.js

@@ -41,7 +41,7 @@ var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _desc3, _value3, _class5, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12;
+var _desc, _value, _class, _descriptor, _descriptor2, _desc2, _value2, _class3, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _desc3, _value3, _class5, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14;
 
 var _mobx = require('mobx');
 
@@ -93,6 +93,10 @@ var _utils = require('./utils');
 
 var _tplusApi = require('tplus-api');
 
+var _cloneDeep = require('lodash/cloneDeep');
+
+var _cloneDeep2 = _interopRequireDefault(_cloneDeep);
+
 var _message = require('../message');
 
 var _message2 = _interopRequireDefault(_message);
@@ -194,6 +198,9 @@ var SettlementStore = (_class = function () {
                 if (dto.OnlinePaymentAmount) {
                     onlinePaymentAmount = dto.OnlinePaymentAmount;
                 }
+                promoVoucher.promoLinks = (0, _filter3.default)(_this2.paymode.currentMode.djqs, function (djq) {
+                    return djq.checked;
+                });
                 promoVoucher.totalAmountWithTax = Math.Minus(dto.TotalTaxAmount, onlinePaymentAmount);
                 promoVoucher.redBlueFlagEnum = "BLUE";
                 promoVoucher.meMemberId = dto.Idmember;
@@ -259,7 +266,8 @@ var SettlementStore = (_class = function () {
                             var condValue = tieredAmountResult.condValue,
                                 promoDiscount = tieredAmountResult.promoDiscount,
                                 displayText = tieredAmountResult.displayText,
-                                promoRuleId = tieredAmountResult.promoRuleId;
+                                promoRuleId = tieredAmountResult.promoRuleId,
+                                couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
 
                             if ((0, _find3.default)(_this2.paymode.currentMode.djqs, function (djq) {
                                 return djq.code == couponCode;
@@ -270,7 +278,8 @@ var SettlementStore = (_class = function () {
                             })) {
                                 _message2.default.error(Differentiate.COUPON + '\uFF08' + result.SN + '\uFF09\u4E0D\u53EF\u4E0E\u79EF\u5206\u4E00\u8D77\u4F7F\u7528');
                             } else {
-                                _this2.addDjq(couponCode, name, promoMethodEnum == "CASH_COUPON" ? nominalAmount : promoDiscount, condValue, null, false, !result.IsRepelWithPoints, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
+                                var IsEnable = couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
+                                _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) {
@@ -515,10 +524,10 @@ var SettlementStore = (_class = function () {
                                     promoId = _ref5.promoId,
                                     id = _ref5.id;
 
-                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, true);
+                                _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false, _this5.dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, null, id, true);
                                 return;
                             }
-                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
+                            _this5.addDjq(djq.CouponCode, djq.CouponTitle, true, djq.ReductionAmount, djq.EnableAmount, djq.LastTS, true, false);
                         });
                     }
                     _this5.paymode.thePaymodes.push(newmode);
@@ -667,10 +676,12 @@ var SettlementStore = (_class = function () {
         }
     }, {
         key: 'addDjq',
-        value: function addDjq(code, name, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, id, unCheck) {
+        value: function addDjq(promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id, unCheck, count) {
             var djq = {
-                code: code,
+                code: promoCouponCode,
+                promoCouponCode: promoCouponCode,
                 name: name,
+                IsEnable: IsEnable,
                 amount: amount,
                 doorsill: doorsill, //:"无门槛"
                 LastTS: LastTS,
@@ -683,9 +694,12 @@ var SettlementStore = (_class = function () {
                 discountPct: discountPct,
                 promoId: promoId,
                 promoRuleId: promoRuleId,
-                id: id
+                couponCategoryEnum: couponCategoryEnum,
+                id: id,
+                count: count === 1 && (couponCategoryEnum === 'RIGUP' || couponCategoryEnum === 'UN_MATCH' || couponCategoryEnum === "PREPARING" || couponCategoryEnum === 'PROMO_LIMITED' || couponCategoryEnum === 'COUPON_CONFLICT') ? 1 : null
             };
             this.paymode.currentMode.djqs.push(djq);
+            // let copyData = _clonedeep(this.data[targetIndex]);
             !unCheck && !this.boriginReturn && this.paymode.calcDjqValue(djq);
         }
     }, {
@@ -1502,6 +1516,7 @@ var SettlementStore = (_class = function () {
 }), _applyDecoratedDescriptor(_class.prototype, 'addDjq', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addDjq'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeClickFocusOnly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeClickFocusOnly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeValue'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPayDirectly', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPayDirectly'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'addPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'addPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'delPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'delPay'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'setDtoID', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'setDtoID'), _class.prototype)), _class);
 exports.default = SettlementStore;
 var PayMode = exports.PayMode = (_class3 = function () {
+    // @observable store = null;
     function PayMode() {
         // this.amount=getFixedNumber(amount);
         // this.calcReserved();
@@ -1527,6 +1542,10 @@ var PayMode = exports.PayMode = (_class3 = function () {
             name: "复合结算",
             hotKey: "Ctrl+M"
         };
+
+        _initDefineProp(this, 'setCouponNum', _descriptor8, this);
+
+        _initDefineProp(this, 'addDjqs', _descriptor9, this);
     } //应收
 
 
@@ -1562,14 +1581,24 @@ var PayMode = exports.PayMode = (_class3 = function () {
             this.receivable = (0, _utils.getFixedNumber)(this.amount - sum);
         }
     }, {
-        key: 'calcDjqValue',
-        value: function calcDjqValue(q1) {
+        key: 'calcDjqCheckValue',
+        value: function calcDjqCheckValue(q1, dto) {
             var _this14 = this;
 
+            var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
+            var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
+                return djq.checked;
+            });
+            if (qList.length === useLimitPerOrder && !q1.checked) {
+                _message2.default.warn('本单最多可用' + useLimitPerOrder + '张');
+                return;
+            }
+
             var _ref20 = _mutantsUtil.platform || {},
                 isNewRetailBCPos = _ref20.isNewRetailBCPos;
 
             var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
+                PayStyle = _enumController$getEn14.PayStyle,
                 Differentiate = _enumController$getEn14.Differentiate;
 
             if (q1) {
@@ -1578,22 +1607,169 @@ var PayMode = exports.PayMode = (_class3 = function () {
                     return;
                 }
                 var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
-                    return djq.code == q1.code;
+                    return djq.promoCouponCode == q1.promoCouponCode;
                 });
                 if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
                     _message2.default.error("本单金额低于使用门槛，该券不可使用。");
                     return;
                 }
                 //判断是否是选择优惠券  //CC优惠券只能使用一个
-                if (q1 && !q1.checked && isNewRetailBCPos) {
-                    // 检查是否有已经选定优惠券 并且去除选定的优惠券
-                    this.currentMode.djqs.forEach(function (djq, index) {
-                        if (djq.checked) _this14.currentMode.djqs[index].checked = false;
+                // if (q1 && !q1.checked && isNewRetailBCPos) {
+                //     // 检查是否有已经选定优惠券 并且去除选定的优惠券
+                //     this.currentMode.djqs.forEach((djq, index) => {
+                //         if (djq.checked) this.currentMode.djqs[index].checked = false;
+                //     })
+                // }
+                q && (q.checked = !q.checked);
+            }
+            var sum = 0;
+            // console.log(this.store, 'stores-------');
+            (0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
+                return djq.checked;
+            }), function (q) {
+                sum = Math.Add(sum, q.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);
+            this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
+            var promoVoucher = {};
+            promoVoucher.boName = "Retail";
+            promoVoucher.promoLinks = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
+                return djq.checked;
+            });
+            promoVoucher.meMemberId = this.currentMode.member.id;
+            promoVoucher.storeFactorId = (0, _tplusPoslogin.PosInitData)('storeID');
+            promoVoucher.voucherDetailList = [];
+            dto.RetailDetails.forEach(function (item) {
+                var detailDTO = {};
+                detailDTO.uuid = item.Code;
+                detailDTO.detailBoName = "RetailDetail";
+                detailDTO.voucherDetailId = item.ID;
+                detailDTO.productId = item.Idinventory;
+                detailDTO.uomId = item.Idunit;
+                detailDTO.productSpecId = item.ProductSpecId;
+                detailDTO.isManualFreeGift = item.IsPresent;
+                detailDTO.isListPriceIncludingTax = item.TaxFlag || true;
+
+                if (detailDTO.IsManualChangePrice) //如果是手工改价
+                    {
+                        detailDTO.listPrice = item.TaxPrice;
+                        detailDTO.netAmountWithTax = item.TaxAmount;
+                    } else {
+                    var bookingQuantity = 0;
+                    if (item.BookingQuantity) {
+                        bookingQuantity = item.BookingQuantity;
+                    }
+                    detailDTO.listPrice = item.MemberPrice;
+                    detailDTO.netAmountWithTax = Math.Multiply(item.MemberPrice, Math.Minus(item.Quantity, bookingQuantity)); //item.TaxAmount;
+                }
+                detailDTO.taxRate = item.TaxRate;
+                detailDTO.quantity = item.Quantity;
+
+                detailDTO.amountWithTax = item.RetailAmount;
+                // 促销 start
+                if (item.PromotionDetails && item.PromotionDetails.length != 0) {
+                    var promoLinks = [];
+                    item.PromotionDetails.forEach(function (promotion) {
+                        promoLinks.push({
+                            promoId: promotion.IdSalesPromotionDTO,
+                            promoRuleId: promotion.PromotionRuleId
+                        });
                     });
+                    if (promoLinks.length != 0) detailDTO.promoLinks = promoLinks;
+                }
+                // 促销 end
+                promoVoucher.voucherDetailList.push(detailDTO);
+            });
+            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;
+                        });
+
+                        var _ref21 = element || {},
+                            couponCode = _ref21.couponCode,
+                            name = _ref21.name,
+                            tieredAmountResult = _ref21.tieredAmountResult,
+                            fromDate = _ref21.fromDate,
+                            dateMount = _ref21.dateMount,
+                            promoMethodEnum = _ref21.promoMethodEnum,
+                            discountPct = _ref21.discountPct,
+                            nominalAmount = _ref21.nominalAmount,
+                            promoId = _ref21.promoId,
+                            id = _ref21.id,
+                            doorsill = _ref21.doorsill;
+
+                        var condValue = tieredAmountResult.condValue,
+                            promoDiscount = tieredAmountResult.promoDiscount,
+                            displayText = tieredAmountResult.displayText,
+                            promoRuleId = tieredAmountResult.promoRuleId,
+                            couponCategoryEnum = tieredAmountResult.couponCategoryEnum;
+
+                        if (!djq1.length) {
+                            // this.currentMode.djqs.push({
+                            //     promoCouponCode: element.CouponCode,
+                            //     name: element.CouponTitle,
+                            //     IsEnable: true,
+                            //     amount: element.ReductionAmount,
+                            //     doorsill: element.EnableAmount,
+                            //     LastTS: element.LastTS,
+                            //     checked: false,
+                            //     IsRepelWithPoints: true,
+                            //     UMemberID: dto.Idmember,
+                            //     expired: null,
+                            //     displayText,
+                            //     promoMethodEnum,
+                            //     discountPct,
+                            //     promoId,
+                            //     promoRuleId,
+                            //     couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
+                            //     id
+                            // })
+                            _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
+                        } else {
+                            _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
+                            // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
+                            // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
+                        }
+                    });
+                }
+            });
+            //this.receivable = getFixedNumber(this.receivable - sum);
+        }
+    }, {
+        key: 'calcDjqValue',
+        value: function calcDjqValue(q1) {
+            var _ref22 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+
+            var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
+                Differentiate = _enumController$getEn15.Differentiate;
+
+            if (q1) {
+                if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
+                    _message2.default.error('\u672C\u5355\u6CA1\u6709' + Differentiate.COUPON + '\u53EF\u7528\u91D1\u989D\uFF0C\u8BE5\u5238\u4E0D\u53EF\u4F7F\u7528\u3002');
+                    return;
                 }
+                var q = (0, _find3.default)(this.currentMode.djqs, function (djq) {
+                    return djq.code == q1.code;
+                });
+                if (q && !q.checked && parseFloat(this.amount) < parseFloat(q.doorsill)) {
+                    _message2.default.error("本单金额低于使用门槛，该券不可使用。");
+                    return;
+                }
+                //判断是否是选择优惠券  //CC优惠券只能使用一个
+                // if (q1 && !q1.checked && isNewRetailBCPos) {
+                //     // 检查是否有已经选定优惠券 并且去除选定的优惠券
+                //     this.currentMode.djqs.forEach((djq, index) => {
+                //         if (djq.checked) this.currentMode.djqs[index].checked = false;
+                //     })
+                // }
                 q && (q.checked = !q.checked);
             }
             var sum = 0;
+            // console.log(this.store, 'stores-------');
             (0, _each3.default)((0, _filter3.default)(this.currentMode.djqs, function (djq) {
                 return djq.checked;
             }), function (q) {
@@ -1602,6 +1778,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             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);
             this.currentMode.overchargesAmount = (0, _utils.getFixedNumber)(sum - this.currentMode.value);
+
             //this.receivable = getFixedNumber(this.receivable - sum);
         }
     }, {
@@ -1644,16 +1821,16 @@ var PayMode = exports.PayMode = (_class3 = function () {
     }, {
         key: 'setPaymodes',
         value: function () {
-            var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
+            var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
                 var _this15 = this;
 
-                var _enumController$getEn15, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
+                var _enumController$getEn16, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
 
                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                     while (1) {
                         switch (_context7.prev = _context7.next) {
                             case 0:
-                                _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn15.settleStyleType, PayStyle = _enumController$getEn15.PayStyle;
+                                _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn16.settleStyleType, PayStyle = _enumController$getEn16.PayStyle;
                                 memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
                                 param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
                                 _context7.next = 5;
@@ -1698,7 +1875,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
             }));
 
             function setPaymodes(_x5, _x6) {
-                return _ref21.apply(this, arguments);
+                return _ref23.apply(this, arguments);
             }
 
             return setPaymodes;
@@ -1740,22 +1917,65 @@ var PayMode = exports.PayMode = (_class3 = function () {
     initializer: function initializer() {
         return [];
     }
-}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
+}), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this16 = this;
+
+        return function (id, couponNum, code) {
+            _this16.currentMode.djqs.forEach(function (ele) {
+                if (ele.id === id) {
+                    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;
+                }
+            });
+        };
+    }
+}), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
+    enumerable: true,
+    initializer: function initializer() {
+        var _this17 = this;
+
+        return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
+            var djq = {
+                promoCouponCode: promoCouponCode,
+                name: name,
+                IsEnable: IsEnable,
+                amount: amount,
+                doorsill: doorsill,
+                LastTS: LastTS,
+                checked: checked,
+                IsRepelWithPoints: IsRepelWithPoints,
+                UMemberID: UMemberID,
+                expired: expired,
+                displayText: displayText,
+                promoMethodEnum: promoMethodEnum,
+                discountPct: discountPct,
+                promoId: promoId,
+                promoRuleId: promoRuleId,
+                couponCategoryEnum: couponCategoryEnum,
+                id: id
+            };
+            _this17.currentMode.djqs.push(djq);
+        };
+    }
+}), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
 var Member = exports.Member = (_class5 = function () {
     function Member(m) {
-        var _this16 = this;
+        var _this18 = this;
 
         (0, _classCallCheck3.default)(this, Member);
 
-        _initDefineProp(this, 'cardNo', _descriptor8, this);
+        _initDefineProp(this, 'cardNo', _descriptor10, this);
 
-        _initDefineProp(this, 'balance', _descriptor9, this);
+        _initDefineProp(this, 'balance', _descriptor11, this);
 
-        _initDefineProp(this, 'exchangable', _descriptor10, this);
+        _initDefineProp(this, 'exchangable', _descriptor12, this);
 
-        _initDefineProp(this, 'meStorageCardId', _descriptor11, this);
+        _initDefineProp(this, 'meStorageCardId', _descriptor13, this);
 
-        _initDefineProp(this, 'StorageCardNo', _descriptor12, this);
+        _initDefineProp(this, 'StorageCardNo', _descriptor14, this);
 
         if (m) {
             this.id = m.ID;
@@ -1766,16 +1986,16 @@ var Member = exports.Member = (_class5 = function () {
                 return key == 'canusedbalancestorage';
             });
 
-            var _ref22 = _mutantsUtil.platform || {},
-                isNewRetailBCPos = _ref22.isNewRetailBCPos;
+            var _ref24 = _mutantsUtil.platform || {},
+                isNewRetailBCPos = _ref24.isNewRetailBCPos;
 
             m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
             (0, _mobx.runInAction)(function () {
-                _this16.cardNo = m.CardCode;
+                _this18.cardNo = m.CardCode;
                 if (index >= 0) {
-                    _this16.balance = parseFloat(m.DynamicPropertyValues[index]);
+                    _this18.balance = parseFloat(m.DynamicPropertyValues[index]);
                 } else {
-                    _this16.balance = _this16.rawbalance;
+                    _this18.balance = _this18.rawbalance;
                 }
             });
             this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;
@@ -1807,19 +2027,19 @@ var Member = exports.Member = (_class5 = function () {
         }
     }]);
     return Member;
-}(), (_descriptor8 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
+}(), (_descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'cardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor9 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'balance', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor10 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'exchangable', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor11 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class5.prototype, 'meStorageCardId', [_mobx.observable], {
     enumerable: true,
     initializer: null
-}), _descriptor12 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class5.prototype, 'StorageCardNo', [_mobx.observable], {
     enumerable: true,
     initializer: null
 }), _applyDecoratedDescriptor(_class5.prototype, 'setExchangable', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setExchangable'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setCardNo'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setMeStorageCardId', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setMeStorageCardId'), _class5.prototype), _applyDecoratedDescriptor(_class5.prototype, 'setStorageCardNo', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class5.prototype, 'setStorageCardNo'), _class5.prototype)), _class5);