From 4506cc81e35921635299078ca24f7dfc92408e1c Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Feb 2022 11:29:48 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml | 68 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 1 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 a594e68..84c0ede 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderDao.xml
@@ -76,7 +76,10 @@
WHERE order_status = 1 and company_id=#{companyId} ) a) waitNum,
(SELECT COUNT(*)
FROM shop_salesman_order
- WHERE order_status = 1 and company_id=#{companyId}) waitOrderNum
+ WHERE order_status = 1 and company_id=#{companyId}) waitOrderNum,
+ (select sum(order_money) from shop_salesman_order a
+ inner join shop_order b on a.order_id=b.ID
+ where a.company_id=#{companyId}) orderBalance
FROM
shop_salesman_order
where company_id=#{companyId}
@@ -171,4 +174,67 @@
</if>
</select>
+ <select id="selectFenxiaoOrderListNoPage" resultType="com.matrix.system.fenxiao.vo.FenxiaoOrderListExportVo">
+ SELECT
+ a.id id,
+ d.order_no,
+ d.order_money actualBalance,
+ f.shop_name address,
+ case when d.order_status = 1 then '待付款'
+ when d.order_status = 2 then '待配送'
+ when d.order_status = 3 then '待收货'
+ when d.order_status = 4 then '待评价'
+ when d.order_status = 5 then '已评价'
+ when d.order_status = 6 then '申请退款'
+ when d.order_status = 7 then '退款成功'
+ when d.order_status = 8 then '退款拒绝'
+ when d.order_status = 9 then '已取消' end orderState,
+ b.nick_name custom,
+ b.id customUserId,
+ e.nick_name parentSale,
+ case when a.revenue_type = 1 then '推广收益'
+ when a.revenue_type = 2 then '邀请收益' end profitType,
+ a.amount profitBalance,
+ case when a.order_status = 1 then '待结算'
+ when a.order_status = 2 then '已结算'
+ when a.order_status = 3 then '已退款' end settleType,
+ c.order_no settleNo,
+ c.create_time settleTime,
+ g.su_name settler
+ FROM
+ shop_salesman_order a
+ 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 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>
+ a.company_id = #{record.companyId}
+ <if test="record.userName != null and record.userName != ''">
+ and b.nick_name like concat('%',#{record.userName},'%')
+ </if>
+ <if test="record.ddType != null and record.ddType != ''">
+ and d.order_status = #{record.ddType}
+ </if>
+ <if test="record.startTime != null ">
+ and a.create_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null">
+ and #{record.endTime} >= a.create_time
+ </if>
+ <if test="record.tgy != null and record.tgy != ''">
+ and e.nick_name like concat('%',#{record.tgy},'%')
+ </if>
+ <if test="record.orderType != null and record.orderType != ''">
+ and a.order_status = #{record.orderType}
+ </if>
+ <if test="record.jsbh != null and record.jsbh != ''">
+ and c.order_no = #{record.jsbh}
+ </if>
+ <if test="record.ddh != null and record.ddh != ''">
+ and d.order_no = #{record.ddh}
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1