From d8f20196fb659300b0a8eb3e7c5d7ab1ad7fcb7e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 Jan 2023 15:21:29 +0800
Subject: [PATCH] 20221227 ε
εΌε½ι
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c4419a6..f573e79 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -113,6 +113,7 @@
<result column="deliver_type" property="deliverType" />
<result column="shop_id" property="shopId" />
<result column="subsidy_amount" property="subsidyAmount" />
+ <result column="pay_trade_no" property="payTradeNo" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
<id property="id" column="item_id" />
<result property="orderId" column="order_id" />
@@ -150,10 +151,13 @@
<if test="record.query != null and record.query != ''">
and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%')))
</if>
- <if test="record.status == 4 and record.status != 0">
- and a.status = 4
+ <if test="record.status == 6 and record.status != 0">
+ and a.status = 4 and a.comment_state = 2
</if>
- <if test="record.status != 4 and record.status != 0 and record.status != 5">
+ <if test="record.status == 4 and record.status != 0">
+ and a.status = 4 and a.comment_state != 2
+ </if>
+ <if test="record.status != 4 and record.status != 0 and record.status != 5 and record.status != 6">
and a.status = #{record.status}
</if>
<if test="record.status == 5">
@@ -166,10 +170,10 @@
and a.order_type=#{record.orderType}
</if>
<if test="record.allStatus == 2">
- and a.status <![CDATA[< ]]> 4
+ and a.status <![CDATA[<= ]]> 4 and a.comment_state != 2
</if>
<if test="record.allStatus == 3">
- and a.status <![CDATA[>= ]]> 4
+ and a.status = 4 and a.comment_state = 2
</if>
</where>
order by a.created_time desc
@@ -242,7 +246,9 @@
<select id="selectTotalAmount" resultType="java.math.BigDecimal">
select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info
- where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
+ where member_id=#{memberId}
+ and status = 4
+ and comment_state = 2
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -322,11 +328,13 @@
count(a.id)
from mall_order_info a
where
+ a.status = 4
+ and a.comment_state = 2
+ and a.member_id = #{memberId}
<if test="createdTime != null">
and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
</if>
- and a.status = 4
- and a.member_id = #{memberId}
+
</select>
<select id="selectTodayAmountByCreateTimeAndMemberId" resultType="java.math.BigDecimal">
@@ -334,10 +342,21 @@
ifnull(sum(a.subsidy_amount),0)
from mall_order_info a
where
+ a.status = 4
+ and a.comment_state = 2
+ and a.member_id = #{memberId}
<if test="createdTime != null">
and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime}
</if>
- and a.status = 4
- and a.member_id = #{memberId}
+
+ </select>
+
+ <select id="selectOrderInfoByStatusAndMemberId" resultType="java.lang.Integer">
+ select
+ count(a.id)
+ from mall_order_info a
+ where
+ a.status <![CDATA[< ]]> 4
+ and a.member_id = #{memberId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1