## 分页返回值修改

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java

@@ -446,11 +446,11 @@ public class ApiMemberController extends BaseController {
      */
     @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
     @GetMapping("/member-point")
-    public AjaxResult memberPoint() {
+    public TableDataInfo memberPoint() {
         Long userId = SecurityUtils.getUserId();
         if (userId == null) {
             log.error("用户登录信息错误");
-            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+            return null;
         }
         // 获取当前时间 -1 天
         String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -463,16 +463,13 @@ public class ApiMemberController extends BaseController {
         Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前表名不存在{}",settleTableName);
-            return AjaxResult.error("数据查询错误,请联系客服处理");
-        }
-        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId);
-        if (CollectionUtil.isEmpty(list)) {
             return null;
         }
+        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId);
         list.forEach(item -> {
             item.setMemberSettlePeriod(csPeriod.getSettleDate());
         });
         startPage();
-        return AjaxResult.success(getDataTable(list));
+        return getDataTable(list);
     }
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java

@@ -797,10 +797,10 @@ public class CuMemberController extends BaseController {
      */
     @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
     @GetMapping("/member-point")
-    public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId) {
+    public TableDataInfo memberPoint(String memberCode,Long memberSettlePeriodId) {
-        if (memberCode == null || memberSettlePeriodId == null) {
+        if (memberSettlePeriodId == null) {
-            log.error("参数错误{}{}",memberCode, memberSettlePeriodId);
+            log.error("参数错误{}", memberSettlePeriodId);
-            return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY);
+            return null;
         }
         CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
         log.info("会员结算表信息{}",csPeriod);
@@ -810,17 +810,35 @@ public class CuMemberController extends BaseController {
         Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前表名不存在{}",settleTableName);
-            return AjaxResult.error("当前会员结算表不存在",settleTableName);
-        }
-        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
-        if (CollectionUtil.isEmpty(list)) {
             return null;
         }
+        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
         list.forEach(item -> {
             item.setMemberSettlePeriod(csPeriod.getSettleDate());
         });
         startPage();
-        return AjaxResult.success(getDataTable(list));
+        return getDataTable(list);
+    }
+
+    /**
+     *
+     * @param memberCode
+     * @param memberSettlePeriodId
+     * @return
+     */
+    @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT)
+    @PostMapping("/member-point-export")
+    public void memberPointExport(@RequestParam String memberCode,@RequestParam Long memberSettlePeriodId, HttpServletResponse response) {
+        CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
+        log.info("会员结算表信息{}",csPeriod);
+        String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId();
+        log.info("会员结算表名称{}",settleTableName);
+        List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
+        list.forEach(item -> {
+            item.setMemberSettlePeriod(csPeriod.getSettleDate());
+        });
+        ExcelUtil<memberPointVO> util = new ExcelUtil<>(memberPointVO.class);
+        util.exportExcel(response, list, "会员点位信息");
     }
 
 }

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java

@@ -7,6 +7,7 @@ import com.hzs.common.core.constant.msg.CommonMsgConstants;
 import com.hzs.common.core.enums.*;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.base.CuMember;
@@ -125,15 +126,15 @@ public class ApiMemberStructureController extends BaseController {
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework-list")
-    public AjaxResult threeFrameworkList(Integer stage,Integer stageStatus) {
+    public TableDataInfo threeFrameworkList(Integer stage, Integer stageStatus) {
         if (stage == null) {
             log.error("参数错误");
-            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+            return null;
         }
         Long userId = SecurityUtils.getUserId();
         if (userId == null) {
             log.error("用户登录信息错误");
-            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+            return null;
         }
         // 获取当前时间 -1 天
         String yesterday  = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -146,13 +147,13 @@ public class ApiMemberStructureController extends BaseController {
         Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前会员日结信息不存在{}",settleTableName);
-            return AjaxResult.error("数据查询错误,请联系客服处理");
+            return null;
         }
         startPage();
         // 查询当前会员所有子点位信息
         CuMember member = iCuMemberService.getMember(userId);
         List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus);
-        return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
+        return getDataTable(cuMemberThreeFrameworkVOS);
     }
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)

bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java

@@ -22,6 +22,7 @@ import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.sign.Base64Util;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
+import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.achieve.CuMemberRetailDetail;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
 import com.hzs.common.domain.member.achieve.ext.CuMemberRetailSExt;
@@ -254,10 +255,10 @@ public class MemberStructureController extends BaseController {
      */
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)
     @GetMapping("/three-framework-list")
-    public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode,Integer stage,Integer stageStatus) {
+    public TableDataInfo threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) {
         if (memberSettlePeriodId == null || memberCode == null ||  stage == null) {
             log.error("参数错误");
-            return AjaxResult.error(CommonMsgConstants.MISSING_PARAM);
+            return null;
         }
         CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
         log.info("日结信息{}",csPeriod);
@@ -267,12 +268,12 @@ public class MemberStructureController extends BaseController {
         Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName);
         if (isFind == null || isFind != 1) {
             log.error("当前表名不存在{}",settleTableName);
-            return AjaxResult.error("当前日结信息表不存在",settleTableName);
+            return null;
         }
         startPage();
         // 查询当前会员所有子点位信息
         List<CuMemberThreeFrameworkVO> cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus);
-        return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS));
+        return getDataTable(cuMemberThreeFrameworkVOS);
     }
 
     @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT)