From 0a16ffd3e627278bc317109ef7102f5673a1242d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Mar 2021 16:24:10 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 d0d85cf..c2261ad 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -46,7 +46,9 @@
shop_salesman_order b
WHERE
b.user_id = a.open_id
+ and order_status=2
AND b.sales_user_id = #{openId}
+
) AS revenueAmount,
( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount
FROM
@@ -58,13 +60,15 @@
<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
SELECT
- a.user_id userId
+ a.user_id userId,
+ b.nick_name nickname,
+ (SELECT s.nick_name from biz_user s where s.user_id = a.parent_user_id) parentUser,
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
<where>
- and a.company_id=#{record.companyId}
+ a.company_id=#{record.companyId}
<if test="record.shenheState != null and record.shenheState != ''">
and a.apply_status=#{record.shenheState}
</if>
@@ -82,7 +86,7 @@
shop_salesman_apply a
LEFT JOIN biz_user b ON a.user_id = b.user_id
<where>
- and a.company_id = #{record.companyId}
+ a.company_id = #{record.companyId}
and a.apply_status = #{record.applyStatus}
<if test="record.nickName != null and record.nickName != ''">
and b.nick_name like concat('%',#{record.nickName},'%')
@@ -93,5 +97,25 @@
a.${record.sort} ${record.order}
</if>
</select>
+ <select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
+ SELECT
+ a.user_id userId,
+ a.nick_name nickName
+ FROM
+ biz_user a
+ LEFT JOIN shop_salesman_apply b ON a.user_id = b.user_id
+ <where>
+ a.company_id = #{record.companyId}
+ and a.is_sales != 1
+ and b.apply_status != 1
+ <if test="record.nickName != null and record.nickName != ''">
+ and a.nick_name like concat('%',#{record.nickName},'%')
+ </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