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/MallRefundMapper.xml | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index 96814b7..5bb7a9b 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -4,8 +4,11 @@
<select id="selectByItemIdAndOrderIdAndState" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
- select a.* from mall_refund a
- where item_id=#{itemId} and order_id=#{orderId} and state=#{state}
+ select a.*,
+ c.cnt
+ from mall_refund a
+ inner join mall_order_info b on a.order_id = b.id
+ inner join mall_order_item c on a.item_id = c.id
<where>
<if test="itemId != null and itemId != ''">
and a.item_id = #{itemId}
@@ -17,16 +20,34 @@
and a.state = #{state}
</if>
</where>
-
+ order by a.CREATED_TIME desc
</select>
<select id="getOrderRefundListInPage" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
- select a.* from mall_refund a
+ select a.*,
+ b.order_time orderTime,
+ b.order_no orderNo,
+ b.status,
+ c.id itemId,
+ c.goods_name goodsName,
+ c.cnt,
+ d.name refundMemberName,
+ d.phone refundMemberPhone
+ from mall_refund a
+ inner join mall_order_info b on a.order_id = b.id
+ inner join mall_order_item c on a.item_id = c.id
+ inner join mall_member d on a.member_id = d.id
<where>
<if test="record != null" >
<if test="record.state!=null and record.state!=''">
and a.state = #{record.state}
</if>
+ <if test="record.refundMemberName!=null and record.refundMemberName!=''">
+ and d.name like concat('%',#{record.refundMemberName},'%')
+ </if>
+ <if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
+ and d.phone like concat('%',#{record.refundMemberPhone},'%')
+ </if>
</if>
</where>
order by a.CREATED_TIME desc
--
Gitblit v1.9.1