From 38d547d91d7eee81ed56ca6ceba7fd393952a082 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:12:15 +0800
Subject: [PATCH] feat(sign): 增加签到获得会员经验或积分的功能 - 在 ApiSignVo 中添加 mostSignIn 字段，用于区分签到获得的类型 - 在 ScoreFlowTypeEnum 中新增 SIGN_EXPERIENCE 和 SIGN_SCORE 类型 - 修改 ScoreServiceImpl 中的签到逻辑，支持获得会员经验和积分 - 更新 ScoreSettingDto，添加 mostSignIn 字段用于配置签到获得类型 - 在前端设置页面添加签到获得类型的选项

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml |   44 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 852ed90..ecde786 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -5,10 +5,11 @@
     <select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
         select
         a.*,
-               b.cost_amount costAmount,
-               b.real_amount realAmount
+        b.cost_amount costAmount,
+        b.real_amount realAmount,
+        b.type type
         from mall_member_coupon a
-        left join mall_goods_coupon b on b.id = a.coupon_id
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
         <where>
             a.member_id=#{record.memberId}
             <if test="record.state == 1">
@@ -28,6 +29,25 @@
         order by a.CREATED_TIME desc
     </select>
 
+    <select id="selectListCreateInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
+        select
+        a.*,
+        b.cost_amount costAmount,
+        b.type type,
+        b.real_amount realAmount
+        from mall_member_coupon a
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        where
+            a.member_id=#{record.memberId}
+                and a.state=#{record.state}
+                and a.expire_time &gt;= #{record.expireTime}
+        and a.coupon_id in
+        <foreach collection = "list" item = "item"  separator=","  open = "(" close = ")" >
+            #{item}
+        </foreach >
+        order by a.CREATED_TIME desc
+    </select>
+
     <select id="selectListByExpireTime" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
         select
             a.*
@@ -47,4 +67,22 @@
         and a.state = 1
     </select>
 
+    <select id="selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.member_id = #{memberId}
+        and a.goods_id = #{goodsId}
+        and a.state = 1
+    </select>
+
+    <select id="selectListByMemberIdCouponIdWithOutInviteId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.member_id = #{memberId}
+        and a.coupon_id = #{couponId}
+        and a.state = 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1