From bcc66e6d54badf46c576017f131de9aa6b9b2f0c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 28 Dec 2022 17:26:59 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index c4419a6..db95fed 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" />
@@ -242,7 +243,7 @@
<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
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -322,11 +323,12 @@
count(a.id)
from mall_order_info a
where
+ a.status = 4
+ 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 +336,20 @@
ifnull(sum(a.subsidy_amount),0)
from mall_order_info a
where
+ a.status = 4
+ 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