From ae0a1bdde246c8b0231dd07a99ecb9b965b6d0b6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 18 Nov 2021 11:39:21 +0800
Subject: [PATCH] fix
---
gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml | 78 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
index f9a450d..60b288c 100644
--- a/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/JhyOrderMapper.xml
@@ -9,21 +9,33 @@
,a.username
,CONCAT(a.area, a.address) address
,a.longitude
+ ,a.unit_name unitName
+ ,a.house_number houseNumber
,a.latitude
,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 user_id=#{record.userId}
+ and a.user_id=#{record.userId}
</if>
<if test="record.type == 2">
<if test="record.status != 1">
- and jhy_id=#{record.userId}
+ and a.jhy_id=#{record.userId}
</if>
</if>
<if test="record.status != null and record.status != ''">
@@ -31,5 +43,67 @@
</if>
</where>
group 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
+ <if test="type == 2">
+ and user_id=#{userId}
+ </if>
+ </where>
+ group by status
+ union all
+ select
+ status,
+ count(1) cnt
+ from xzx_jhy_order
+ <where>
+ <if test="type == 1">
+ and jhy_id=#{userId}
+ </if>
+ <if test="type == 2" >
+ and user_id=#{userId}
+ </if>
+ </where>
+ group by status
+ </select>
+
+ <select id="selectJhyOrderListByStatus" resultType="com.xzx.gc.entity.JhyOrder">
+ select * from xzx_jhy_order
+ where user_id=#{userId} and status in
+ <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </select>
+
+ <select id="selectJhyOrderNoWaitAndCancel" resultType="com.xzx.gc.entity.JhyOrder">
+ select * from xzx_jhy_order
+ where status not in (1, 2, 5) and user_id=#{userId}
+ </select>
+
+ <select id="selectInviteUserOrderList" resultType="com.xzx.gc.order.vo.InviteUserOrderVo">
+ select
+ c.order_no orderNo,
+ from_base64(b.nick_name) username,
+ b.mobile_phone phone,
+ c.username orderName,
+ c.phone orderPhone,
+ concat(c.reserve_date, ' ', c.reserve_time) time,
+ concat(area, address) address,
+ group_concat(d.title) recycleType,
+ c.status status,
+ sum(d.score) score
+ from xzx_user_share_info a
+ inner join xzx_user_info b on a.register_mobile_phone=b.mobile_phone
+ inner join xzx_jhy_order c on b.user_id=c.user_id
+ inner join xzx_jhy_order_items d on c.id=d.order_id
+ where a.mobile_phone=#{record.phone}
+ group by c.order_no
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1