From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 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 1eba144..ead840d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -38,4 +38,30 @@
 			<result property="companyId" column="company_id" />
 	</resultMap>
 
+    <select id="selectSalesManOrder" resultType="com.matrix.system.shopXcx.vo.SalesOrderVo">
+		select
+			a.order_id,
+			a.create_time,
+			a.amount,
+			a.revenue_type,
+			a.order_status,
+			b.nick_name,
+			b.avatar_url,
+			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 shop_order c on a.order_id=c.id
+		where
+			a.sales_user_id=#{record.userId}
+			and	a.revenue_type=#{record.revenueType}
+		<if test="record.orderStatus!=null" >
+			and a.order_status=#{record.orderStatus}
+		</if>
+		<if test="record.sort!=null and record.order!=null" >
+		order by ${record.sort} ${record.order}
+		</if>
+
+	</select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1