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/MallMemberMapper.xml | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 7cf3420..307315a 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -53,34 +53,35 @@
<where>
<if test="record != null" >
<if test="record.birthdayQuery!=null">
- and date_format(m.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
+ and date_format(a.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
</if>
<if test="record.name!=null and record.name!=''">
- and m.name like concat('%', #{record.name},'%')
+ and a.name like concat('%', #{record.name},'%')
</if>
- <if test="record.account!=null and record.account!=''">
- and (
- m.phone like concat('%', #{record.account},'%')
- or m.email like concat('%', #{record.account},'%')
- or m.bind_phone like concat('%', #{record.account},'%')
- or m.invite_id like concat('%', #{record.account},'%')
- )
+ <if test="record.phone!=null and record.phone!=''">
+ and a.phone like concat('%', #{record.phone},'%')
</if>
<if test="record.accountStatus!=null">
- and m.account_status = #{record.accountStatus}
+ and a.account_status = #{record.accountStatus}
+ </if>
+ <if test="record.director!=null">
+ and a.director = #{record.director}
+ </if>
+ <if test="record.storeMaster!=null">
+ and a.store_master = #{record.storeMaster}
</if>
<if test="record.accountType != null" >
- and m.account_type = #{record.accountType}
+ and a.account_type = #{record.accountType}
</if>
<if test="record.level!=null and record.level!=''">
- and m.level=#{record.level}
+ and a.level=#{record.level}
</if>
- <if test="record.isSale!=null and record.isSale!=''">
- and m.is_sale=#{record.isSale}
+ <if test="record.checkOrder!=null">
+ and a.check_order=#{record.checkOrder}
</if>
</if>
</where>
- GROUP BY m.id order by m.CREATED_TIME desc
+ GROUP BY a.id order by a.CREATED_TIME desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
--
Gitblit v1.9.1