From 88b79fb841b1f91512e715954510bd73f9a3a4ec Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 30 Apr 2025 14:23:30 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=AE=89=E7=BD=AE=E3=80=81=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E6=AD=A3=E5=8F=8D=E6=9F=A5=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/MemberReportController.java | 38 ++-- .../report/member/mapper/MemberMapper.java | 91 +++++---- .../member/mapper/MemberReportMapper.java | 50 +---- .../member/param/CuMemberUmbrellaParam.java | 12 +- .../member/service/MemberReportService.java | 50 +---- .../service/impl/MemberReportServiceImpl.java | 168 ++--------------- .../member/vo/CuMemberPushAchieveVO.java | 9 - .../mapper/report/member/MemberMapper.xml | 73 +++---- .../report/member/MemberReportMapper.xml | 178 ++---------------- .../com/hzs/common/core/enums/ECategory.java | 22 ++- .../com/hzs/common/core/enums/EPlaceDept.java | 2 +- .../achieve/ext/CuMemberAchieveExt.java | 24 ++- 12 files changed, 159 insertions(+), 558 deletions(-) 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 affb256a..008d27cd 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 @@ -386,7 +386,6 @@ public class MemberReportController extends BaseController { List memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); Map memberResettleAchieveMap = memberResettleAchieveList.stream().collect(Collectors.toMap(MemberResettleAchieveVo::getPlaceDept, Function.identity())); // 左区新增业绩 - BigDecimal leftNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAchieve(); // 右区新增业绩 BigDecimal rightNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.RIGHT_DEPT.getValue()).getAchieve(); @@ -752,7 +751,6 @@ public class MemberReportController extends BaseController { // 查询区县 orderDistributionList = memberReportService.getByDistrictOrderDistribution(startTime, endTime, pkCountry); } - return getDataTable(orderDistributionList); } @@ -952,6 +950,8 @@ public class MemberReportController extends BaseController { R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); + vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept())); + vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory())); vo.setABalance(cuMemberAchieveExt.getABalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); vo.setBBalance(cuMemberAchieveExt.getBBalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); cuMemberPushAchieveVOList.add(vo); @@ -983,18 +983,10 @@ public class MemberReportController extends BaseController { List cuMemberAchieveExtList = iMemberService.queryPlaceCuMemberAchieveExt(cuMemberUmbrellaParam); if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) { R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDealerYesNo.values(), EAssessStatus.values(), EPlaceDept.values(), ECategory.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); - for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); - vo.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + cuMemberAchieveExt.getAssessStatus())); - vo.setPkRegisterGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkRegisterGrade())); - vo.setPkGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkGrade())); - vo.setPkAwardsVal(transactionMap1.get(cuMemberAchieveExt.getPkAwards())); - vo.setPlaceDeptVal(transactionMap.get(EnumsPrefixConstants.PLACE_DEPT + cuMemberAchieveExt.getPlaceDept())); - vo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cuMemberAchieveExt.getCategory())); + vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept())); + vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory())); vo.setABalance(cuMemberAchieveExt.getABalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); vo.setBBalance(cuMemberAchieveExt.getBBalance().multiply(currency.getData().getInExchangeRate()).setScale(2, BigDecimal.ROUND_HALF_UP)); cuMemberPushAchieveVOList.add(vo); @@ -1015,9 +1007,13 @@ public class MemberReportController extends BaseController { if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) { startPage(); List cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); - for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { - CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); - cuMemberPushAchieveVOList.add(vo); + if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) { + for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { + CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); + vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept())); + vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory())); + cuMemberPushAchieveVOList.add(vo); + } } TableDataInfo tableDataInfo = getDataTable(cuMemberAchieveExtList); tableDataInfo.setRows(cuMemberPushAchieveVOList); @@ -1037,18 +1033,10 @@ public class MemberReportController extends BaseController { if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) { List cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) { - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EDealerYesNo.values(), EAssessStatus.values(), EPlaceDept.values(), ECategory.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); - for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); - vo.setAssessStatusVal(transactionMap.get(EnumsPrefixConstants.ASSESS_STATUS + cuMemberAchieveExt.getAssessStatus())); - vo.setPkRegisterGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkRegisterGrade())); - vo.setPkGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkGrade())); - vo.setPkAwardsVal(transactionMap1.get(cuMemberAchieveExt.getPkAwards())); - vo.setPlaceDeptVal(transactionMap.get(EnumsPrefixConstants.PLACE_DEPT + cuMemberAchieveExt.getPlaceDept())); - vo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cuMemberAchieveExt.getCategory())); + vo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(cuMemberAchieveExt.getPlaceDept())); + vo.setCategoryVal(ECategory.getLabelByValue(cuMemberAchieveExt.getCategory())); cuMemberPushAchieveVOList.add(vo); } } 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 8a56322d..f3023d34 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 @@ -12,73 +12,92 @@ import java.util.List; /** * 会员信息-奖衔升级记录 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface MemberMapper extends BaseMapper { - /** - * @description: 查询伞下账户余额 - * @param: [umbrellaBalanceVO] - * @return: java.util.List - **/ + * 查询伞下账户余额 + * + * @param umbrellaBalanceVO + * @return + */ List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO); - /* - * @description: 用于反查统计分析，反差伞下， - * @param: null null - **/ + /** + * 用于反查统计分析，反差伞下， + * + * @param tableName + * @param assesTableName + * @param period + * @param param + * @return + */ List queryPlaceParentHisCuMemberAchieveExt(@Param("tableName") String tableName, @Param("assesTableName") String assesTableName, @Param("period") Integer period, @Param("param") CuMemberUmbrellaParam param); - /* - * @description: 用于反查统计分析，反差伞下， - * @param: null null - **/ + /** + * 安置正反查 + * + * @param tableName + * @param assesTableName + * @param period + * @param param + * @return + */ List queryPlaceParentCuMemberAchieveExt(@Param("tableName") String tableName, @Param("assesTableName") String assesTableName, @Param("period") Integer period, @Param("param") CuMemberUmbrellaParam param); - /* - * @description: 用于反查统计分析，反差伞下， - * @param: null null - **/ + /** + * 用于反查统计分析，反差伞下， + * + * @param tableName + * @param assesTableName + * @param period + * @param param + * @return + */ List queryParentParentHisCuMemberAchieveExt(@Param("tableName") String tableName, @Param("assesTableName") String assesTableName, @Param("period") Integer period, @Param("param") CuMemberUmbrellaParam param); - /* - * @description: 用于反查统计分析，反差伞下， - * @param: null null - **/ + /** + * 用于反查统计分析，反差伞下， + * + * @param assesTableName + * @param period + * @param param + * @return + */ List queryParentParentCuMemberAchieveExt(@Param("assesTableName") String assesTableName, @Param("period") Integer period, @Param("param") CuMemberUmbrellaParam param); /** - * @description: 统计分析-伞下直推 - * @param: [memberId] - * @return: java.util.List - **/ + * 统计分析-伞下直推 + * + * @param umbrellaBelowPushVO + * @return + */ List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO); /** - * @description: 查询会员订单消费业绩 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List - **/ + * 查询会员订单消费业绩 + * + * @param umbrellaBelowPushVO + * @return + */ List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO); /** - * @description: 统计分析-伞下直推会员信息 - * @param: [pkId] - * @return: java.util.List - **/ + * 统计分析-伞下直推会员信息 + * + * @param pkId + * @return + */ UmbrellaBelowPushVO queryUmbrellaBelowInfo(@Param("pkId") Long pkId); } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java index 1e26d465..6d443a7d 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java @@ -7,15 +7,8 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.report.member.mapper - * @Author: yh - * @CreateTime: 2023-08-26 09:53 - * @Description: TODO - * @Version: 1.0 - */ public interface MemberReportMapper { + /** * 查询伞下直推新增业绩-查询会员 * @@ -24,11 +17,7 @@ public interface MemberReportMapper { List directPushNewList(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("pkAwards") Integer pkAwards, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2023/9/6 14:10 - * @param: [pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ List directPushNewAchieList(@Param("pkMember") Long pkMember, @Param("startPayTime") Date startPayTime, @@ -37,11 +26,7 @@ public interface MemberReportMapper { @Param("pkCountry") Integer pkCountry); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/3/18 15:41 - * @param: [pkMember, startPayTime, endPayTime, pkCountry, monthList] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ List directPushNewAchieUpList(@Param("dpo") DirectPushNewVo dpo, @Param("pkMember") Long pkMember, @@ -67,11 +52,7 @@ public interface MemberReportMapper { List memberResettleAchieve(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("pkAwards") Integer pkAwards, @Param("orderTypeList") List orderTypeList); /** - * @description: 伞下新增安置业绩 - * @author: zhang jing - * @date: 2024/3/12 16:57 - * @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList] - * @return: java.util.List + * 伞下新增安置业绩 **/ List selectBrollyNewABAchieve(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @@ -156,14 +137,6 @@ public interface MemberReportMapper { */ List reportSummaryList(ReportSummaryVo reportSummaryVo); - /** - * 查询会员伞下订单左右区业绩 - * - * @param pkMember - * @return - */ - List brollyBelowResettle(@Param("pkMember") Long pkMember, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("orderTypeList") List orderTypeList); - /** * 出货明细汇总统计详情 * @@ -213,20 +186,6 @@ public interface MemberReportMapper { */ List selectMemberUnderWalletList(CuMemberWalletVO walletVO); - - /** - * 产品销量排行 - */ - List productSalesStat(@Param("skuCode") String skuCode, @Param("productName") String productName, @Param("orderType") Integer orderType, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - /** - * 查询商品统计信息 - * - * @param pkProduct - * @return - */ - List queryWaresInfoByProduct(@Param("pkProduct") Integer pkProduct, @Param("orderType") Integer orderType, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("pkSpecs") Integer pkSpecs); - /** * 查询商品统计信息 * @@ -247,4 +206,5 @@ public interface MemberReportMapper { * @return */ Integer sumQuantity(@Param("productName") String productName, @Param("pkClassify") Integer pkClassify, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("pkCountry") Integer pkCountry, @Param("orderTypeList") List orderTypeList); + } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java index 8b9b56da..bc35f221 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java @@ -6,12 +6,7 @@ import java.io.Serializable; import java.util.Date; /** - * @description: 会员伞上数据查询 - * @author: sui q - * @time: 2023/8/28 09:51 - * @classname: CumemberUmbrellaVO - * @package_name: com.hzs.report.member.vo - * version 1.0.0 + * 会员伞上数据查询 */ @Data public class CuMemberUmbrellaParam implements Serializable { @@ -31,11 +26,6 @@ public class CuMemberUmbrellaParam implements Serializable { */ private Integer placeDept; - /** - * 考核状态 - */ - private Integer isAssess; - /** * 查询方向（1=反查，2=正查） */ diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java index 216a41f8..0c3c1919 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java @@ -6,13 +6,6 @@ import com.hzs.report.member.vo.*; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/26 9:49 - * @Classname: MemberReportService - * @PackageName: com.hzs.report.member.service - */ public interface MemberReportService { /** @@ -23,24 +16,14 @@ public interface MemberReportService { List directPushNewList(Long pkMember, String memberName, Integer pkAwards, Integer pkTeamCode, Integer pkCountry, Date startPayTime, Date endPayTime, Integer pkVertex); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/1/3 16:17 - * @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ List directPushNewAchieList(Long pkMember, Date startPayTime, Date endPayTime, List orderType, Integer pkCountry); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/3/18 15:41 - * @param: [pkMember, startPayTime, endPayTime, pkCountry, monthList] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ - List directPushNewAchieUpList(DirectPushNewVo dpo, - Long pkMember, - Integer orderType); + List directPushNewAchieUpList(DirectPushNewVo dpo, Long pkMember, Integer orderType); /** * 用户消费统计 @@ -62,11 +45,7 @@ public interface MemberReportService { List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList); /** - * @description: 查询伞下新增安置业绩 - * @author: zhang jing - * @date: 2024/3/12 16:55 - * @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList] - * @return: java.util.List + * 查询伞下新增安置业绩 **/ List selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, int period); @@ -120,7 +99,6 @@ public interface MemberReportService { */ List getByDistrictOrderDistribution(Date startTime, Date endTime, Integer pkCountry); - /** * 出货明细汇总 * @@ -140,11 +118,6 @@ public interface MemberReportService { /** * 出货明细汇总统计详情 - * - * @param pkProduct - * @param productName - * @param orderType - * @return */ List productShippingDetailsList(Integer pkProduct, String productName, Integer pkClassify, Integer pkAwards, List orderTypeList, Date startTime, Date endTime, Integer pkCountry); @@ -164,7 +137,6 @@ public interface MemberReportService { */ List selectSmallAreaNewAdd(SmallAreaNewAddAchieveVO addAchieveVO); - /** * 查询伞下钱包明细 * @@ -173,19 +145,6 @@ public interface MemberReportService { */ List selectMemberUnderWalletList(CuMemberWalletVO walletVO); - /** - * 产品销量排行 - */ - List productSalesStat(String skuCode, String productName, Integer orderType, Date startTime, Date endTime); - - /** - * 查询商品统计信息 - * - * @param pkProduct - * @return - */ - List queryWaresInfoByProduct(Integer pkProduct, Integer orderType, Date startTime, Date endTime, Integer pkSpecs); - /** * 查询商品统计信息 * @@ -196,6 +155,7 @@ public interface MemberReportService { /** * 统计产品所有汇总 + * * @param productName * @param pkClassify * @param startTime diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java index 7f123c4d..bababeac 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java @@ -18,7 +18,6 @@ import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAccountServiceApi; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,14 +33,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.report.member.service.Impl - * @Author: yh - * @CreateTime: 2023-08-26 09:51 - * @Description: TODO - * @Version: 1.0 - */ @Slf4j @Service public class MemberReportServiceImpl implements MemberReportService { @@ -49,203 +40,92 @@ public class MemberReportServiceImpl implements MemberReportService { @Autowired private MemberReportMapper memberReportMapper; @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired private ITransactionCommonService iTransactionCommonService; @DubboReference - IAccountServiceApi accountServiceApi; + IAccountServiceApi iAccountServiceApi; @DubboReference ICurrencyServiceApi currencyServiceApi; - /** - * 查询伞下直推新增业绩-查询会员 - * - * @return - */ @Override public List directPushNewList(Long pkMember, String memberName, Integer pkAwards, Integer pkTeamCode, Integer pkCountry, Date startPayTime, Date endPayTime, Integer pkVertex) { return memberReportMapper.directPushNewList(pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex); } - /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2023/9/6 14:16 - * @param: [pkMember, startPayTime, endPayTime] - * @return: java.util.List - **/ @Override public List directPushNewAchieList(Long pkMember, Date startPayTime, Date endPayTime, List orderType, Integer pkCountry) { return memberReportMapper.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderType, pkCountry); } - /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/3/18 11:54 - * @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry] - * @return: java.util.List - **/ @Override public List directPushNewAchieUpList(DirectPushNewVo dpo, Long pkMember, Integer orderType) { return memberReportMapper.directPushNewAchieUpList(dpo, pkMember, orderType); } - /** - * 用户消费统计 - * - * @param memberCode 用户编号 - * @param memberName 用户姓名 - * @param startPayTime 开始支付时间 - * @param endPayTime 结束支付时间 - * @param pkWares 商品主键 - * @return - */ @Override public List memberConsumptionList(String memberCode, String memberName, Date startPayTime, Date endPayTime, Integer pkWares) { return memberReportMapper.memberConsumptionList(memberCode, memberName, startPayTime, endPayTime, pkWares); } - /** - * 伞下新增安置业绩 - * - * @return - */ @Override public List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList) { return memberReportMapper.memberResettleAchieve(pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); } - /** - * @description: 伞下新增安置业绩 - * @author: zhang jing - * @date: 2024/3/14 15:14 - * @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, treeTableName, period] - * @return: java.util.List - **/ @Override public List selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, - Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, - int period) { + Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, int period) { return memberReportMapper.selectBrollyNewABAchieve(pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, period); } - - /** - * 订单币种查询 - * - * @param memberCode 会员编号 - * @param memberName 会员名称 - * @param orderCode 订单编号 - * @param orderType 订单类型 - * @return - */ @Override public List getOrderCurrencyList(String memberCode, String memberName, String orderCode, Integer orderType) { return memberReportMapper.getOrderCurrencyList(memberCode, memberName, orderCode, orderType); } - /** - * 查询订单币种 - * - * @param orderCodeList - * @return - */ @Override public List getBySourceCodeMemberTradeList(List orderCodeList) { return memberReportMapper.getBySourceCodeMemberTradeList(orderCodeList); } - /** - * 查询省订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByProvinceOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByProvinceOrderDistribution(startTime, endTime, pkCountry); } - /** - * 查询市订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByCityOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByCityOrderDistribution(startTime, endTime, pkCountry); } - /** - * 查询区县订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByDistrictOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByDistrictOrderDistribution(startTime, endTime, pkCountry); } - /** - * 出货明细汇总 - * - * @param productName - * @param pkClassify - * @param startTime - * @param endTime - * @return - */ @Override public List getProductOrderInfo(String productName, Integer pkClassify, Date startTime, Date endTime, Integer pkCountry, List orderTypeList) { return memberReportMapper.getProductOrderInfo(productName, pkClassify, startTime, endTime, pkCountry, orderTypeList); } - /** - * 报单汇总 - * - * @return - */ @Override public List reportSummaryList(ReportSummaryVo reportSummaryVo) { return memberReportMapper.reportSummaryList(reportSummaryVo); } - /** - * 出货明细汇总统计详情 - * - * @param pkProduct - * @param productName - * @param orderType - * @return - */ @Override public List productShippingDetailsList(Integer pkProduct, String productName, Integer pkClassify, Integer pkAwards, List orderTypeList, Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.productShippingDetailsList(pkProduct, productName, pkClassify, pkAwards, orderTypeList, startTime, endTime, pkCountry); } - /** - * 产品明细查询 - * - * @param productDetailQueryParam - * @return - */ @Override public List productDetailQueryList(ProductDetailQueryParam productDetailQueryParam) { return memberReportMapper.productDetailQueryList(productDetailQueryParam); } - @Override public List selectSmallAreaNewAdd(SmallAreaNewAddAchieveVO addAchieveVO) { List areaNewAddAchieveVOList = null; @@ -258,7 +138,7 @@ public class MemberReportServiceImpl implements MemberReportService { //获取期数 String date = beforeLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); //开始时间减一天的期数 - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); addAchieveVO.setBeforePeriod(period); //查询大小区业绩表 //String settleTable = TableNameConstants.CU_MEMBER_SETTLE + period; @@ -295,9 +175,8 @@ public class MemberReportServiceImpl implements MemberReportService { * @param endDate 结束时间 * @return List */ - private List getAchieveMonthTable(String startDate, String endDate) { - MonthAchieveVO monthAchieveVO = null; + MonthAchieveVO monthAchieveVO; List monthAchieveVOList = new ArrayList<>(); LocalDate startLocalDate = DateUtils.getStringToLocalDate(startDate); LocalDate endLocalDate = DateUtils.getStringToLocalDate(endDate); @@ -307,39 +186,38 @@ public class MemberReportServiceImpl implements MemberReportService { //相差两个月及以上 if (months >= 2) { //初月信息 - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod) .build(); monthAchieveVOList.add(startMonthAchieveVO); //中间月信息 for (int i = 1; i < months; i++) { - System.out.println(startLocalDate.plusMonths(i)); monthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate.plusMonths(i))).build(); monthAchieveVOList.add(monthAchieveVO); } //末月信息 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate)) .endPeriod(endPeriod) .build(); monthAchieveVOList.add(endMonthAchieveVO); //同一个月 } else if (months == 0) { - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); monthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod).endPeriod(endPeriod).build(); monthAchieveVOList.add(monthAchieveVO); } else { //初月信息 - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod) .build(); monthAchieveVOList.add(startMonthAchieveVO); //末月信息 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate)) .endPeriod(endPeriod) .build(); @@ -348,14 +226,13 @@ public class MemberReportServiceImpl implements MemberReportService { return monthAchieveVOList; } - @Override public List selectMemberUnderWalletList(CuMemberWalletVO walletVO) { List cuMemberWalletVOList = memberReportMapper.selectMemberUnderWalletList(walletVO); if (CollUtil.isNotEmpty(cuMemberWalletVOList)) { Integer pkCountry = walletVO.getPkCountry(); //查询币种值 - List allAccounts = accountServiceApi.queryAccountByType(null, pkCountry).getData(); + List allAccounts = iAccountServiceApi.queryAccountByType(null, pkCountry).getData(); Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); //根据国家查询汇率 @@ -385,27 +262,6 @@ public class MemberReportServiceImpl implements MemberReportService { return cuMemberWalletVOList; } - /** - * 产品销量排行 - */ - @Override - public List productSalesStat(String skuCode, String productName, Integer orderType, Date startTime, Date endTime) { - - return memberReportMapper.productSalesStat(skuCode, productName, orderType, startTime, endTime); - } - - /** - * 查询商品统计信息 - * - * @param pkProduct - * @return - */ - @Override - public List queryWaresInfoByProduct(Integer pkProduct, Integer orderType, Date startTime, Date endTime, Integer pkSpecs) { - - return memberReportMapper.queryWaresInfoByProduct(pkProduct, orderType, startTime, endTime, pkSpecs); - } - /** * 查询商品统计信息 * diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberPushAchieveVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberPushAchieveVO.java index 5bda3fa3..d0b014e7 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberPushAchieveVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberPushAchieveVO.java @@ -143,15 +143,6 @@ public class CuMemberPushAchieveVO implements Serializable { @BigDecimalFormat private BigDecimal bBalance; - /** - * 考核状态 (0=考核通过,1=免考通过,2=考核不通过,3=不考核) - */ - @Transaction(transactionKey = EnumsPrefixConstants.ASSESS_STATUS) - private Integer assessStatus; - - @Excel(name = "考核状态") - private String assessStatusVal; - /** * 注册日期 */ 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 3a7416d1..ed8c4058 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 @@ -78,7 +78,7 @@ member_code, member_name, phone, pk_grade, pk_awards, pk_vertex, pk_team_code, category, 1 algebra from ${tableName} - where member_code = #{param.memberCode} + where member_code = #{param.memberCode} union select pk_member, pk_parent, pk_place_parent, place_dept, purchase_status, member_code, member_name, phone, pk_grade, pk_awards, pk_vertex, pk_team_code, @@ -150,13 +150,14 @@ order by a.algebra + @@ -320,11 +304,11 @@ @@ -415,29 +385,29 @@ where cm.del_flag = 0 and ver.del_flag = 0 and par.del_flag = 0 and place.del_flag = 0 and awa.del_flag = 0 and gr.del_flag = 0 - and cm.PK_REGISTER_GRADE = #{pkRegisterGrade} + and cm.PK_REGISTER_GRADE = #{pkRegisterGrade} - and cm.PK_AWARDS = #{pkAwards} + and cm.PK_AWARDS = #{pkAwards} - and cm.pk_team_code = #{pkTeamCode} + and cm.pk_team_code = #{pkTeamCode} - and cm.pk_vertex = #{pkVertex} + and cm.pk_vertex = #{pkVertex} - and cm.member_name like #{memberName} || '%' + and cm.member_name like #{memberName} || '%' - and par.member_code like #{parMemberCode} || '%' + and par.member_code like #{parMemberCode} || '%' - and par.member_name like #{parMemberName} || '%' + and par.member_name like #{parMemberName} || '%' - and cm.phone like #{phone} || '%' + and cm.phone like #{phone} || '%' and cm.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') @@ -500,5 +470,4 @@ - diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml index 2616a37c..8314b9a8 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml @@ -46,7 +46,8 @@ from ( select CASE WHEN sum( so.ORDER_ACHIEVE ) is null THEN 0 ELSE sum( so.ORDER_ACHIEVE ) end orderAchieve, - CASE WHEN sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) is null THEN 0 ELSE sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) end orderAmount, + CASE WHEN sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) is null THEN 0 ELSE sum( so.ORDER_AMOUNT - nvl(so.consume_amount, 0) ) end + orderAmount, CASE WHEN sum(so.order_ass_achieve) is null THEN 0 ELSE sum(so.order_ass_achieve) end orderAssAchieve from SA_ORDER so where so.DEL_FLAG = 0 @@ -100,8 +101,7 @@ ) - - + - - - + - - - - - - - - - - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java index 5943feeb..69ef8413 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ECategory.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description: 用户类型分类 - * Author: sui q - * Time: 2022/9/8 16:39 - * Classname: ECategory - * PackageName: com.hzs.common.core.enums + * 用户类型分类 */ @AllArgsConstructor @Getter @@ -47,4 +43,20 @@ public enum ECategory { * 国际化翻译key值 */ private final String key; + + /** + * 根据枚举值，获取枚举显示 + * + * @param value + * @return + */ + public static String getLabelByValue(int value) { + for (ECategory eCategory : ECategory.values()) { + if (eCategory.getValue() == value) { + return eCategory.getLabel(); + } + } + return ""; + } + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java index e4141b03..9339c3fc 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java @@ -46,7 +46,7 @@ public enum EPlaceDept { return ePlaceDept.label; } } - return null; + return ""; } /** diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberAchieveExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberAchieveExt.java index bcb36634..573e4f5f 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberAchieveExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/ext/CuMemberAchieveExt.java @@ -8,12 +8,7 @@ import java.math.BigDecimal; import java.util.Date; /** - * @description: 会员业绩扩展表 - * @author: sui q - * @time: 2023/8/26 10:45 - * @classname: CuMemberAchieveVO - * @package_name: com.hzs.common.domain.member.achieve.ext - * version 1.0.0 + * 会员业绩扩展表 */ @EqualsAndHashCode(callSuper = true) @Data @@ -45,15 +40,30 @@ public class CuMemberAchieveExt extends CuMemberAchieve { private Integer pkRegisterGrade; /** - * 等级 + * 注册等级名称 + */ + private String pkRegisterGradeVal; + + /** + * 结算等级 */ private Integer pkGrade; + /** + * 结算等级名称 + */ + private String pkGradeVal; + /** * 真实奖衔 */ private Integer pkAwards; + /** + * 奖衔名称 + */ + private String pkAwardsVal; + /** * 体系名称 */