From 00a8e2f76d02cfc17ca9ff156aa97f85bae5897d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 09 Aug 2021 16:50:55 +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/JhyOrderMapper.xml | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index c29fbfb..63f30d0 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,14 +12,16 @@
a.reserve_time reserveTime,
a.status status,
a.remark remark,
- b.nick_name name,
+ a.username name,
b.mobile_phone mobilePhone,
- (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ d.mobile jhyMobilePhone,
+ (select ifnull(sum(score),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
d.username username
FROM
xzx_jhy_order a
left join xzx_user_info b on b.user_id = a.user_id
- left join xzx_jhy_info d on d.id = a.jhy_id
+ left join xzx_jhy_info d on d.user_id = a.jhy_id
WHERE 1 = 1
<if test="record.orderNo != null and record.orderNo != ''">
and a.order_no like concat('%',#{record.orderNo},'%')
@@ -27,16 +29,19 @@
<if test="record.status != null and record.status != ''">
and a.status = #{record.status}
</if>
+ <if test="record.jwyName != null and record.jwyName != ''">
+ and d.username like concat('%',#{record.jwyName},'%')
+ </if>
<if test="record.account != null and record.account != ''">
- and ( b.nick_name like concat('%',#{record.account},'%')
- or b.mobile_phone like concat('%',#{record.account},'%') )
+ and ( a.username like concat('%',#{record.account},'%')
+ or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
</if>
<if test="record.reserveTimeStart != null">
- and a.reserve_time >= #{record.reserveTimeStart}
+ and a.reserve_date >= #{record.reserveTimeStart}
</if>
<if test="record.reserveTimeEnd != null">
- and a.reserve_time <= #{record.reserveTimeEnd}
+ and a.reserve_date <= #{record.reserveTimeEnd}
</if>
order by a.CREATED_TIME desc
</select>
@@ -64,10 +69,38 @@
FROM
xzx_jhy_order a
left join xzx_user_info b on b.user_id = a.user_id
- left join xzx_jhy_info d on d.id = a.jhy_id
+ left join xzx_jhy_info d on d.user_id = a.jhy_id
WHERE a.id=#{id}
</select>
+ <select id="selectJhyOrderTitleStatistics" resultType="java.util.Map">
+ select d.title title, sum(b.weight) weight
+ from xzx_jhy_order a
+ inner join xzx_jhy_order_items b on a.id=b.order_id
+ inner join xzx_sys_environmental_info c on b.item_type=c.id
+ inner join xzx_sys_environmental_info d on c.parent_id = d.id
+ where a.status in (3, 4)
+ <if test="userId != null and userId != ''">
+ and a.user_id=#{userId}
+ </if>
+ group by d.title
+ </select>
+ <select id="selectJhyOrderCnt" resultType="java.lang.Integer">
+ 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>
+ </select>
+ <select id="selectTotalScoreHasGet" resultType="java.math.BigDecimal">
+ select IFNULL(SUM(b.score), 0) from xzx_jhy_order a
+ inner join xzx_jhy_order_items b on a.id=b.order_id
+ where a.user_id=#{userId}
+ </select>
+
+ <select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
+ select * from xzx_jhy_info where id = #{jhyId}
+ </select>
</mapper>
--
Gitblit v1.9.1