Merge remote-tracking branch 'origin/dev' into dev

hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuMemberBonusDelayController.java

@@ -1,16 +1,28 @@
 package com.hzs.bonus.bonus.controller.manage;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.hzs.bonus.bonus.param.CuMemberBonusDelayParam;
 import com.hzs.bonus.bonus.service.ICuMemberBonusDelayService;
+import com.hzs.bonus.bonus.vo.BonusDelayVO;
+import com.hzs.common.core.annotation.Log;
+import com.hzs.common.core.enums.EOperationBusiness;
+import com.hzs.common.core.enums.EOperationMethod;
+import com.hzs.common.core.enums.EOperationModule;
 import com.hzs.common.core.utils.DateUtils;
+import com.hzs.common.core.utils.StringUtils;
+import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.page.TableDataInfo;
+import com.hzs.common.domain.member.bonus.CuMemberBonusDelay;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -41,5 +53,26 @@ public class CuMemberBonusDelayController extends BaseController {
         return getDataTable(resultList);
     }
 
-
+    /**
+     * 导出拓展延缓列表
+     **/
+    @Log(module = EOperationModule.BONUS_DELAY, business = EOperationBusiness.BONUS_DELAY, method = EOperationMethod.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CuMemberBonusDelayParam param) {
+        if (param.getStartDate() != null) {
+            param.setStartDate(DateUtils.getStartTime(param.getStartDate()));
+        }
+        if (param.getEndDate() != null) {
+            param.setEndDate(DateUtils.getEndTime(param.getEndDate()));
+        }
+
+        List<BonusDelayVO> resultList = new ArrayList<>();
+        List<CuMemberBonusDelayExt> list = iCuMemberBonusDelayService.listDelay(param);
+
+        if (StringUtils.isNotEmpty(list)) {
+            resultList = BeanUtil.copyToList(list, BonusDelayVO.class);
+        }
+        ExcelUtil<BonusDelayVO> util = new ExcelUtil<>(BonusDelayVO.class);
+        util.exportExcel(response, resultList, "拓展延缓");
+    }
 }

hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusDelayVO.java

@@ -0,0 +1,51 @@
+package com.hzs.bonus.bonus.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hzs.common.core.annotation.Excel;
+import com.hzs.common.domain.member.bonus.ext.CuMemberBonusDelayExt;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class BonusDelayVO {
+
+    /**
+     * 期间
+     */
+    @Excel(name = "结算期数")
+    private Integer period;
+
+    /**
+     * 结算日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "结算日期", dateFormat = "yyyy-MM-dd")
+    private Date settleDate;
+
+    /**
+     * 会员编号
+     */
+    @Excel(name = "会员编号")
+    private String memberCode;
+
+    /**
+     * 会员姓名
+     */
+    @Excel(name = "会员姓名")
+    private String memberName;
+
+    /**
+     * 拓展延缓期初
+     */
+    @Excel(name = "拓展延缓期初")
+    private BigDecimal beforeGrantIncome;
+
+    /**
+     * 拓展延缓期末
+     */
+    @Excel(name = "拓展延缓期末")
+    private BigDecimal afterGrantIncome;
+}

hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java

@@ -59,9 +59,9 @@ public class CuMemberLevelController extends BaseController {
             for (CuMemberLevelUpVO vo : resultList) {
                 vo.setUpTypeName(EUpgradeType.getEnumByValue(vo.getUpType()).getLabel());
             }
-            ExcelUtil<CuMemberLevelUpVO> util = new ExcelUtil<>(CuMemberLevelUpVO.class);
 
+        }
+        ExcelUtil<CuMemberLevelUpVO> util = new ExcelUtil<>(CuMemberLevelUpVO.class);
         util.exportExcel(response, resultList, "会员升级记录");
     }
 }
-}

hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationBusiness.java

@@ -126,6 +126,7 @@ public enum EOperationBusiness {
 
     RECOMMEND_DATA("推荐数据"),
 
+    BONUS_DELAY("拓展延缓"),
     //////////////////// 三方商品管理 ////////////////////
 
     THIRD_DIRECT_WARES("直供商品"),

hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java

@@ -95,6 +95,7 @@ public enum EOperationModule {
 
     POSTAGE_CONFIG("邮费配置"),
 
+    BONUS_DELAY("拓展延缓"),
     //////////////////// 三方商品管理 ////////////////////
 
     THIRD_DIRECT_WARES("直供商品"),