From 02fecd88de1beaf80de66e07a0568da471dfd751 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 29 Jan 2021 20:28:17 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 2 ++
1 files changed, 2 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 737b370..c2a59fc 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -18,6 +18,7 @@
<result property="statu" column="STATU"/>
<result property="zkTotal" column="ZK_TOTAL"/>
<result property="shopId" column="SHOP_ID"/>
+ <result property="companyId" column="company_id"/>
<result property="vipName" column="VIP_NAME"/>
<result property="vipNo" column="VIP_NO"/>
<result property="staffName" column="STAFF_NAME"/>
@@ -474,6 +475,7 @@
MAX(pay_time) payTime,
GROUP_CONCAT(DISTINCT t2.shop_short_name) shopName
from sys_order t1
+ left join sys_order_item b on t1.id=b.ORDER_ID and goods_id!=5583
left join sys_shop_info t2 on t1.SHOP_ID=t2.ID
where VIP_ID=#{vipId} and STATU='已付款';
</select>
--
Gitblit v1.9.1