From c3b772974a10b1318f2850e2fdee6d80812f0b79 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 31 Jan 2021 07:21:06 +0800
Subject: [PATCH] 出库支持小数
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 4 +++-
1 files changed, 3 insertions(+), 1 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..ae1d3fe 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"/>
@@ -89,7 +90,7 @@
<!-- 更新订单时间 -->
<update id="updateOrderTime">
UPDATE sys_order
- set ORDER_TIME = #{orderTime}
+ set pay_time = #{payTime}
WHERE id=#{id}
</update>
@@ -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