From ee98d0782c94e000fe2c2524d1957f67c6a5e70b Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 12 May 2022 18:08:18 +0800 Subject: [PATCH] add apply --- src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml index 4250bd6..b29b561 100644 --- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml +++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml @@ -18,14 +18,20 @@ left join mall_member b on a.rt_member_id=b.id left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL' <where> - <if test="record.type == 3"> + <if test="record.inOrOut == 3"> and a.amount > 0 </if> - <if test="record.type == 2"> + <if test="record.inOrOut == 2"> and 0 > a.amount </if> <if test="record.memberId != null"> and a.member_id=#{record.memberId} + </if> + <if test="record.flowType != null and record.flowType != ''"> + and a.flow_type=#{record.flowType} + </if> + <if test="record.type != null and record.type != ''"> + and a.type=#{record.type} </if> </where> order by a.created_time desc @@ -35,6 +41,7 @@ select a.*, b.name, + b.bind_phone bindPhone, c.pay_method payMethod, b.phone from mall_money_flow a @@ -60,6 +67,7 @@ select a.*, b.name, + b.bind_phone bindPhone, b.phone from mall_money_flow a inner join mall_member b on a.member_id=b.id @@ -79,4 +87,32 @@ </where> order by a.created_time desc </select> + + <select id="selectMoneyFlowProfitByDate" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow"> + select a.member_id, sum(a.amount) amount from mall_money_flow a + where a.type in (1, 2) and date_format(a.created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d') + and is_return is null + group by a.member_id; + </select> + + <update id="updateIsReturnByMemberId"> + update mall_money_flow + set is_return=#{isReturn} + where member_id=#{memberId} and type in (1, 2) + </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> + + <select id="selectCommissionIncome" resultType="java.math.BigDecimal"> + select ifnull(sum(amount),0) from mall_money_flow + where flow_type=4 and amount > 0 and member_id=#{memberId} + <if test="type == 1"> + and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d') + </if> + <if test="type == 2"> + and date_format(created_time, '%Y-%m') = date_format(#{date}, '%Y-%m') + </if> + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1