From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 f08e8b0..038ebd0 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -68,6 +68,8 @@
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
@@ -218,10 +220,10 @@
<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
SELECT
- a.user_id userId,
+ b.open_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- b.binding_parent_time createTime,
+ a.create_time createTime,
a.apply_way applyWay,
(select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = a.user_id) doneNum
FROM
@@ -243,14 +245,14 @@
</select>
<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
SELECT
- a.user_id userId,
+ b.open_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- b.binding_parent_time createTime,
+ 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
+ LEFT JOIN biz_user b ON b.open_id = a.user_id
<where>
a.company_id = #{record.companyId}
AND b.is_sales = 1
@@ -277,10 +279,12 @@
b.avatar_url avatarUrl,
c.order_no orderNo,
c.order_money orderMoney,
- (select s.store_name from shop_store s where s.store_id = c.store_id) storeName
+ c.order_status orderState,
+ f.shop_name storeName
from shop_salesman_order a
left join biz_user b on b.open_id=a.user_id
left join shop_order c on a.order_id=c.id
+ LEFT JOIN sys_shop_info f on f.id = c.store_id
<where>
a.sales_user_id = #{record.userId}
<if test="record.orderType != null and record.orderType != ''">
--
Gitblit v1.9.1