diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index a558392a..2804cded 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -465,11 +465,11 @@ public class ApiMemberController extends BaseController { log.error("当前表名不存在{}",settleTableName); return AjaxResult.error("数据查询错误,请联系客服处理"); } - List list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId); + List list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId); if (CollectionUtil.isEmpty(list)) { return AjaxResult.success(); } - memberPointVO memberPointVO = list.get(0); + MemberPointVO memberPointVO = list.get(0); memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate()); startPage(); return AjaxResult.success(memberPointVO); 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 b593cd6e..abeabc42 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 @@ -11,6 +11,7 @@ import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.constant.VertexConstants; +import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; @@ -799,7 +800,7 @@ public class CuMemberController extends BaseController { public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) { if (memberSettlePeriodId == null) { log.error("参数错误{}", memberSettlePeriodId); - return AjaxResult.error(); + return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("会员结算表信息{}",csPeriod); @@ -809,9 +810,9 @@ public class CuMemberController extends BaseController { Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); - return AjaxResult.error(); + return AjaxResult.error("当前会员日结表信息不存在"); } - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); @@ -830,11 +831,11 @@ public class CuMemberController extends BaseController { log.info("会员结算表信息{}",csPeriod); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); log.info("会员结算表名称{}",settleTableName); - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn()); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn()); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); - ExcelUtil util = new ExcelUtil<>(memberPointVO.class); + 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/CuMemberRetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java index 6f4411e4..731751c1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java @@ -3,7 +3,7 @@ package com.hzs.member.base.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.base.CuMemberRetail; -import com.hzs.member.base.vo.memberPointVO; +import com.hzs.member.base.vo.MemberPointVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,7 +20,7 @@ public interface CuMemberRetailMapper extends BaseMapper { Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName); - List getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode,@Param("sort") String sort,@Param("sortColumn") String sortColumn); + List getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode, @Param("sort") String sort, @Param("sortColumn") String sortColumn); - List getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId); + List getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java index 1b9e1fb1..c69e6f38 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java @@ -1,7 +1,7 @@ package com.hzs.member.base.service; -import com.hzs.member.base.vo.memberPointVO; +import com.hzs.member.base.vo.MemberPointVO; import java.util.List; @@ -17,7 +17,7 @@ public interface ICuMemberRetailService{ Integer getFindCuMemberRetailDetail(String settleTableName); - List getMemberPointByMemberCode(String settleTableName, String memberCode,String sort,String sortColumn); + List getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn); - List getMemberPointByUserId(String settleTableName, Long userId); + List getMemberPointByUserId(String settleTableName, Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java index 09070d76..477e39ff 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.member.base.CuMemberRetail; import com.hzs.member.base.mapper.CuMemberRetailMapper; import com.hzs.member.base.service.ICuMemberRetailService; -import com.hzs.member.base.vo.memberPointVO; +import com.hzs.member.base.vo.MemberPointVO; import org.springframework.stereotype.Service; import java.util.List; @@ -26,12 +26,12 @@ public class CuMemberRetailServiceImpl extends ServiceImpl getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) { + public List getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) { return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); } @Override - public List getMemberPointByUserId(String settleTableName, Long userId) { + public List getMemberPointByUserId(String settleTableName, Long userId) { return baseMapper.getMemberPointByUserId(settleTableName,userId); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java similarity index 97% rename from bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java rename to bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java index 3f6d29af..80761fb6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java @@ -11,7 +11,7 @@ import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor -public class memberPointVO { +public class MemberPointVO { /** * 会员编号 */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml index 7224590f..38a5ae4b 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml @@ -69,7 +69,7 @@ from user_tables where table_name = upper(#{settleTableName}) - SELECT cmr.MEMBER_CODE, cmr.MEMBER_NAME, @@ -87,7 +87,7 @@ ORDER BY cmr.${sortColumn} ${sort} - SELECT cmr.MEMBER_CODE, cmr.MEMBER_NAME,