From 86579f21ded7a639f9d6edcf3becdf51dc3a3e41 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Dec 2022 11:57:14 +0800
Subject: [PATCH] 20221219 1、创建订单增加商品ID的入参 2、增加每日购买次数和购买商品会员等级判断 3、注册会员，设置了会员等级 4、商品接口增加了补贴金额和星级字段，增加总评价数量和总评价星数
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 2efb9bc..8b00702 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -68,14 +68,19 @@
<select id="getMoneyChargeListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyChargeListVo">
select
- a.*,
+ a.id id,
+ a.created_time createdTime,
+ a.amount amount,
+ a.amount_fee amountFee,
+ a.withdraw_no withdrawNo,
+ a.remark remark,
+ a.status status,
b.name,
b.bind_phone bindPhone,
b.phone
- from mall_money_flow a
+ from mall_member_withdraw a
inner join mall_member b on a.member_id=b.id
<where>
- a.type = 6
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
@@ -105,12 +110,13 @@
</update>
<select id="selectProfitByDateAndMemberId" resultType="java.math.BigDecimal">
- select ifnull(sum(a.amount),0) from mall_money_flow a where member_id=#{memberId} and type in (1,2) and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d');
+ select ifnull(sum(a.amount),0) from mall_money_flow a
+ where member_id=#{memberId} and flow_type=4 and date_format(a.CREATED_TIME, '%Y-%m-%d') = date_format(now(), '%Y-%m-%d') and amount > 0
</select>
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where flow_type =4 and type in (1,2,3,4,5,6,7,15,16) and member_id=#{memberId}
+ where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
--
Gitblit v1.9.1