From 05fcfa75d9bcd29f44c5a28d1a665a496347dce1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 13 Aug 2021 14:43:16 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 121 +++++++++++++++++++---------------------
1 files changed, 58 insertions(+), 63 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 ae87aa8..1d001af 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -38,23 +38,23 @@
SELECT
a.nick_name,
a.avatar_url,
- a.phone_number,
+ a.phone,
(
SELECT
IFNULL(sum(IFNULL( b.amount, 0 )),0)
FROM
shop_salesman_order b
WHERE
- b.user_id = a.open_id
+ b.user_id = a.id
and order_status=2
- AND b.sales_user_id = #{openId}
+ AND b.sales_user_id = #{userId}
) AS revenueAmount,
- ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount
+ ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.id AND c.sales_user_id = #{userId} ) AS orderCount
FROM
- biz_user a
+ sys_vip_info a
WHERE
- a.parent_open_id = #{openId}
+ a.recommend_id = #{userId}
AND a.is_sales = #{isSales}
</select>
@@ -64,22 +64,26 @@
a.user_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- (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 s.nick_name FROM sys_vip_info s
+ WHERE s.id = a.parent_user_id ) parentUser,
+ c.nick_name parentUserNow,
+ ( SELECT COUNT(*) FROM sys_vip_info
+ WHERE recommend_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+ ( SELECT COUNT(*) FROM sys_vip_info
+ WHERE recommend_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,
+ WHERE 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,
+ WHERE order_status = 1 AND sales_user_id = a.user_id ) balance,
g.NAME grade,
- b.binding_parent_time createTime,
+ 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 sys_vip_info b ON a.user_id = b.id
LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
+ LEFT JOIN sys_vip_info c ON c.id = b.recommend_id
<where>
a.company_id=#{record.companyId}
<if test="record.shenheState != null and record.shenheState != ''">
@@ -103,7 +107,7 @@
b.nick_name nickName
FROM
shop_salesman_apply a
- LEFT JOIN biz_user b ON a.user_id = b.user_id
+ LEFT JOIN sys_vip_info b ON a.user_id = b.id
<where>
a.company_id = #{record.companyId}
and a.apply_status = #{record.applyStatus}
@@ -118,14 +122,13 @@
</select>
<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
SELECT
- a.user_id userId,
- a.open_id openId,
+ a.id userId,
a.nick_name nickName,
a.avatar_url avatarUrl,
a.create_time createTime,
- a.phone_number phone
+ a.phone
FROM
- biz_user a
+ sys_vip_info a
<where>
a.company_id = #{record.companyId}
and a.is_sales != 1
@@ -147,9 +150,7 @@
IFNULL(sum(IFNULL( b.amount, 0 )),0)
FROM
shop_salesman_order b
- WHERE
- b.user_id = a.open_id
- and order_status=2
+ WHERE order_status=2
AND b.sales_user_id = #{openId}
) AS totalRevenue,
@@ -158,9 +159,7 @@
IFNULL(sum(IFNULL( b.amount, 0 )),0)
FROM
shop_salesman_order b
- WHERE
- b.user_id = a.open_id
- and order_status=2 and revenue_type=1
+ WHERE order_status=2 and revenue_type=1
AND b.sales_user_id = #{openId}
) AS salesRevenue,
@@ -169,9 +168,7 @@
IFNULL(sum(IFNULL( b.amount, 0 )),0)
FROM
shop_salesman_order b
- WHERE
- b.user_id = a.open_id
- and order_status=2 and revenue_type=2
+ WHERE order_status=2 and revenue_type=2
AND b.sales_user_id = #{openId}
) AS invitationRevenue,
@@ -181,17 +178,17 @@
IFNULL(sum(IFNULL( b.amount, 0 )),0)
FROM
shop_salesman_order b
- WHERE
- b.user_id = a.open_id
- and order_status=1
+ WHERE order_status=1
AND b.sales_user_id = #{openId}
) AS djsRevenue,
- ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount,
- (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=1) as invitationCount,
- (select count(*) from biz_user where parent_open_id=#{openId} and is_sales=2) as customerCount
- from biz_user a where
- a.open_id=#{openId}
+
+ ( SELECT count( * ) FROM shop_salesman_order c WHERE c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount,
+ ( SELECT count( * ) FROM shop_salesman_order c WHERE c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount,
+ (select count(*) from sys_vip_info where recommend_id=#{openId} and is_sales=1) as invitationCount,
+ (select count(*) from sys_vip_info where recommend_id=#{openId} and is_sales=2) as customerCount
+ from sys_vip_info a where
+ a.id=#{id}
</select>
@@ -201,66 +198,62 @@
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,
+ b.phone,
+ (SELECT s.nick_name FROM sys_vip_info s
+ WHERE s.id = a.parent_user_id ) parentUser,
+ ( SELECT COUNT(*) FROM sys_vip_info
+ WHERE recommend_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+ ( SELECT COUNT(*) FROM sys_vip_info
+ WHERE recommend_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,
+ WHERE 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,
- b.binding_parent_time createTime,
+ WHERE 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 sys_vip_info b ON a.user_id = b.id
LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
where a.id = #{applyId}
</select>
<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
SELECT
- a.user_id userId,
+ b.id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
b.binding_parent_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
- shop_salesman_apply a
- LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+ (select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = b.id) doneNum
+ FROM sys_vip_info b
<where>
- a.company_id = #{record.companyId}
+ b.company_id = #{record.companyId}
AND b.is_sales != 1
- and b.parent_open_id = #{record.userId}
- and a.apply_status = 2
+ and b.recommend_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}
+ b.${record.sort} ${record.order}
</if>
</select>
<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
SELECT
- a.user_id userId,
+ b.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 sys_vip_info b ON b.id = a.user_id
<where>
a.company_id = #{record.companyId}
AND b.is_sales = 1
- and b.parent_open_id = #{record.userId}
+ and b.recommend_id = #{record.userId}
and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
@@ -283,10 +276,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 sys_vip_info b on b.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