diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java index 3af5f615..6a6a01c5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java @@ -19,10 +19,9 @@ 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 com.hzs.common.core.exception.ServiceException; + import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java index 147a170a..f4aae2cf 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员信息-等级升级记录 Mapper 接口 - * - * @author hzs - * @since 2022-10-11 */ public interface CuMemberLevelMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index 667760d4..2eae8d5b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -10,9 +10,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务类 - * - * @author hzs - * @since 2022-10-11 */ public interface ICuMemberLevelService extends IService { @@ -30,9 +27,6 @@ public interface ICuMemberLevelService extends IService { * @param pkOrder 订单 * @param pkApprove 审核人 * @param currentDateTime 当前时间 - * @return: void - * @Author: sui q - * @Date: 2023/3/30 9:15 */ void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 1bb83f7d..b1b1da17 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -17,9 +17,6 @@ import java.util.List; /** * 会员信息-等级升级记录 服务实现类 - * - * @author hzs - * @since 2022-10-11 */ @Service public class CuMemberLevelServiceImpl extends ServiceImpl implements ICuMemberLevelService { diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml index 82c6995c..9e8d82e4 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml @@ -32,6 +32,7 @@ left join bd_grade bgn on bgn.pk_id = cml.new_level where cml.del_flag = 0 + and cm.del_flag = 0 and cm.member_code like #{param.memberCode} || '%' diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java index 3b898d92..b4d57f38 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberAwardsStatController.java @@ -274,8 +274,6 @@ public class CuMemberAwardsStatController extends BaseController { public TableDataInfo analysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { Date date = DateUtils.currentDate(); cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); - //查询当前国家的汇率 - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); @@ -294,6 +292,9 @@ public class CuMemberAwardsStatController extends BaseController { realList = iCuMemberAwardsStatService.selectAwardsAnalysisList(list); } if (CollectionUtil.isNotEmpty(list) && CollectionUtil.isNotEmpty(realList)) { + //查询当前国家的汇率 + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + list.forEach(itm -> { //业绩转为当前国家的汇率 list.forEach(itmm -> { @@ -442,12 +443,7 @@ public class CuMemberAwardsStatController extends BaseController { @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-analysis") public void exportAnalysis(HttpServletResponse response, CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EUpgradeType.values()); - //查询当前国家的汇率 - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Date date = DateUtils.currentDate(); cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); //当前日期前一天 @@ -464,10 +460,12 @@ public class CuMemberAwardsStatController extends BaseController { } List realList = iCuMemberAwardsStatService.selectAwardsAnalysisList(list); if (CollectionUtil.isNotEmpty(list) && CollectionUtil.isNotEmpty(realList)) { + //查询当前国家的汇率 + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EUpgradeType.values()); + list.forEach(itm -> { itm.setUpTypeVal(transactionMap.get(EnumsPrefixConstants.UPGRADE_TYPE + itm.getUpType())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setPkRegisterGradeVal(transactionMap1.get(itm.getPkRegisterGrade())); //业绩转为当前国家的汇率 list.forEach(itmm -> { if (itm.getPkMember().equals(itmm.getPkMember()) && diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberBrollyStatController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberBrollyStatController.java index 8e6d0dc9..0382d616 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberBrollyStatController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuMemberBrollyStatController.java @@ -1,6 +1,5 @@ package com.hzs.report.member.controller.manage; - import com.hzs.common.core.annotation.Log; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EOperationBusiness; @@ -27,12 +26,7 @@ import java.util.ArrayList; import java.util.List; /** - *

* 会员伞下统计相关 前端控制器 - *

- * - * @author zhangjing - * @since 2022-10-20 */ @RestController @RequestMapping("/manager/member-brolly") @@ -40,52 +34,41 @@ public class CuMemberBrollyStatController extends BaseController { @Autowired private IMemberService iMemberService; + @DubboReference - private IMemberServiceApi iMemberServiceApi; + IMemberServiceApi iMemberServiceApi; /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:53 - * @param: [umbrellaBalanceVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询伞下账户余额 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BALANCE, method = EOperationMethod.SELECT) @GetMapping("/umbrella-list") public TableDataInfo umbrellalist(CuMemberUmbrellaBalanceVO umbrellaBalanceVO) { - startPage(); - Integer pkCountry = SecurityUtils.getPkCountry(); - umbrellaBalanceVO.setPkCountry(pkCountry); - List list; + List list = new ArrayList<>(); + if (StringUtils.isNotEmpty(umbrellaBalanceVO.getMemberCode())) { R member = iMemberServiceApi.getMember(umbrellaBalanceVO.getMemberCode()); umbrellaBalanceVO.setPkId(member.getData().getPkId()); + umbrellaBalanceVO.setPkCountry(SecurityUtils.getPkCountry()); + startPage(); list = iMemberService.selectUmbrellaLowerBalance(umbrellaBalanceVO); - } else { - list = new ArrayList<>(); } return getDataTable(list); } /** - * @description: 导出 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 16:10 - * @param: [response, umbrellaBalanceVO] - * @return: void + * 导出 查询伞下账户余额 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BALANCE, method = EOperationMethod.EXPORT) @PostMapping("/export-umbrella") public void exportUmbrella(HttpServletResponse response, CuMemberUmbrellaBalanceVO umbrellaBalanceVO) { - List list; - Integer pkCountry = SecurityUtils.getPkCountry(); - umbrellaBalanceVO.setPkCountry(pkCountry); + List list = new ArrayList<>(); + if (StringUtils.isNotEmpty(umbrellaBalanceVO.getMemberCode())) { R member = iMemberServiceApi.getMember(umbrellaBalanceVO.getMemberCode()); umbrellaBalanceVO.setPkId(member.getData().getPkId()); + umbrellaBalanceVO.setPkCountry(SecurityUtils.getPkCountry()); list = iMemberService.selectUmbrellaLowerBalance(umbrellaBalanceVO); - } else { - list = new ArrayList<>(); } ExcelUtil util = new ExcelUtil<>(CuMemberUmbrellaBalanceVO.class); util.exportExcel(response, list, "伞下账户余额"); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java index 9ea38046..a34ea1a9 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/CuUmbrellaBelowPushController.java @@ -2,7 +2,6 @@ package com.hzs.report.member.controller.manage; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.EOperationBusiness; import com.hzs.common.core.enums.EOperationMethod; @@ -12,7 +11,6 @@ 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.base.CuMember; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.member.base.IMemberServiceApi; import com.hzs.report.member.service.IMemberService; import com.hzs.report.member.vo.UmbrellaBelowPushVO; @@ -29,6 +27,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 伞下直推 @@ -38,12 +37,10 @@ import java.util.Map; public class CuUmbrellaBelowPushController extends BaseController { @Autowired - private IMemberService memberService; - @Autowired - private ITransactionCommonService iTransactionCommonService; + private IMemberService iMemberService; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; /** * 伞下直推 @@ -55,21 +52,15 @@ public class CuUmbrellaBelowPushController extends BaseController { if (StringUtils.isEmpty(uvo.getMemberCode())) { return getDataTable(uvoExtList); } - R member = memberServiceApi.getMember(uvo.getMemberCode()); + R member = iMemberServiceApi.getMember(uvo.getMemberCode()); if (null != member.getData()) { + uvo.setPkMember(member.getData().getPkId()); //查询伞下推荐人 startPage(); - uvo.setPkMember(member.getData().getPkId()); - uvoExtList = memberService.queryUmbrellaBelowPush(uvo); - List pkMemberList = new ArrayList<>(); + uvoExtList = iMemberService.queryUmbrellaBelowPush(uvo); if (CollectionUtil.isNotEmpty(uvoExtList)) { - uvoExtList.forEach(itm -> { - pkMemberList.add(itm.getPkMember()); - }); - } - if (CollectionUtil.isNotEmpty(pkMemberList)) { - uvo.setPkMemberList(pkMemberList); - List ordeList = memberService.queryOrderExpend(uvo); + uvo.setPkMemberList(uvoExtList.stream().map(UmbrellaBelowPushVO::getPkMember).collect(Collectors.toList())); + List ordeList = iMemberService.queryOrderExpend(uvo); Map orderMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(ordeList)) { ordeList.forEach(itms -> { @@ -92,44 +83,33 @@ public class CuUmbrellaBelowPushController extends BaseController { @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_DIRECT_PUSH, method = EOperationMethod.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, UmbrellaBelowPushVO uvo) { - List list = new ArrayList<>(); + List uvoExtList = new ArrayList<>(); if (StringUtils.isEmpty(uvo.getMemberCode())) { ExcelUtil util = new ExcelUtil<>(UmbrellaBelowPushVO.class); - util.exportExcel(response, list, "伞下直推统计"); + util.exportExcel(response, uvoExtList, "伞下直推统计"); } - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - R member = memberServiceApi.getMember(uvo.getMemberCode()); + R member = iMemberServiceApi.getMember(uvo.getMemberCode()); if (null != member.getData()) { + uvo.setPkMember(member.getData().getPkId()); //查询伞下推荐人 startPage(); - uvo.setPkMember(member.getData().getPkId()); - list = memberService.queryUmbrellaBelowPush(uvo); - List pkMemberList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(list)) { - list.forEach(itm -> { - pkMemberList.add(itm.getPkMember()); - }); - } - if (CollectionUtil.isNotEmpty(pkMemberList)) { - uvo.setPkMemberList(pkMemberList); - List ordeList = memberService.queryOrderExpend(uvo); + uvoExtList = iMemberService.queryUmbrellaBelowPush(uvo); + if (CollectionUtil.isNotEmpty(uvoExtList)) { + uvo.setPkMemberList(uvoExtList.stream().map(UmbrellaBelowPushVO::getPkMember).collect(Collectors.toList())); + List ordeList = iMemberService.queryOrderExpend(uvo); Map orderMap = new HashMap<>(); if (CollectionUtil.isNotEmpty(ordeList)) { ordeList.forEach(itms -> { orderMap.merge(itms.getPkMember(), itms.getOrderAchieve(), (a, b) -> b.add(a)); }); } - list.forEach(itm -> { + uvoExtList.forEach(itm -> { itm.setOrderAchieve(orderMap.get(itm.getPkMember())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setPkRegisterGradeVal(transactionMap1.get(itm.getPkRegisterGrade())); }); } } ExcelUtil util = new ExcelUtil<>(UmbrellaBelowPushVO.class); - util.exportExcel(response, list, "伞下直推统计"); + util.exportExcel(response, uvoExtList, "伞下直推统计"); } - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java index 008d27cd..50b70268 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java @@ -59,7 +59,7 @@ public class MemberReportController extends BaseController { ICurrencyServiceApi iCurrencyServiceApi; /** - * @description: 伞下直推新增业绩 + * 伞下直推新增业绩 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT) @GetMapping("/direct-push-new") @@ -118,7 +118,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 伞下直推新增业绩导出 + * 伞下直推新增业绩导出 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT) @PostMapping("/export-direct-push-new") @@ -178,7 +178,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 伞下直推新增业绩（历史） + * 伞下直推新增业绩（历史） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT) @GetMapping("/direct-push-new-up") @@ -253,7 +253,7 @@ public class MemberReportController extends BaseController { /** - * @description: 伞下直推新增业绩导出(历史) + * 伞下直推新增业绩导出(历史) **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT) @PostMapping("/export-direct-push-new-up") @@ -423,7 +423,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 伞下新增安置业绩列表（历史） + * 伞下新增安置业绩列表（历史） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT) @GetMapping("/member-resettle-achieve_up") @@ -501,7 +501,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 导出伞下新增安置业绩列表 + * 导出伞下新增安置业绩列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT) @PostMapping("/member-resettle-achieve_up_export") @@ -931,7 +931,7 @@ public class MemberReportController extends BaseController { } /* - * @description: 安置反查 + * 安置反查 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PLACE_PEG, method = EOperationMethod.SELECT) @PostMapping("/place-peg") @@ -966,7 +966,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 导出安置反查 + * 导出安置反查 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PLACE_PEG, method = EOperationMethod.EXPORT) @PostMapping("/export-place-peg") @@ -998,7 +998,7 @@ public class MemberReportController extends BaseController { } /* - * @description: 推荐反查 + * 推荐反查 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.SELECT) @PostMapping("/parent-peg") @@ -1023,7 +1023,7 @@ public class MemberReportController extends BaseController { } /** - * @description: 导出推荐反查 + * 导出推荐反查 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.EXPORT) @PostMapping("/export-parent-peg") diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java index f3023d34..acb5f384 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 会员信息-奖衔升级记录 Mapper 接口 + * 会员信息 Mapper 接口 */ public interface MemberMapper extends BaseMapper { @@ -93,11 +93,4 @@ public interface MemberMapper extends BaseMapper { */ List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO); - /** - * 统计分析-伞下直推会员信息 - * - * @param pkId - * @return - */ - UmbrellaBelowPushVO queryUmbrellaBelowInfo(@Param("pkId") Long pkId); } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java index 9e0695a9..b076c236 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java @@ -8,63 +8,33 @@ import com.hzs.report.member.vo.UmbrellaBelowPushVO; import java.util.List; /** - * @description: 会员查询的服务 - * @author: sui q - * @time: 2023/8/26 09:37 - * @classname: IMemberService - * @package_name: com.hzs.report.member.service - * version 1.0.0 + * 会员查询的服务 */ public interface IMemberService { + /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:29 - * @param: [umbrellaBalanceVO] - * @return: java.util.List - **/ + * 查询伞下账户余额 + */ List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO); - /* - * @description: 会员安置反查 - * @author: sui q - * @date: 2023/8/28 15:03 - * @param: null null - **/ + /** + * 会员安置反查 + */ List queryPlaceCuMemberAchieveExt(CuMemberUmbrellaParam cuMemberUmbrellaParam); - /* - * @description: 会员推荐反查 - * @author: sui q - * @date: 2023/8/28 15:03 - * @param: null null - **/ + /** + * 会员推荐反查 + */ List queryParentCuMemberAchieveExt(CuMemberUmbrellaParam cuMemberUmbrellaParam); /** - * @description: 统计分析-伞下直推 - * @author: zhang jing - * @date: 2023/6/13 9:59 - * @param: [memberId] - * @return: java.util.List - **/ + * 统计分析-伞下直推 + */ List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO); /** - * @description: 查询会员订单消费业绩 - * @author: zhang jing - * @date: 2023/9/12 10:41 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List - **/ + * 查询会员订单消费业绩 + */ List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO); - /** - * @description: 统计分析-伞下直推会员信息 - * @author: zhang jing - * @date: 2023/6/13 13:44 - * @param: [pkId] - * @return: java.util.List - **/ - UmbrellaBelowPushVO queryUmbrellaBelowInfo(Long pkId); } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java index 0d63b6da..aa82431e 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java @@ -19,12 +19,7 @@ import java.util.Date; import java.util.List; /** - * @description: 会员 - * @author: sui q - * @time: 2023/8/26 09:37 - * @classname: MemberServiceImpl - * @package_name: com.hzs.report.member.service.impl - * version 1.0.0 + * 会员查询的服务 */ @Service public class MemberServiceImpl implements IMemberService { @@ -33,15 +28,8 @@ public class MemberServiceImpl implements IMemberService { private MemberMapper memberMapper; @DubboReference - private ICuMemberSettlePeriodServiceApi cuMemberSettlePeriodServiceApi; + ICuMemberSettlePeriodServiceApi iCuMemberSettlePeriodServiceApi; - /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:29 - * @param: [umbrellaBalanceVO] - * @return: java.util.List - **/ @Override public List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO) { return memberMapper.selectUmbrellaLowerBalance(umbrellaBalanceVO); @@ -52,18 +40,18 @@ public class MemberServiceImpl implements IMemberService { Date settleDate = cuMemberUmbrellaParam.getQueryDate() == null ? DateUtils.currentDate() : cuMemberUmbrellaParam.getQueryDate(); if (DateUtils.compareDateBefore(settleDate, DateUtils.currentDate())) { String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate); - CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); + CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); String tableName = TableNameConstants.CU_MEMBER_SETTLE + cuMemberSettlePeriod.getPkId(); String tableAssName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(date); - Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); + Integer period = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); return memberMapper.queryPlaceParentHisCuMemberAchieveExt(tableName, tableAssName, period, cuMemberUmbrellaParam); } else { settleDate = DateUtils.beforeDate(1, ChronoUnit.DAYS); String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate); - CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); + CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); String tableAssName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(date); String tableName = TableNameConstants.CU_MEMBER_SETTLE + cuMemberSettlePeriod.getPkId(); - Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); + Integer period = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); return memberMapper.queryPlaceParentCuMemberAchieveExt(tableName, tableAssName, period, cuMemberUmbrellaParam); } } @@ -73,53 +61,28 @@ public class MemberServiceImpl implements IMemberService { Date settleDate = cuMemberUmbrellaParam.getQueryDate() == null ? DateUtils.currentDate() : cuMemberUmbrellaParam.getQueryDate(); if (DateUtils.compareDateBefore(settleDate, DateUtils.currentDate())) { String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate); - CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); + CuMemberSettlePeriod cuMemberSettlePeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); String tableName = TableNameConstants.CU_MEMBER_SETTLE + cuMemberSettlePeriod.getPkId(); String tableAssName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(date); - Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); + Integer period = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); return memberMapper.queryParentParentHisCuMemberAchieveExt(tableName, tableAssName, period, cuMemberUmbrellaParam); } else { settleDate = DateUtils.beforeDate(1, ChronoUnit.DAYS); String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate); String tableAssName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(date); - Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); + Integer period = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); return memberMapper.queryParentParentCuMemberAchieveExt(tableAssName, period, cuMemberUmbrellaParam); } } - /** - * @description: 统计分析-伞下直推 - * @author: zhang jing - * @date: 2023/6/13 13:54 - * @param: [memberId] - * @return: java.util.List - **/ @Override public List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO) { return memberMapper.queryUmbrellaBelowPush(umbrellaBelowPushVO); } - /** - * @description: 查询会员订单消费业绩 - * @author: zhang jing - * @date: 2023/9/12 10:41 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List - **/ @Override public List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO) { return memberMapper.queryOrderExpend(umbrellaBelowPushVO); } - /** - * @description: 统计分析-伞下直推会员信息 - * @author: zhang jing - * @date: 2023/6/13 13:44 - * @param: [memberId] - * @return: java.util.List - **/ - @Override - public UmbrellaBelowPushVO queryUmbrellaBelowInfo(Long pkId) { - return memberMapper.queryUmbrellaBelowInfo(pkId); - } } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsAnalysisVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsAnalysisVO.java index b3c55b36..4a127d38 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsAnalysisVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsAnalysisVO.java @@ -11,12 +11,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 会员信息-真实奖衔分析VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class CuMemberAwardsAnalysisVO { @@ -57,7 +52,6 @@ public class CuMemberAwardsAnalysisVO { */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) private Integer pkRegisterGrade; - /** * 注册等级 */ @@ -68,7 +62,6 @@ public class CuMemberAwardsAnalysisVO { */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) private Integer pkAwards; - /** * 奖衔 */ @@ -88,15 +81,14 @@ public class CuMemberAwardsAnalysisVO { * 左区真实累计业绩 */ @BigDecimalFormat - @Excel(name = "左区真实累计业绩(￥)",scale = 2) - private BigDecimal aSumRealPv=BigDecimal.ZERO; + @Excel(name = "左区真实累计业绩(￥)", scale = 2) + private BigDecimal aSumRealPv = BigDecimal.ZERO; /** * 右区真实累计业绩 */ @BigDecimalFormat - @Excel(name = "右区真实累计业绩(￥)",scale = 2) - private BigDecimal bSumRealPv=BigDecimal.ZERO; - + @Excel(name = "右区真实累计业绩(￥)", scale = 2) + private BigDecimal bSumRealPv = BigDecimal.ZERO; /** * 结算期间 @@ -113,7 +105,7 @@ public class CuMemberAwardsAnalysisVO { /** * 创建时间 */ - @Excel(name = "晋升日期",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "晋升日期", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** @@ -135,7 +127,7 @@ public class CuMemberAwardsAnalysisVO { */ private Integer pkTeamCode; /** - * 业绩表 + * 业绩表 */ private String achieveTableName; @@ -154,6 +146,4 @@ public class CuMemberAwardsAnalysisVO { private Integer pkGrade; - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberUmbrellaBalanceVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberUmbrellaBalanceVO.java index aa4f7d27..10f99298 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberUmbrellaBalanceVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberUmbrellaBalanceVO.java @@ -1,5 +1,6 @@ package com.hzs.report.member.vo; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -12,11 +13,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * @Description: 安置伞下账户余额 - * @Author: zhangjing - * @Time: 2022/10/13 11:21 - * @Classname: CuMemberVO - * @PackageName: com.hzs.member.base.vo + * 安置伞下账户余额 */ @Data @EqualsAndHashCode(callSuper = false) @@ -60,79 +57,83 @@ public class CuMemberUmbrellaBalanceVO implements Serializable { @Excel(name = "隶属团队") private String teamName; - /** * 现金账户 */ - @Excel(name = "现金账户余额(￥)") + @BigDecimalFormat + @Excel(name = "现金账户余额(￥)", scale = 2) private BigDecimal account2; /** * 现金锁定账户 */ - @Excel(name = "冻结现金账户(￥)") + @BigDecimalFormat + @Excel(name = "冻结现金账户(￥)", scale = 2) private BigDecimal lockAccount2; /** * 可提现账户余额 */ - @Excel(name = "可提现账户余额(￥)") + @BigDecimalFormat + @Excel(name = "可提现账户余额(￥)", scale = 2) private BigDecimal withdrawAccount4; - - /** * 奖金账户 */ - @Excel(name = "奖金账户余额(￥)") + @BigDecimalFormat + @Excel(name = "奖金账户余额(￥)", scale = 2) private BigDecimal account4; /** * 奖金锁定账户 */ - @Excel(name = "冻结奖金账户(￥)") + @BigDecimalFormat + @Excel(name = "冻结奖金账户(￥)", scale = 2) private BigDecimal lockAccount4; /** * 消费账户 */ - @Excel(name = "消费账户余额(￥)") + @BigDecimalFormat + @Excel(name = "消费账户余额(￥)", scale = 2) private BigDecimal account1; - /** * 政策账户 */ - @Excel(name = "政策账户余额(￥)") + @BigDecimalFormat + @Excel(name = "政策账户余额(￥)", scale = 2) private BigDecimal account3; - /** * 重消账户 */ - @Excel(name = "重销账户余额(￥)") + @BigDecimalFormat + @Excel(name = "重销账户余额(￥)", scale = 2) private BigDecimal account5; - /** * 积分账户 */ - @Excel(name = "积分账户余额") + @BigDecimalFormat + @Excel(name = "积分账户余额", scale = 2) private BigDecimal account6; - /** * 鼓励账户 */ - @Excel(name = "鼓励账户余额") + @BigDecimalFormat + @Excel(name = "鼓励账户余额", scale = 2) private BigDecimal account7; - /** * 复购券账户 */ - @Excel(name = "复购券余额") + @BigDecimalFormat + @Excel(name = "复购券余额", scale = 2) private BigDecimal account8; + /** * 隶属体系 */ @@ -146,7 +147,6 @@ public class CuMemberUmbrellaBalanceVO implements Serializable { */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) private Integer pkAwards; - /** * 奖衔 */ @@ -154,8 +154,5 @@ public class CuMemberUmbrellaBalanceVO implements Serializable { private Integer pkCountry; - - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java index 0b1e6a9e..969043f8 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/UmbrellaBelowPushVO.java @@ -1,6 +1,7 @@ package com.hzs.report.member.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; @@ -10,7 +11,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; - /** * 伞下直推VO */ @@ -45,13 +45,11 @@ public class UmbrellaBelowPushVO { @Excel(name = "注册等级") private String pkRegisterGradeVal; - /** * 真实奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) private Integer pkAwards; - @Excel(name = "真实奖衔") private String pkAwardsVal; @@ -92,7 +90,8 @@ public class UmbrellaBelowPushVO { /** * 订单实际业绩 */ - @Excel(name = "消费PV") + @BigDecimalFormat + @Excel(name = "消费业绩(PV)") private BigDecimal orderAchieve; /** diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java index 7839bbfc..bc6cc52f 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** * 会员结算期间 Mapper 接口 - * - * @author hzs - * @since 2022-10-26 */ public interface CuMemberSettlePeriodMapper extends BaseMapper { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java index 1fc61ff7..509cf624 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** * 会员结算期间 服务类 - * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberSettlePeriodService extends IService { @@ -15,9 +12,6 @@ public interface ICuMemberSettlePeriodService extends IService implements ICuMemberSettlePeriodService { diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml index 325f955e..81d23d96 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/CuMemberAwardsStatMapper.xml @@ -274,8 +274,8 @@ cm.MEMBER_CODE memberCode, cm.MEMBER_NAME memberName, cm.PHONE phone, - aw.PK_TRANSACTION as pkAwards, - bg.PK_TRANSACTION as pkRegisterGrade, + aw.awards_name as pkAwardsVal, + bg.grade_name as pkRegisterGradeVal, ver.VERTEX_NAME as vertexName, ct.TEAM_NAME as teamName, cma.CREATION_TIME creationTime, @@ -288,12 +288,12 @@ left join bd_vertex ver on cm.pk_vertex = ver.pk_id LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code LEFT JOIN BD_COUNTRY bc on bc.PK_ID=cm.PK_SETTLE_COUNTRY - where cma.DEL_FLAG=0 and - cm.DEL_FLAG=0 and - aw.DEL_FLAG=0 and - bc.DEL_FLAG=0 and - bg.DEL_FLAG=0 and - cm.PK_SETTLE_COUNTRY=#{pkCountry} + where cma.DEL_FLAG = 0 + and cm.DEL_FLAG = 0 + and aw.DEL_FLAG = 0 + and bc.DEL_FLAG = 0 + and bg.DEL_FLAG = 0 + and cm.PK_SETTLE_COUNTRY = #{pkCountry} AND cm.MEMBER_CODE like #{memberCode} || '%' @@ -342,12 +342,12 @@ cmat.REP_A_SUM_PV repASumPv, cmat.REP_B_SUM_PV repBSumPv FROM CU_MEMBER_AWARDS cma - left join ${item.achieveTableName} cmat on cma.PK_MEMBER=cmat.PK_MEMBER - where cma.DEL_FLAG=0 - and cma.PK_MEMBER=#{item.pkMember} - and cma.period=#{item.period} + left join ${item.achieveTableName} cmat + on cma.PK_MEMBER = cmat.PK_MEMBER + where cma.DEL_FLAG = 0 + and cma.PK_MEMBER = #{item.pkMember} + and cma.period = #{item.period} - diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml index ed8c4058..1c7b003c 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml @@ -2,38 +2,35 @@ - - - select cm.pk_id pkId, cm.member_code memberCode, cm.member_name memberName, cm.phone, - aw.PK_TRANSACTION as pkAwards, + aw.awards_name as pkAwardsVal, ver.VERTEX_NAME as vertexName, ct.TEAM_NAME as teamName, cmac.account2, cmac.LOCK_ACCOUNT2 lockAccount2, cmac.account4, cmac.LOCK_ACCOUNT4 lockAccount4, + cmac.WITHDRAW_ACCOUNT4 withdrawAccount4, cmac.account1, cmac.account3, cmac.account5, cmac.account6, cmac.account7, - cmac.account8, - cmac.WITHDRAW_ACCOUNT4 withdrawAccount4 + cmac.account8 from cu_member cm - LEFT JOIN BD_AWARDS aw on aw.pk_ID=cm.PK_AWARDS + LEFT JOIN BD_AWARDS aw on aw.pk_ID = cm.PK_AWARDS left join bd_vertex ver on cm.pk_vertex = ver.pk_id and ver.del_flag = 0 LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code left join CU_MEMBER_ACCOUNT cmac on cmac.PK_MEMBER=cm.pk_id where cm.del_flag = 0 and cmac.del_flag = 0 - - AND cm.PK_SETTLE_COUNTRY=#{pkCountry} + AND cm.PK_SETTLE_COUNTRY = #{pkCountry} AND cm.MEMBER_NAME like #{memberName} || '%' @@ -42,19 +39,18 @@ AND cm.phone like #{phone} || '%' - AND cm.PK_AWARDS=#{pkAwards} + AND cm.PK_AWARDS = #{pkAwards} - AND cm.pk_vertex=#{pkVertex} + AND cm.pk_vertex = #{pkVertex} - AND cm.pk_team_code=#{pkTeamCode} + AND cm.pk_team_code = #{pkTeamCode} start with cm.pk_id = #{pkId} connect by cm.PK_PARENT = prior cm.pk_id order by level - - - - - - diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberSettlePeriod.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberSettlePeriod.java index 82674cb5..f2824c4c 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberSettlePeriod.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberSettlePeriod.java @@ -12,12 +12,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员结算期间 - *

- * - * @author hzs - * @since 2022-10-26 */ @Data @Accessors(chain = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java index a6d93e98..c15187b0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberLevel.java @@ -15,9 +15,6 @@ import lombok.experimental.Accessors; /** * 会员信息-等级升级记录 - * - * @author hzs - * @since 2022-10-11 */ @Data @EqualsAndHashCode(callSuper = false)