From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 b661f60..041b364 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -73,7 +73,7 @@
( 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,
- b.binding_parent_time createTime,
+ a.create_time createTime,
a.apply_status applyStatus,
a.apply_way applyWay
FROM
@@ -118,18 +118,17 @@
</select>
<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
SELECT
- a.open_id userId,
+ a.user_id userId,
+ a.open_id openId,
a.nick_name nickName,
a.avatar_url avatarUrl,
a.create_time createTime,
a.phone_number phone
FROM
biz_user a
- LEFT JOIN shop_salesman_apply b ON a.open_id = b.user_id
<where>
a.company_id = #{record.companyId}
and a.is_sales != 1
- and b.apply_status not in (1,2)
<if test="record.nickName != null and record.nickName != ''">
and a.nick_name like concat('%',#{record.nickName},'%')
</if>
@@ -188,7 +187,10 @@
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 shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount,
+ ( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount,
+
(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
@@ -213,16 +215,14 @@
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,
- 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 shop_salesman_grade g ON a.grade_id = g.id
- <where>
- a.company_id=#{companyId} and a.user_id = #{userId}
- </where>
+ where a.id = #{applyId}
</select>
<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
@@ -240,6 +240,7 @@
a.company_id = #{record.companyId}
AND b.is_sales != 1
and b.parent_open_id = #{record.userId}
+ and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
@@ -263,6 +264,7 @@
a.company_id = #{record.companyId}
AND b.is_sales = 1
and b.parent_open_id = #{record.userId}
+ and a.apply_status = 2
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
--
Gitblit v1.9.1