From 83e572c8b78790f8988a2fd72902912ffbbaa166 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 15:30:16 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 28637b1..cc0a4e3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -30,6 +30,7 @@
<!-- 扩展字段 -->
<result property="shopName" column="SHOP_NAME"/>
+ <result property="shopShortName" column="SHOP_SHORT_NAME"/>
<result property="vipPhone" column="PHONE"/>
@@ -321,6 +322,7 @@
a.*,
c.su_name as STAFF_NAME,
d.SHOP_NAME,
+ d.shop_short_name,
b.PHONE,
b.VIP_NAME
from sys_order a
@@ -479,6 +481,7 @@
<select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
select
a.id orderId,
+ a.VIP_ID vipId,
a.ORDER_NO orderNo,
a.ORDER_TIME orderTime,
a.STATU orderStatus,
@@ -500,6 +503,9 @@
</if>
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
+ </if>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
</if>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -526,6 +532,9 @@
</if>
<if test="record.shopId != null">
and a.shop_id=#{record.shopId}
+ </if>
+ <if test="record.companyId != null">
+ and a.company_id=#{record.companyId}
</if>
</where>
</select>
@@ -559,6 +568,7 @@
from sys_order a
left join sys_shop_info b on a.SHOP_ID=b.ID
<where>
+ a.statu in ('已付款', '欠款')
<if test="record.companyId != null">
and a.company_id=#{record.companyId}
</if>
@@ -575,4 +585,5 @@
group by a.SHOP_ID
order by amount desc, a.shop_id
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1