From dffcec437fd95727867192bef825617f65d027ce Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 19 二月 2024 11:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 31b1191..817f5b0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -157,6 +157,7 @@
state as state,
orderMoney as orderMoney,
payMoney as payMoney,
+ ifnull(discountMoney, 0) as discountMoney,
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney
from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
--
Gitblit v1.7.1