From ed2cee07122c08c88fc41d6f251a9169bf4eb407 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 8 Aug 2025 17:02:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=BE=AE=E4=BF=A1=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8):=20=E4=BC=98=E5=8C=96=E6=B5=B7=E6=8A=A5=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=E5=92=8C=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将imageUpload替换为oss-image-upload组件并限制上传数量
- 移除新用户优惠券的条件判断，使所有用户可见
- 修复WechatStockMapper中coupon_poster字段的SQL语法错误
- 调整字段顺序并修复重复的discount_percent映射
---
 CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue   | 2 +-
 .../src/main/java/com/cyl/h5/controller/H5CouponController.java      | 4 ++--
 .../src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml | 1 +
 ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
index 5693a4e..4dead73 100644
--- a/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
+++ b/CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
@@ -271,7 +271,7 @@
         </el-form-item>
 
           <el-form-item label="海报" prop="couponPoster">
-              <imageUpload v-model="form.couponPoster"/>
+            <oss-image-upload v-model="form.couponPoster" :limit="1"></oss-image-upload>
           </el-form-item>
 
 <!--        <el-form-item label="折扣类型" prop="discountType">-->
diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java
index 6755fc9..e2f0f28 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java
@@ -82,13 +82,13 @@ public class H5CouponController extends BaseController
         Integer integer = orderMapper.selectCount(Wrappers.
                 <Order>lambdaQuery()
                 .eq(Order::getMemberId, member.getId()));
-        if (integer == 0){
+//        if (integer == 0){
             //新用户
             WechatStock newUserCoupon = h5CouponService.getNewUserCoupon();
             if (newUserCoupon != null){
                 list.add(0, newUserCoupon);
             }
-        }
+//        }
 
         for (WechatStock stock : list) {
             stock.setAlreadyReceived(wechatMemberCouponMapper.selectCount(
diff --git a/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml b/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml
index 79920dd..8c1eba6 100644
--- a/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml
+++ b/ruoyi-mall/src/main/resources/mapper/marketing/WechatMemberCouponMapper.xml
@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="discountAmount" column="discount_amount"/>
         <result property="transactionMinimum" column="transaction_minimum"/>
         <result property="discountPercent" column="discount_percent"/>
+        <result property="discountPercent" column="discount_percent"/>
     </resultMap>
 
     <sql id="selectWechatMemberCouponVo">
diff --git a/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml b/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml
index d646a71..52cfcd9 100644
--- a/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml
+++ b/ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml
@@ -105,8 +105,8 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_
             <if test="sendType != null and sendType != ''">send_type,</if>
             <if test="discountType != null and discountType != ''">discount_type,</if>
             <if test="eventType != null and eventType != ''">event_type,</if>
-            <if test="couponPoster != null and couponPoster != ''">coupon_poster,</if>
             <if test="giveNum != null and giveNum != ''">give_num,</if>
+            <if test="couponPoster != null and couponPoster != ''">coupon_poster,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -135,8 +135,8 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_
             <if test="sendType != null and sendType != ''">#{sendType},</if>
             <if test="discountType != null and discountType != ''">#{discountType},</if>
             <if test="eventType != null and eventType != ''">#{eventType},</if>
-            <if test="couponPoster != null and couponPoster != ''">couponPoster,</if>
             <if test="giveNum != null and giveNum != ''">giveNum,</if>
+            <if test="couponPoster != null and couponPoster != ''">#{couponPoster},</if>
          </trim>
     </insert>
 
@@ -168,6 +168,7 @@ create_by, create_time, update_by, update_time, send_type, discount_type, event_
             <if test="sendType != null and sendType != ''">send_type = #{sendType},</if>
             <if test="discountType != null and discountType != ''">discount_type = #{discountType},</if>
             <if test="eventType != null and eventType != ''">event_type = #{eventType},</if>
+            <if test="couponPoster != null and couponPoster != ''">coupon_poster = #{couponPoster},</if>
         </trim>
         where id = #{id}
     </update>