From aa861e83f2a7a5f99ed30d448c129c2032b71af6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 09 May 2023 09:39:58 +0800
Subject: [PATCH] 微信支付
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 33d93b7..292b9b5 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -41,12 +41,9 @@
select
a.*,
b.name,
- b.bind_phone bindPhone,
- c.pay_method payMethod,
b.phone
from mall_money_flow a
inner join mall_member b on a.member_id=b.id
- left join mall_order_info c on a.order_no = c.order_no
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -56,10 +53,13 @@
and b.phone like concat('%', #{record.phone},'%')
</if>
<if test="record.type!=null and record.type!=''">
- and a.type like concat('%', #{record.type},'%')
+ and a.type =#{record.type}
+ </if>
+ <if test="record.orderNo!=null and record.orderNo!=''">
+ and a.order_no like concat('%', #{record.orderNo},'%')
</if>
<if test="record.flowType!=null and record.flowType!=''">
- and a.flow_type like concat('%', #{record.flowType},'%')
+ and a.flow_type = #{record.flowType}
</if>
</if>
</where>
@@ -72,8 +72,13 @@
a.created_time createdTime,
a.amount amount,
a.amount_fee amountFee,
+ (a.amount-a.amount_fee) amountReal,
a.withdraw_no withdrawNo,
+ a.remark remark,
a.status status,
+ a.type type,
+ a.score_cnt scoreCnt,
+ a.score_price scorePrice,
b.name,
b.bind_phone bindPhone,
b.phone
@@ -89,6 +94,9 @@
</if>
<if test="record.status!=null and record.status!=''">
and a.status = #{record.status}
+ </if>
+ <if test="record.type!=null and record.type!=''">
+ and a.type = #{record.type}
</if>
</if>
</where>
@@ -115,7 +123,7 @@
<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,17) and member_id=#{memberId}
+ where flow_type = #{flowType} and member_id = #{memberId} and amount > 0
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -131,4 +139,14 @@
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
and type in (2,3,4)
</select>
+
+ <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
+ select
+ a.*,
+ b.name fromMemberName
+ from mall_money_flow a
+ left join mall_member b on a.member_id = b.id
+ where a.order_no = #{record.orderNo}
+ order by a.CREATED_TIME desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1