## 延缓发放奖金列表；

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;
 
 /**
- * <p>
  * 会员奖金-会员奖金汇总表 前端控制器
- * </p>
  *
  * @author hzs
  * @since 2022-11-11

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<CuMemberBonusDelayExt> resultList = iCuMemberBonusDelayService.listDelay(param);
+        return getDataTable(resultList);
+    }
+
+
+}

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<CuMemberBonusDelay>
                                               @Param("pkMemberSet") Set<Long> pkMemberSet,
                                               @Param("yesterdayPeriod") Integer yesterdayPeriod);
 
+    /**
+     * 查询延缓奖金列表
+     *
+     * @param param
+     * @return
+     */
+    List<CuMemberBonusDelayExt> listDelay(@Param("param") CuMemberBonusDelayParam param);
+
 }

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;
+
+}

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<CuMemberBonusDelay>
      */
     List<CuMemberSettleExt> listDelayNotBonus(String currentSettleTableName, Set<Long> pkMemberSet, Integer yesterdayPeriod);
 
+    /**
+     * 查询延缓奖金列表
+     *
+     * @param param
+     * @return
+     */
+    List<CuMemberBonusDelayExt> listDelay(CuMemberBonusDelayParam param);
+
 }

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<CuMemberBonusDela
         return baseMapper.listDelayNotBonus(currentSettleTableName, pkMemberSet, yesterdayPeriod);
     }
 
+    @Override
+    public List<CuMemberBonusDelayExt> listDelay(CuMemberBonusDelayParam param) {
+        return baseMapper.listDelay(param);
+    }
 }

hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusDelayMapper.xml

@@ -70,4 +70,25 @@
         on a.pk_member = cmbd.pk_member
     </select>
 
+    <!-- 查询延缓奖金列表 -->
+    <select id="listDelay" resultType="com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt">
+        select cmbd.*, cm.member_code, cm.member_name, cmsp.settle_date
+        from CU_MEMBER_BONUS_DELAY cmbd
+        left join cu_member cm
+        on cm.pk_id = cmbd.pk_member
+        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 != ''">
+            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
+        </if>
+        order by cmbd.period desc
+    </select>
+
 </mapper>

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;
-
     /**
      * 收益发放前
      */

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;
+
 }