diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index ccf23e87..dc3881f7 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -798,8 +798,8 @@ 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) { - if (memberSettlePeriodId == null) { - log.error("参数错误{}", memberSettlePeriodId); + if (memberCode == null || memberSettlePeriodId == null) { + log.error("参数错误{}{}",memberCode, memberSettlePeriodId); return AjaxResult.error(MemberMsgConstants.REQUIRED_NOT_EMPTY); } CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); @@ -813,6 +813,9 @@ public class CuMemberController extends BaseController { return AjaxResult.error("当前会员结算表不存在",settleTableName); } List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); + if (CollectionUtil.isEmpty(list)) { + return null; + } list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); @@ -820,25 +823,4 @@ public class CuMemberController extends BaseController { return AjaxResult.success(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 list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); - list.forEach(item -> { - item.setMemberSettlePeriod(csPeriod.getSettleDate()); - }); - ExcelUtil util = new ExcelUtil<>(memberPointVO.class); - util.exportExcel(response, list, "会员点位信息"); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java index 94ab3f43..724a4730 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java @@ -2,7 +2,6 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.achieve.CuMemberRetailDetail; -import com.hzs.member.structure.controller.dto.CuMemberPointDTO; import com.hzs.member.structure.controller.vo.ChildCodeVO; import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO; import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO; @@ -42,8 +41,8 @@ public interface CuMemberRetailDetailMapper extends BaseMapper getCuMemberRetailDetailList(String settleTableName, String memberCode, Integer stage, Integer stageStatus); - CuMemberPointDetailVO getPointDetailByUserId(Long userId, Long pointMember,Integer stage, Integer point, String settleTableName); + CuMemberPointDetailVO getPointDetailByUserId(Long userId, Integer stage, Integer point, String settleTableName); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java index 3b09f539..0650e949 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java @@ -12,8 +12,6 @@ import com.hzs.common.domain.member.base.CuMember; import com.hzs.member.base.mapper.CuMemberRetailDetailMapper; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.service.ICumemberRetailDetailService; -import com.hzs.member.structure.controller.dto.CuMemberDetailDTO; -import com.hzs.member.structure.controller.dto.CuMemberPointDTO; import com.hzs.member.structure.controller.vo.ChildCodeVO; import com.hzs.member.structure.controller.vo.CuMemberPointDetailVO; import com.hzs.member.structure.controller.vo.CuMemberThreeFrameworkVO; @@ -72,7 +70,7 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl> nodeList = new ArrayList<>(); - nodeList.add(makeNode(EMemberChildNodeType.ROOT.getId(), EMemberChildNodeType.ROOT.getParentId(), EMemberChildNodeType.ROOT.getLabel(), null,cuMemberRetailDetail.getPkMember(), memberMap)); + nodeList.add(makeNode(EMemberChildNodeType.ROOT.getId(), EMemberChildNodeType.ROOT.getParentId(), EMemberChildNodeType.ROOT.getLabel(), cuMemberRetailDetail.getChildNode(),cuMemberRetailDetail.getPkMember(), memberMap)); nodeList.add(makeNode(EMemberChildNodeType.NODE1.getId(), EMemberChildNodeType.NODE1.getParentId(), EMemberChildNodeType.NODE1.getLabel(), cuMemberRetailDetail.getPoint11(), cuMemberRetailDetail.getPointMember11(), memberMap)); nodeList.add(makeNode(EMemberChildNodeType.NODE2.getId(), EMemberChildNodeType.NODE2.getParentId(), EMemberChildNodeType.NODE2.getLabel(), cuMemberRetailDetail.getPoint12(),cuMemberRetailDetail.getPointMember12(), memberMap)); @@ -124,23 +122,10 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus); - return AjaxResult.success(cuMemberThreeFrameworkVOS); + return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS)); } @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @GetMapping("/pointDetail") - public AjaxResult pointDetail(Long pkMember,Long pointMember,Integer stage,Integer point,Long memberSettlePeriodId) { - if (pkMember == null || stage == null || point == null || memberSettlePeriodId == null || pointMember == null) { + public AjaxResult pointDetail(Long pkMember,Integer stage,Integer point,Long memberSettlePeriodId) { + if (pkMember == null || stage == null || point == null || memberSettlePeriodId == null) { log.error("参数错误"); return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } @@ -291,7 +292,7 @@ public class MemberStructureController extends BaseController { log.error("当前表名不存在{}",settleTableName); return AjaxResult.error("当前日结信息表不存在",settleTableName); } - CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,pointMember,stage,point,settleTableName); + CuMemberPointDetailVO cuMemberPointDetailVO = iCumemberRetailDetailService.getPointDetailByUserId(pkMember,stage,point,settleTableName); if (cuMemberPointDetailVO == null) { return null; } diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml index 2611ea8d..f7897a31 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml @@ -79,11 +79,18 @@ curd.CHILD_NODE