From b0ee5ab18f8242d0ca81966c07db00e0c6274831 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 14 Mar 2021 07:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 101 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index d49a599..60c4479 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -61,16 +61,34 @@
<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
SELECT
a.user_id userId,
+ b.avatar_url avatarUrl,
b.nick_name nickname,
- (SELECT s.nick_name from biz_user s where s.user_id = a.parent_user_id) parentUser,
+ (SELECT s.nick_name FROM biz_user s
+ WHERE s.open_id = a.parent_user_id ) parentUser,
+ ( SELECT COUNT(*) FROM biz_user
+ WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+ ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+ WHERE user_id = a.user_id AND order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
+ ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+ WHERE user_id = a.user_id AND order_status = 1 AND sales_user_id = a.user_id ) balance,
+ g.NAME grade,
+ a.create_time createTime,
+ a.apply_status applyStatus,
+ a.apply_way applyWay
FROM
shop_salesman_apply a
- LEFT JOIN biz_user b ON a.user_id = b.user_id
- LEFT JOIN shop_salesman_grade g ON b.salesman_grade = g.id
+ LEFT JOIN biz_user b ON a.user_id = b.open_id
+ LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
<where>
a.company_id=#{record.companyId}
<if test="record.shenheState != null and record.shenheState != ''">
and a.apply_status=#{record.shenheState}
+ </if>
+ <if test="record.salemanGrade != null and record.salemanGrade != ''">
+ and a.grade_id=#{record.salemanGrade}
+ </if>
+ <if test="record.userName != null and record.userName != ''">
+ and b.nick_name like concat('%',#{record.userName},'%')
</if>
</where>
<if test="record.sort !=null">
@@ -99,11 +117,11 @@
</select>
<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
SELECT
- a.user_id userId,
+ a.open_id userId,
a.nick_name nickName
FROM
biz_user a
- LEFT JOIN shop_salesman_apply b ON a.user_id = b.user_id
+ LEFT JOIN shop_salesman_apply b ON a.open_id = b.user_id
<where>
a.company_id = #{record.companyId}
and a.is_sales != 1
@@ -174,4 +192,82 @@
</select>
+ <select id="selectShopSalesmanDetailByOpenId" resultType="com.matrix.system.fenxiao.vo.SalesmanBasicDetailVo">
+ SELECT
+ a.user_id userId,
+ b.avatar_url avatarUrl,
+ b.nick_name nickname,
+ g.NAME grade,
+ b.phone_number phone,
+ (SELECT s.nick_name FROM biz_user s
+ WHERE s.open_id = a.parent_user_id ) parentUser,
+ ( SELECT COUNT(*) FROM biz_user
+ WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+ ( SELECT COUNT(*) FROM biz_user
+ WHERE parent_open_id = a.user_id AND is_sales = 1 ) invitedNum,
+ ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+ WHERE user_id = a.user_id AND order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
+ ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+ WHERE user_id = a.user_id AND order_status = 1 AND sales_user_id = a.user_id ) balance,
+ a.create_time createTime,
+ a.apply_status applyStatus,
+ a.apply_way applyWay
+ FROM
+ shop_salesman_apply a
+ LEFT JOIN biz_user b ON a.user_id = b.open_id
+ LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
+ <where>
+ a.company_id=#{companyId} and a.user_id = #{userId}
+ </where>
+ </select>
+
+ <select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
+ SELECT
+ a.user_id userId,
+ b.avatar_url avatarUrl,
+ b.nick_name nickname,
+ a.create_time createTime,
+ a.apply_way applyWay
+ FROM
+ shop_salesman_apply a
+ LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+
+ <where>
+ a.company_id = #{record.companyId}
+ AND b.is_sales != 1
+ and b.parent_open_id = #{record.userId}
+ <if test="record.userName != null and record.userName != ''">
+ and b.nick_name like concat('%',#{record.userName},'%')
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
+ <select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
+ SELECT
+ a.user_id userId,
+ b.avatar_url avatarUrl,
+ b.nick_name nickname,
+ a.create_time createTime,
+ a.apply_way applyWay
+ FROM
+ shop_salesman_apply a
+ LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+
+ <where>
+ a.company_id = #{record.companyId}
+ AND b.is_sales = 1
+ and b.parent_open_id = #{record.userId}
+ <if test="record.userName != null and record.userName != ''">
+ and b.nick_name like concat('%',#{record.userName},'%')
+ </if>
+ </where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1