From e83a86dafca1dac779c1fecdbead60be1a2457de Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Jun 2022 15:54:25 +0800
Subject: [PATCH] 20220528
---
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index f85e7e5..449790c 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -96,6 +96,7 @@
<result column="longitude" property="longitude" />
<result column="latitude" property="latitude" />
<result column="order_type" property="orderType" />
+ <result column="carriage" property="carriage" />
<result column="remark" property="remark" />
<result column="del_flag" property="delFlag" />
<collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">
@@ -219,7 +220,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 = 4
+ where member_id=#{memberId} and status in (2, 3, 4) and order_type=1
</select>
<select id="selectTotalAmountForDate" resultType="java.math.BigDecimal">
@@ -237,7 +238,7 @@
select IFNULL(sum(IFNULL(b.amount,0) - IFNULL(b.cost_price*b.cnt, 0)),0)
from mall_order_info a
inner join mall_order_item b on a.id=b.order_id
- where status = 4
+ where a.status in (2, 3, 4) and a.is_normal = 2 and a.order_type=1
<if test="member != null">
and member_id=#{memberId}
</if>
--
Gitblit v1.9.1