From e64ac50998ba5fe69bac4baa667d0f5a216bc670 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 19 May 2022 18:17:11 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index aa3e5b0..6707604 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -233,6 +233,25 @@
         </if>
     </select>
 
+    <select id="selectTotalAmountUnCostForDate" resultType="java.math.BigDecimal">
+        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 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>
+        <if test="date != null and type == 'D'">
+            and date_format(a.receving_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+        </if>
+        <if test="date != null and type == 'M'">
+            and date_format(a.receving_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
+        </if>
+        <if test="date != null and type == 'Y'">
+            and date_format(a.receving_time, '%Y') = date_format(#{date}, '%Y')
+        </if>
+    </select>
+
     <select id="selectByOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
         select * from mall_order_info where order_no=#{orderNo}
     </select>

--
Gitblit v1.9.1