From fced9fc9ee879552238a1c83f884c7fa61ba6c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 15:14:22 +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 | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 2771b0f..bda3822 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -6,6 +6,7 @@
SELECT
a.*,
a.CREATED_TIME createTime,
+ ifnull(a.is_finish,2) isFinish,
b.nick_name name,
b.mobile_phone phone,
d.express_com expressCom,
@@ -88,13 +89,13 @@
IFNULL(count(1), 0) totalBuy,
IFNULL(sum(IFNULL(total_price,0)),0) totalPrice,
(
- select IFNULL(count(1),0) from xzx_jhy_order where status = 3
+ select IFNULL(count(1),0) from xzx_jhy_order where status in (3, 4)
<if test="userId != null and userId != ''">
and user_id=#{userId}
</if>
) totalOrder
from xzx_score_order
- where status=3
+ where status in (3, 4)
<if test="userId != null and userId != ''">
and user_id=#{userId}
</if>
--
Gitblit v1.9.1