From 47e03d0aa72b6bd1c62c4ecff0c25289890f7abc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 12 Feb 2025 10:49:17 +0800
Subject: [PATCH] refactor(mall): 根据系统配置选择不同的物流服务接口 - 在 AdminMallOrderService 和 CommonService 中添加了根据系统配置选择物流服务接口的逻辑 - 新增了 SENDER_STATE 数据字典项，用于控制使用测试环境还是生产环境的物流服务 - 根据系统配置，选择不同的 ClientParamEnum 实例来调用
---
src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
index 5959604..df186b1 100644
--- a/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
+++ b/src/main/resources/mapper/modules/MallLeaderAchieveMapper.xml
@@ -5,7 +5,7 @@
<select id="selectListByStateAndCreateTimeAndUniqueCode" resultType="java.util.Map">
select
a.unique_code uniqueCode,
- IFNULL(sum(a.amount),0) amount
+ IFNULL(sum(a.profit_amount),0) profitAmount
from mall_leader_achieve a
where a.state = #{state}
and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(#{offsetDay}, '%Y-%m-%d')
@@ -29,8 +29,8 @@
<if test="state!=null and state!=''">
and a.state = #{state}
</if>
- <if test="DateTime!=null and DateTime!=''">
- and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(#{DateTime}, '%Y-%m-%d')
+ <if test="date!=null">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
<if test="uniqueCode!=null and uniqueCode!=''">
and a.unique_code = #{uniqueCode}
@@ -38,4 +38,25 @@
</where>
</select>
+ <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
+ <if test="record != null">
+ <if test="record.invitedId != null and record.invitedId != ''">
+ and a.unique_code = #{record.invitedId}
+ </if>
+ <if test="record.createdTime != null and record.createdTime != ''">
+ and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{record.createdTime}
+ </if>
+ </if>
+ </where>
+ GROUP BY a.id order by a.created_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1