From 5fbf6c24a047cd345682aa1e6fa043fff2f44bd2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 31 十二月 2025 15:46:21 +0800
Subject: [PATCH] 保险

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInsuranceOrderController.java |    2 ++
 ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml               |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInsuranceOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInsuranceOrderController.java
index 5098043..79bab27 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInsuranceOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInsuranceOrderController.java
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 
@@ -101,6 +102,7 @@
         if(dto.getOfflineStatus() == 1){
             // 通过
             insuranceOrder.setOfflineVoucher(dto.getOfflineVoucher());
+            insuranceOrder.setPayTime(LocalDateTime.now());
             // 修改支付状态为已退款
             insuranceOrder.setStatus(2);
         }
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml
index 7503d51..4828a39 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInsuranceOrderMapper.xml
@@ -73,6 +73,7 @@
                 AND tio.end_time &gt;= #{query.startTime}
                 AND tio.end_time &lt;= #{query.endTime}
             </if>
+            AND ((tio.pay_type = 1 AND tio.status != 0) OR (tio.pay_type = 2))
             AND tio.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>
         ORDER BY tio.create_time DESC
@@ -138,6 +139,7 @@
                 AND tio.end_time &gt;= #{query.startTime}
                 AND tio.end_time &lt;= #{query.endTime}
             </if>
+            AND ((tio.pay_type = 1 AND tio.status != 0) OR (tio.pay_type = 2))
             AND tio.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
         </where>
         ORDER BY tio.create_time DESC

--
Gitblit v1.7.1