From 321d1fae7dbd5b399d8df3491ef60a8ea2575451 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 10:53:41 +0800
Subject: [PATCH] Merge branch 'ty_urgent' into api
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 5 +++--
1 files changed, 3 insertions(+), 2 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 043b37b..d86c4f7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -540,10 +540,11 @@
a.cash_Pay cashPay,
a.card_Pay cardPay,
a.ZK_TOTAL needPay,
- a.card_Pay + a.card_Pay realPay,
+ a.cash_Pay + a.card_Pay realPay,
a.arrears arrears,
a.TOTAL - a.ZK_TOTAL discount,
- a.STATU orderStatus
+ a.STATU orderStatus,
+ a.order_time orderTime
from sys_order a
inner join sys_vip_info b on a.VIP_ID=b.ID
left join sys_users c on a.STAFF_ID=c.su_id
--
Gitblit v1.9.1