From 666c7aa91f44b26429f9be3ae60340126fa3d599 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 22 八月 2024 14:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
index b7b0d0b..a433566 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
@@ -58,10 +58,10 @@
and t1.code LIKE CONCAT('%',#{req.code},'%')
</if>
<if test="req.type != null and req.type != '' and req.type == 1">
- and t1.coupon_discount_amount != null and t1.coupon_discount_amount != 0
+ and t1.coupon_discount_amount IS NOT NULL and t1.coupon_discount_amount != 0
</if>
<if test="req.type != null and req.type != '' and req.type == 2">
- and t1.vip_discount_amount != null and t1.vip_discount_amount != 0
+ and t1.vip_discount_amount IS NOT NULL and t1.vip_discount_amount != 0
</if>
<if test="null != req.userIds and req.userIds.size()>0" >
and t1.app_user_id in
@@ -97,13 +97,13 @@
and t2.code LIKE CONCAT('%',#{req.code},'%')
</if>
<if test="req.type != null and req.type != '' and req.type == 1">
- and t2.coupon_discount_amount != null and t1.coupon_discount_amount != 0
+ and t2.coupon_discount_amount IS NOT NULL and t2.coupon_discount_amount != 0
</if>
<if test="req.type != null and req.type != '' and req.type == 2">
- and t2.vip_discount_amount != null and t1.vip_discount_amount != 0
+ and t2.vip_discount_amount IS NOT NULL and t2.vip_discount_amount != 0
</if>
<if test="req.type == null ">
- and t2.vip_discount_amount != null and t1.vip_discount_amount != 0 and t2.coupon_discount_amount != null and t1.coupon_discount_amount != 0
+ and t2.vip_discount_amount IS NOT NULL and t2.vip_discount_amount != 0 and t2.coupon_discount_amount IS NOT NULL and t2.coupon_discount_amount != 0
</if>
<if test="null != req.userIds and req.userIds.size()>0" >
and t2.app_user_id in
@@ -129,12 +129,12 @@
3 as orderType
from t_vip_order t3
where 1 = 1
- and t3.type ==1
+ and t3.type =1
<if test="null != req.code and req.code!=''">
and t3.code LIKE CONCAT('%',#{req.code},'%')
</if>
<if test="req.type == null ">
- and t3.discount_amount != null and t3.discount_amount != 0
+ and t3.discount_amount IS NOT NULL and t3.discount_amount != 0
</if>
<if test="null != req.userIds and req.userIds.size()>0" >
and t3.app_user_id in
@@ -164,7 +164,7 @@
and t4.code LIKE CONCAT('%',#{req.code},'%')
</if>
<if test="req.type == null ">
- and t4.discount_amount != null and t4.discount_amount != 0
+ and t4.discount_amount IS NOT NULL and t4.discount_amount != 0
</if>
<if test="null != req.userIds and req.userIds.size()>0" >
and t4.app_user_id in
--
Gitblit v1.7.1