From ec00cb3e936147ae1c080cbb5d723ef368a3d2da Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 16:51:02 +0800
Subject: [PATCH] fix(mapper): 调整对话记录查询条件 - 移除了AiMemberTalkItemMapper中对state=1的限制 - 在AiMemberTalkMapper中增加了state=1的过滤条件 - 优化了对话记录的查询逻辑,确保数据准确性 - 统一了前后端对于对话状态的处理方式 - 提高了查询效率,减少了不必要的数据加载 - 保证了对话列表按创建时间倒序排列的正确性

---
 src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 c8ce3c3..7281f70 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsCouponAdd.html
@@ -34,6 +34,13 @@
 
                                 <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">
                                         <input type="text" name="costAmount" lay-verify="required" autocomplete="off" class="layui-input" >
@@ -131,6 +138,12 @@
 
 
         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 = [];

--
Gitblit v1.9.1