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 | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 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 60c4479..041b364 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -60,6 +60,7 @@
<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
SELECT
+ a.id id,
a.user_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
@@ -117,15 +118,17 @@
</select>
<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
SELECT
- a.open_id userId,
- a.nick_name nickName
+ 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 != 1
<if test="record.nickName != null and record.nickName != ''">
and a.nick_name like concat('%',#{record.nickName},'%')
</if>
@@ -184,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
@@ -216,9 +222,7 @@
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">
@@ -226,16 +230,17 @@
a.user_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- a.create_time createTime,
- a.apply_way applyWay
+ 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
-
<where>
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>
@@ -250,16 +255,46 @@
a.user_id userId,
b.avatar_url avatarUrl,
b.nick_name nickname,
- a.create_time createTime,
+ b.binding_parent_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}
+ and a.apply_status = 2
+ <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="findShopOrderDetail" resultType="com.matrix.system.fenxiao.vo.ShopOrderDetailVo">
+ select
+ a.order_id orderId,
+ a.create_time createTime,
+ a.amount amount,
+ a.revenue_type revenueType,
+ a.order_status orderStatus,
+ b.nick_name nickName,
+ 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
+ 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
+ <where>
+ a.sales_user_id = #{record.userId}
+ <if test="record.orderType != null and record.orderType != ''">
+ and a.order_status = #{record.orderType}
+ </if>
<if test="record.userName != null and record.userName != ''">
and b.nick_name like concat('%',#{record.userName},'%')
</if>
--
Gitblit v1.9.1