From 22278410bc13f34b0417abe9a38dd6e4a627e62e Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 17 Apr 2025 15:32:34 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=BB=B6=E7=BC=93=E5=8F=91=E6=94=BE?= =?UTF-8?q?=E5=A5=96=E9=87=91=E5=88=97=E8=A1=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberBonusController.java | 2 - .../manage/CuMemberBonusDelayController.java | 45 +++++++++++++++++++ .../mapper/CuMemberBonusDelayMapper.java | 9 ++++ .../bonus/param/CuMemberBonusDelayParam.java | 29 ++++++++++++ .../service/ICuMemberBonusDelayService.java | 10 +++++ .../impl/CuMemberBonusDelayServiceImpl.java | 6 +++ .../member/bonus/CuMemberBonusDelayMapper.xml | 21 +++++++++ .../member/bonus/CuMemberBonusDelay.java | 6 --- .../bonus/ext/CuMemberBonusDelayExt.java | 15 +++++++ 9 files changed, 135 insertions(+), 8 deletions(-) create mode 100644 hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java create mode 100644 hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java index c2477505..9ec61716 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusController.java @@ -40,9 +40,7 @@ import java.util.*; import java.util.stream.Collectors; /** - *

* 会员奖金-会员奖金汇总表 前端控制器 - *

* * @author hzs * @since 2022-11-11 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java new file mode 100644 index 00000000..426532fb --- /dev/null +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java @@ -0,0 +1,45 @@ +package com.hzs.bonus.bonus.controller.manage; + +import com.hzs.bonus.bonus.param.CuMemberBonusDelayParam; +import com.hzs.bonus.bonus.service.ICuMemberBonusDelayService; +import com.hzs.common.core.utils.DateUtils; +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.page.TableDataInfo; +import com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 会员奖金-拓展收益延缓表 前端控制器 + */ +@RestController +@RequestMapping("/manage/bonus-delay") +public class CuMemberBonusDelayController extends BaseController { + + @Autowired + private ICuMemberBonusDelayService iCuMemberBonusDelayService; + + /** + * 拓展延缓列表 + * + * @return + */ + @GetMapping("/delay-list") + public TableDataInfo delayList(CuMemberBonusDelayParam param) { + if (param.getStartDate() != null) { + param.setStartDate(DateUtils.getStartTime(param.getStartDate())); + } + if (param.getEndDate() != null) { + param.setEndDate(DateUtils.getEndTime(param.getEndDate())); + } + + List resultList = iCuMemberBonusDelayService.listDelay(param); + return getDataTable(resultList); + } + + +} diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java index 30db8846..0276c60e 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDelayMapper.java @@ -1,6 +1,7 @@ package com.hzs.bonus.bonus.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hzs.bonus.bonus.param.CuMemberBonusDelayParam; import com.hzs.common.domain.member.bonus.CuMemberBonusDelay; import com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; @@ -43,4 +44,12 @@ public interface CuMemberBonusDelayMapper extends BaseMapper @Param("pkMemberSet") Set pkMemberSet, @Param("yesterdayPeriod") Integer yesterdayPeriod); + /** + * 查询延缓奖金列表 + * + * @param param + * @return + */ + List listDelay(@Param("param") CuMemberBonusDelayParam param); + } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java new file mode 100644 index 00000000..07ab5370 --- /dev/null +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/param/CuMemberBonusDelayParam.java @@ -0,0 +1,29 @@ +package com.hzs.bonus.bonus.param; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 延缓奖金入参 + */ +@Data +public class CuMemberBonusDelayParam implements Serializable { + + /** + * 会员编号 + */ + private String memberCode; + + /** + * 开始时间 + */ + private Date startDate; + + /** + * 结束时间 + */ + private Date endDate; + +} diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java index ffd1a462..d83bc047 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDelayService.java @@ -1,7 +1,9 @@ package com.hzs.bonus.bonus.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.hzs.bonus.bonus.param.CuMemberBonusDelayParam; import com.hzs.common.domain.member.bonus.CuMemberBonusDelay; +import com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import java.util.List; @@ -39,4 +41,12 @@ public interface ICuMemberBonusDelayService extends IService */ List listDelayNotBonus(String currentSettleTableName, Set pkMemberSet, Integer yesterdayPeriod); + /** + * 查询延缓奖金列表 + * + * @param param + * @return + */ + List listDelay(CuMemberBonusDelayParam param); + } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java index 00ad601f..ceeb23cf 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDelayServiceImpl.java @@ -2,9 +2,11 @@ package com.hzs.bonus.bonus.service.impl; import com.hzs.bonus.achieve.service.impl.CuMemberBonusSettle; import com.hzs.bonus.bonus.mapper.CuMemberBonusDelayMapper; +import com.hzs.bonus.bonus.param.CuMemberBonusDelayParam; import com.hzs.bonus.bonus.service.ICuMemberBonusDelayService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.bonus.CuMemberBonusDelay; +import com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,4 +56,8 @@ public class CuMemberBonusDelayServiceImpl extends ServiceImpl listDelay(CuMemberBonusDelayParam param) { + return baseMapper.listDelay(param); + } } 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 92b733b0..4fff2cd3 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 @@ -70,4 +70,25 @@ on a.pk_member = cmbd.pk_member + + + diff --git a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java index 0a2b9866..830e61c9 100644 --- a/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java +++ b/hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusDelay.java @@ -46,12 +46,6 @@ public class CuMemberBonusDelay extends BaseEntity { @TableField("PERIOD") private Integer period; - /** - * 拓展收益未发放 - */ - @TableField("UN_GRANT_INCOME") - private BigDecimal unGrantIncome; - /** * 收益发放前 */ 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 77755c6f..703c906e 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 @@ -4,6 +4,8 @@ import com.hzs.common.domain.member.bonus.CuMemberBonusDelay; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** * 会员奖金-拓展收益延缓表 扩散表 */ @@ -16,4 +18,17 @@ public class CuMemberBonusDelayExt extends CuMemberBonusDelay { */ private Integer pkGrade; + /** + * 会员编号 + */ + private String memberCode; + /** + * 会员姓名 + */ + private String memberName; + /** + * 结算日期 + */ + private Date settleDate; + }