From d05d2037f4b2b3ad6f32b985fbd1dfc5f66f644e Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 17:27:16 +0800
Subject: [PATCH] 退款处理分销订单3
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 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..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,12 +68,14 @@
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
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
@@ -147,9 +149,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 +158,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 +167,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,13 +177,13 @@
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 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
@@ -209,10 +205,10 @@
( 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,
+ 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
@@ -224,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
@@ -249,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
@@ -283,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