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 - + and cm.member_code like #{param.memberCode} || '%' and cmsp.settle_date >= #{param.startDate} - and param.endDate >= cmsp.settle_date + and #{param.endDate} >= cmsp.settle_date order by cmbd.period desc 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; }