From df864d1d636751424fd642d3bdd33c53cf63500d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 07 Jul 2025 17:51:09 +0800
Subject: [PATCH] feat(mall): 为活动订单项添加积分和成长值奖 - 在活动添加和编辑页面增加积分和成长值输入字段 - 更新活动实体类,添加 scoreCnt 和 growthCnt 字段 - 修改活动订单项处理逻辑,增加积分和成长值奖励的计算和发放 - 优化活动订单项状态检查逻辑,移除冗余代码

---
 src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
index 6d6155c..df186b1 100644
--- a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
+++ b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
@@ -40,8 +40,10 @@
 
     <select id="selectApiLeaderProfitListInPage" resultType="cc.mrbird.febs.mall.entity.MallLeaderAchieve">
         select a.*,
+               b.name nickname,
                c.goods_name goodsName
         from mall_leader_achieve a
+        inner join mall_member b on a.member_id = b.id
         inner join mall_order_item c on a.order_item_id = c.id
         <where>
             a.state = 2
@@ -49,8 +51,8 @@
                 <if test="record.invitedId != null and record.invitedId != ''">
                     and a.unique_code = #{record.invitedId}
                 </if>
-                <if test="record.createdTime!=null">
-                    and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(#{record.createdTime}, '%Y-%m-%d')
+                <if test="record.createdTime != null and record.createdTime != ''">
+                    and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{record.createdTime}
                 </if>
             </if>
         </where>

--
Gitblit v1.9.1