From e290bcf87c22f9b4b9d15bdfaba27c8f53dd3369 Mon Sep 17 00:00:00 2001
From: appleyou <appleyou@gmail.com>
Date: Thu, 17 Apr 2025 16:34:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(CuMemberBonusDelay):=20=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/member/bonus/CuMemberBonusDelayMapper.xml          | 4 ++--
 .../common/domain/member/bonus/ext/CuMemberBonusDelayExt.java | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml
index 4fff2cd3..8d693b70 100644
--- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml
+++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml
@@ -79,14 +79,14 @@
         left join cu_member_settle_period cmsp
         on cmsp.pk_id = cmbd.period
         where cmbd.del_flag = 0
-        <if test="param.memberCode != null and param != ''">
+        <if test="param.memberCode != null and param.memberCode != ''">
             and cm.member_code like #{param.memberCode} || '%'
         </if>
         <if test="param.startDate != null">
             and cmsp.settle_date >= #{param.startDate}
         </if>
         <if test="param.endDate != null">
-            and param.endDate >= cmsp.settle_date
+            and #{param.endDate} >= cmsp.settle_date
         </if>
         order by cmbd.period desc
     </select>
diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/ext/CuMemberBonusDelayExt.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/ext/CuMemberBonusDelayExt.java
index 703c906e..fdf8cbd9 100644
--- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/ext/CuMemberBonusDelayExt.java
+++ b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/ext/CuMemberBonusDelayExt.java
@@ -1,5 +1,6 @@
 package com.hzs.common.domain.member.bonus.ext;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzs.common.domain.member.bonus.CuMemberBonusDelay;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,6 +30,7 @@ public class CuMemberBonusDelayExt extends CuMemberBonusDelay {
     /**
      * 结算日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date settleDate;
 
 }