From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

---
 gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 41526d6..06723f7 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -10,6 +10,7 @@
                b.nick_name name,
                b.mobile_phone phone,
                d.express_com expressCom,
+               d.address expressAddress,
                d.express_no expressNo
         FROM
         xzx_score_order a
@@ -126,4 +127,19 @@
             and user_id=#{userId}
         </if>
     </select>
+
+
+    <select id="selectGoodsQuotaTime" resultType="java.lang.Integer">
+        SELECT
+            IFNULL(SUM(a.cnt), 0)
+        FROM
+            xzx_score_order a
+                LEFT JOIN xzx_score_order_details b ON b.order_id = a.id
+        WHERE
+            a. STATUS IN (1, 2, 3, 4, 5)
+          and a.user_id = #{userId}
+          AND b.goods_id = #{goodsId}
+          and a.CREATED_TIME &gt;= qgStartTime
+          and a.CREATED_TIME &lt;= qgEndTime
+    </select>
 </mapper>

--
Gitblit v1.9.1