From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑

---
 src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html b/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html
index fa6895b..7281f70 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html
@@ -28,12 +28,18 @@
                                                 <input type="text" name="expireDay" lay-verify="required" autocomplete="off" class="layui-input" >
                                             </div>
                                             <div class="layui-form-mid">后,过期。</div>
-                                            <div class="layui-form-mid layui-word-aux">领取优惠卷开始计算过期时间。设置为0,则永不过期。</div>
                                         </div>
                                     </div>
                                 </div>
 
                                 <blockquote class="layui-elem-quote blue-border">规则</blockquote>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">满减规则:</label>
+                                    <div class="layui-input-block">
+                                        <input type="radio" name="type" value="1" title="满减卷。满100只减10"  checked/>
+                                        <input type="radio" name="type" value="2" title="累计满减卷。每满100减10" />
+                                    </div>
+                                </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label febs-form-item-require">满足:</label>
                                     <div class="layui-input-inline" style="width: 80px">
@@ -47,6 +53,17 @@
                                     <div class="layui-form-mid">(元)金额。</div>
                                     <div class="layui-form-mid layui-word-aux">满足0元减免100元,则代表100元无门槛优惠卷。</div>
                                 </div>
+
+                                <blockquote class="layui-elem-quote blue-border">商品设置</blockquote>
+                                <div class="layui-form-item coupon-rule">
+                                    <div class="layui-col-lg6">
+                                        <label class="layui-form-label febs-form-item-require">商品:</label>
+                                        <div class="layui-input-block">
+                                            <div id="coupon-rule"></div>
+                                        </div>
+                                    </div>
+                                </div>
+
                             </div>
                         </div>
                     </div>
@@ -87,9 +104,54 @@
             validate = layui.validate,
             element = layui.element;
 
+        var couponRule = xmSelect.render({
+            el: '#coupon-rule',
+            language: 'zn',
+            prop : {
+                value : 'id',
+                children : 'child'
+            },
+            iconfont: {
+                parent: 'hidden',
+            },
+            toolbar: {
+                show: true,
+            },
+            // radio: true,
+            clickClose: true,
+            tree: {
+                show: true,
+                //非严格模式
+                strict: false,
+            },
+            data: []
+        })
+
+        febs.get(ctx + 'admin/goods/goodsTreeSet', null, function(res) {
+            couponRule.update({
+                data : res.data,
+                autoRow: true,
+            });
+        })
+
         form.render();
 
+
         form.on('submit(coupon-rule-add-form-submit)', function (data) {
+            let type = data.field.type;
+            let costAmount = data.field.costAmount;
+            if(type == 2 && costAmount <= 0){
+                febs.alert.warn("累计满减卷,满足金额不能为0");
+                return false;
+            }
+            let couponRuleList = couponRule.getValue();
+            if (couponRuleList.length > 0) {
+                var couponIds = [];
+                layui.each(couponRuleList, function (key, item) {
+                    couponIds.push(item.id)
+                });
+                data.field.goodsIds=couponIds;
+            }
             $.ajax({
                 'url':ctx + 'admin/goods/couponRuleAdd',
                 'type':'post',

--
Gitblit v1.9.1