From ae21df72cd3acbc8eb2ec4b9e55529ca9d02498c Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 14 Jul 2021 10:11:04 +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 | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml index f6aaa45..c9d3c40 100644 --- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml @@ -12,8 +12,9 @@ a.reserve_time reserveTime, a.status status, a.remark remark, - b.nick_name name, + a.username name, b.mobile_phone mobilePhone, + 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 @@ -32,7 +33,7 @@ and d.username like concat('%',#{record.jwyName},'%') </if> <if test="record.account != null and record.account != ''"> - and ( b.nick_name 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"> @@ -72,6 +73,30 @@ 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> </mapper> -- Gitblit v1.9.1