From 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 11:24:30 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index 10af1a9..01997c5 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -13,13 +13,20 @@
,a.weight
,a.status
,a.remark
+ ,date_format(a.receiving_time, '%Y-%m-%d %H:%i') receivingTime
,CONCAT(a.reserve_date, ' ', a.reserve_time) reserveTime
,GROUP_CONCAT(b.title) items
+ ,sum(b.score) recycleScore
+ ,IFNULL(SUM(case when d.item_unit = '台' then b.weight
+ else 0 end), 0) recycleTai
+ ,IFNULL(SUM(case when d.item_unit = 'kg' then b.weight
+ else 0 end), 0) recycleKg
,c.username jhyName
,c.mobile jhyPhone
from xzx_jhy_order a
inner join xzx_jhy_order_items b on a.id=b.order_id
left join xzx_jhy_info c on a.jhy_id=c.user_id
+ left join xzx_sys_environmental_info d on b.item_type = d.id
<where>
<if test="record.type == 1">
and a.user_id=#{record.userId}
@@ -34,6 +41,20 @@
</if>
</where>
group by a.id
- order by a.id
+ order by a.receiving_time desc, a.id desc
+ </select>
+
+ <select id="selectOrderStatusCount" resultType="com.xzx.gc.order.vo.JhyStatusCountVo">
+ select
+ status,
+ count(1) cnt
+ from xzx_jhy_order where status=1
+ union all
+ select
+ status,
+ count(1) cnt
+ from xzx_jhy_order
+ where user_id=#{userId}
+ group by status
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1