From 512a2f0fb09b663b8de19b5313c8bd5899f4f74b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 09:44:06 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
index 2dd7257..a594e68 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -50,7 +50,7 @@
c.order_no,
c.order_money
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
where
a.sales_user_id=#{record.userId}
@@ -90,7 +90,7 @@
f.shop_name address,
d.order_status orderState,
b.nick_name custom,
- b.open_id customUserId,
+ b.id customUserId,
e.nick_name parentSale,
a.revenue_type profitType,
a.amount profitBalance,
@@ -100,10 +100,10 @@
g.su_name settler
FROM
shop_salesman_order 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_saleman_settlement c on a.settlement_id = c.id
LEFT JOIN shop_order d on d.id = a.order_id
- LEFT JOIN biz_user e on a.sales_user_id = e.open_id
+ LEFT JOIN sys_vip_info e on a.sales_user_id = e.id
LEFT JOIN sys_shop_info f on f.id = d.store_id
LEFT JOIN sys_users g on c.user_id = g.su_id
<where>
--
Gitblit v1.9.1