From 4a438e3879b6f78cac6acd3404371f6195229de6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 十月 2024 11:56:04 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 e0b7c1a..6568208 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
@@ -71,14 +71,11 @@
<if test="null != req.code and req.code!=''">
and t1.code LIKE CONCAT('%',#{req.code},'%')
</if>
- <if test="req.type != null and req.type != '' and req.type == 1">
+ <if test="req.type != null and req.type == 1">
and t1.coupon_discount_amount > 0
</if>
- <if test="req.type != null and req.type != '' and req.type == 2">
+ <if test="req.type != null and req.type == 2">
and t1.vip_discount_amount > 0
- </if>
- <if test="req.type == null ">
- and (t1.vip_discount_amount > 0 or t1.coupon_discount_amount > 0)
</if>
<if test="null != req.userIds and req.userIds.size()>0" >
and t1.app_user_id in
@@ -95,8 +92,9 @@
<if test="req.endTime != null and req.endTime != '' and req.startTime != null and req.startTime != ''">
AND (t1.create_time between CONCAT(#{req.startTime},':00') and CONCAT(#{req.endTime},':59'))
</if>
- and t1.recharge_payment_status =2
- and t1.refund_status !=2
+ and (t1.vip_discount_amount > 0 or t1.coupon_discount_amount > 0)
+ and t1.recharge_payment_status =2
+ and t1.refund_status !=2
AND t1.del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
</if>
</if>
--
Gitblit v1.7.1