From c1e1df280782957c159c7b8c46d474ccb5eb94ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Mon, 9 Dec 2024 10:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E7=94=B5=E9=87=8F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ss/transactionBill/domain/TransactionBillQuery.java   | 3 +++
 .../ss/transactionBill/mapper/TransactionBillMapper.xml   | 8 ++++++++
 .../main/java/com/ruoyi/task/bill/BillMonitorTask.java    | 1 +
 3 files changed, 12 insertions(+)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBillQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBillQuery.java
index 0653b7b5..1691572f 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBillQuery.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBillQuery.java
@@ -141,4 +141,7 @@ public class TransactionBillQuery extends TransactionBill {
     @ApiModelProperty("员工权限")
     private String staffPermission;
 
+    @ApiModelProperty("套餐结束时间是否为空")
+    private Boolean isNullSuitEndTime;
+
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
index 03837c5d..0664c21a 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
@@ -209,6 +209,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.suitVoidResult != null  and query.suitVoidResult != ''"> and stb.suit_void_result = #{query.suitVoidResult}</if>
         <if test="query.openMsg != null  and query.openMsg != ''"> and stb.open_msg like concat('%', #{query.openMsg}, '%')</if>
         <if test="query.mchShowMobileStatus != null  and query.mchShowMobileStatus != ''"> and stb.mch_show_mobile_status = #{query.mchShowMobileStatus}</if>
+        <if test="query.isNullSuitEndTime != null">
+            and stb.suit_end_time is
+            <if test="!query.isNullSuitEndTime">
+                not
+            </if>
+            null
+        </if>
         <if test="query.isUsing != null">
             <if test="query.isUsing">
                 and <include refid="isUsing"/>
@@ -837,6 +844,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="billIds" separator="," item="item" close=")" open="(">
             #{item}
         </foreach>
+        and suit_end_time is null
     </update>
 
 </mapper>
diff --git a/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillMonitorTask.java b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillMonitorTask.java
index 9b730e33..139e2cce 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillMonitorTask.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/task/bill/BillMonitorTask.java
@@ -100,6 +100,7 @@ public class BillMonitorTask {
         query.setCreateTimeStart(DateUtils.toLocalDateTime(startTime));
         query.setIsFinished(true);
         query.setSuitFeeType(SuitFeeType.COUNT.getType());
+        query.setIsNullSuitEndTime(true);
         List<TransactionBillVO> list = transactionBillService.selectSmTransactionBillList(query);
 
         if (CollectionUtils.isEmptyElement(list)) {