diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java index 1d784de9..4c628543 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/ICuMemberSettlePeriodServiceApi.java @@ -4,20 +4,12 @@ import com.hzs.common.core.domain.R; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; /** - * @Description: 会员结算期间api接口 - * @Author: zhangjing - * @Time: 2022/10/26 15:12 - * @Classname: IMemberAchieveServiceAPI - * @PackageName: com.hzs.member.achieve + * 会员结算期间api接口 */ public interface ICuMemberSettlePeriodServiceApi { /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R + * 根据日期获得日期对应的期间 **/ R getCuMemberSettlePeriodByDate(String date); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java index 8848789f..4a990076 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/provider/CuMemberSettlePeriodServiceProvider.java @@ -8,11 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** - * @Description: 会员结算期间 - * @Author: zhangjing - * @Time: 2022/10/26 15:14 - * @Classname: MemberAchieveServiceProvider - * @PackageName: com.hzs.member.achieve.provider + * 会员结算期间 */ @DubboService public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePeriodServiceApi { @@ -20,13 +16,6 @@ public class CuMemberSettlePeriodServiceProvider implements ICuMemberSettlePerio @Autowired private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; - /** - * @description: 根据日期获得日期对应的期间 - * @author: zhang jing - * @date: 2023/8/26 10:25 - * @param: [date] - * @return: com.hzs.common.core.domain.R - **/ @Override public R getCuMemberSettlePeriodByDate(String date) { return R.ok(iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date)); 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 f6ff17f5..0320818b 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 @@ -51,9 +51,6 @@ import java.util.stream.Collectors; /** * 会员奖衔升级记录表 前端控制器 - * - * @author zhangjing - * @since 2022-10-20 */ @RestController @RequestMapping("/manager/member-awards") @@ -63,13 +60,11 @@ public class CuMemberAwardsStatController extends BaseController { private ICuMemberAwardsStatService iCuMemberAwardsStatService; @Autowired private ITransactionCommonService iTransactionCommonService; - @Autowired - private UserTokenService userTokenService; @DubboReference IMemberServiceApi iMemberServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @DubboReference IAreaServiceApi iAreaServiceApi; @DubboReference @@ -77,14 +72,10 @@ public class CuMemberAwardsStatController extends BaseController { @DubboReference IVertexServiceApi iVertexServiceApi; @DubboReference - ICuMemberSettlePeriodServiceApi cuMemberSettlePeriodService; + ICuMemberSettlePeriodServiceApi iCuMemberSettlePeriodServiceApi; /** - * @description: 真实业绩新增奖衔查询列表 - * @author: zhang jing - * @date: 2022/10/20 10:36 - * @param: [memberAuthorityParam] - * @return: com.hzs.common.core.web.page.TableDataInfoCLmy0718D + * 真实业绩新增奖衔查询列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REAL_PERFORMANCE_ADDED_AWARDS, method = EOperationMethod.SELECT) @GetMapping("/list") @@ -92,11 +83,11 @@ public class CuMemberAwardsStatController extends BaseController { Date date = DateUtils.currentDate(); cuMemberAwardsStatVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsStatVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -117,18 +108,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出 真实业绩新增奖衔查询列表 - * @author: zhang jing - * @date: 2023/8/25 17:30 - * @param: [response, cuMemberAwardsStatVO] - * @return: void + * 导出 真实业绩新增奖衔查询列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REAL_PERFORMANCE_ADDED_AWARDS, method = EOperationMethod.EXPORT) @PostMapping("/export") public void exportUmbrella(HttpServletResponse response, CuMemberAwardsStatVO cuMemberAwardsStatVO) { cuMemberAwardsStatVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); @@ -136,7 +123,7 @@ public class CuMemberAwardsStatController extends BaseController { //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsStatVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -157,13 +144,8 @@ public class CuMemberAwardsStatController extends BaseController { util.exportExcel(response, list, "真实业绩新增奖衔"); } - /** - * @description: 奖衔晋升查询 - * @author: zhang jing - * @date: 2024/1/2 10:38 - * @param: [awardPromotionVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 奖衔晋升查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_PROMOTION, method = EOperationMethod.SELECT) @GetMapping("/promotion-list") @@ -183,11 +165,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出奖衔晋升查询 - * @author: zhang jing - * @date: 2024/1/2 10:42 - * @param: [response, awardPromotionVO] - * @return: void + * 导出奖衔晋升查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_PROMOTION, method = EOperationMethod.EXPORT) @PostMapping("/promotion-export") @@ -217,11 +195,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 12:00 - * @param: [memberAchieveVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员业绩数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_ACHIEVE, method = EOperationMethod.SELECT) @GetMapping("/member-achieve-list") @@ -237,7 +211,7 @@ public class CuMemberAwardsStatController extends BaseController { startPage(); List list = iCuMemberAwardsStatService.memberAchieveList(memberAchieveVO); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //业绩转为当前国家的汇率 if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -256,11 +230,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description:导出会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 14:34 - * @param: [response, memberAchieveVO] - * @return: void + * 导出会员业绩数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_ACHIEVE, method = EOperationMethod.EXPORT) @PostMapping("/member-achieve-export") @@ -273,7 +243,7 @@ public class CuMemberAwardsStatController extends BaseController { memberAchieveVO.setPkCountry(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.memberAchieveList(memberAchieveVO); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //业绩转为当前国家的汇率 if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -294,93 +264,74 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 15:57 - * @param: [cuMemberAwardsStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔分析 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/analysis-list") public TableDataInfo analysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { - Date date = DateUtils.currentDate(); cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); - //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - //当前日期前一天 - String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); - //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(dateStr)).getData().getPkId(); - cuMemberAwardsAnalysisVO.setPeriod(endperiod); + // 当前日期前一天 + String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate())); + // 查询最新期数 + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(dateStr)).getData().getPkId(); + cuMemberAwardsAnalysisVO.setPeriod(endPeriod); + startPage(); List list = iCuMemberAwardsStatService.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); - for (CuMemberAwardsAnalysisVO pe : list) { - String dates = DateUtils.parseDateToStr(DateUtils.YYYY_MM, pe.getCreationTime()); - pe.setAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(dates)); - } - List realList = new ArrayList<>(); - if (CollectionUtil.isNotEmpty(list)) { - realList = iCuMemberAwardsStatService.selectAwardsAnalysisList(list); - } - if (CollectionUtil.isNotEmpty(list) && CollectionUtil.isNotEmpty(realList)) { - list.forEach(itm -> { - //业绩转为当前国家的汇率 - list.forEach(itmm -> { - if (itm.getPkMember().equals(itmm.getPkMember()) && - itm.getPeriod().equals(itmm.getPeriod())) { - if (null != currency.getData().getInExchangeRate()) { - itm.setASumRealPv(itmm.getASumRealPv().multiply(currency.getData().getInExchangeRate())); - itm.setBSumRealPv(itmm.getBSumRealPv().multiply(currency.getData().getInExchangeRate())); - } else { - itm.setASumRealPv(itmm.getASumRealPv()); - itm.setBSumRealPv(itmm.getBSumRealPv()); - } - } - }); - }); - } return getDataTable(list); } /** - * @description: 查询会员结算等级升级记录 - * @author: zhang jing - * @date: 2025/3/3 16:03 - * @param: [cuMemberGradeRecordVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出真实奖衔分析 + **/ + @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) + @PostMapping("/export-analysis") + public void exportAnalysis(HttpServletResponse response, CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { + cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); + + //当前日期前一天 + String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate())); + //查询最新期数 + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(dateStr)).getData().getPkId(); + cuMemberAwardsAnalysisVO.setPeriod(endPeriod); + + List list = iCuMemberAwardsStatService.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); + ExcelUtil util = new ExcelUtil<>(CuMemberAwardsAnalysisVO.class); + util.exportExcel(response, list, "真实奖衔分析"); + } + + + /** + * 查询会员结算等级升级记录 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.GRADE_RECORD, method = EOperationMethod.SELECT) @GetMapping("/gradeRecord-list") public TableDataInfo gradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO) { cuMemberGradeRecordVO.setPkCountry(SecurityUtils.getPkCountry()); cuMemberGradeRecordVO.setSystemType(SecurityUtils.getSystemType()); + startPage(); - List list = iCuMemberAwardsStatService.querMemberGradeRecordList(cuMemberGradeRecordVO); + List list = iCuMemberAwardsStatService.queryMemberGradeRecordList(cuMemberGradeRecordVO); return getDataTable(list); } /** - * @description: 导出会员结算等级升级记录 - * @author: zhang jing - * @date: 2025/3/3 17:27 - * @param: [response, cuMemberGradeRecordVO] - * @return: void + * 导出会员结算等级升级记录 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.GRADE_RECORD, method = EOperationMethod.EXPORT) @PostMapping("/export-gradeRecord") public void exportGradeRecord(HttpServletResponse response, CuMemberGradeRecordVO cuMemberGradeRecordVO) { - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EUpgradeType.values()); cuMemberGradeRecordVO.setPkCountry(SecurityUtils.getPkCountry()); cuMemberGradeRecordVO.setSystemType(SecurityUtils.getSystemType()); - List list = iCuMemberAwardsStatService.querMemberGradeRecordList(cuMemberGradeRecordVO); + + List list = iCuMemberAwardsStatService.queryMemberGradeRecordList(cuMemberGradeRecordVO); if (CollectionUtil.isNotEmpty(list)) { + Map transactionMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE); list.forEach(itm -> { - itm.setOldLevelVal(transactionMap1.get(itm.getOldLevel())); - itm.setNewLevelVal(transactionMap1.get(itm.getNewLevel())); - itm.setUpTypeVal(transactionMap.get(EnumsPrefixConstants.UPGRADE_TYPE+itm.getUpType())); + itm.setOldLevelVal(transactionMap.get(itm.getOldLevel())); + itm.setNewLevelVal(transactionMap.get(itm.getNewLevel())); + itm.setUpTypeVal(EUpgradeType.getLabelByValue(itm.getUpType())); }); } ExcelUtil util = new ExcelUtil<>(CuMemberGradeRecordVO.class); @@ -388,24 +339,20 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 真实奖衔分析-详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/26 11:52 - * @param: [cuMemberAwardsAnalysisVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 真实奖衔分析-详情（穿透页面接口） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ANALYSIS_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/analysis-details-list") public TableDataInfo analysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { Date date = DateUtils.currentDate(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 if (cuMemberAwardsAnalysisVO.getPeriod() == null) { - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); } @@ -427,11 +374,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出真实奖衔分析-详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/27 14:43 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void + * 导出真实奖衔分析-详情（穿透页面接口） **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-analysis-details") @@ -440,11 +383,11 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); //当前日期前一天 String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); cuMemberAwardsAnalysisVO.setPeriod(endperiod); String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; @@ -466,17 +409,13 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 收入明细 - * @author: zhang jing - * @date: 2023/9/26 9:39 - * @param: [cuMemberAwardsAnalysisVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 收入明细 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REVENUE_DETAI_LIST, method = EOperationMethod.SELECT) @GetMapping("/revenue-detai-list") public TableDataInfo revenueDetailsList(RevenueDetailsVO revenueDetailsVO) { //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); revenueDetailsVO.setPkCountry(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.selectRevenueDetailsList(revenueDetailsVO); @@ -494,18 +433,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出收入明细 - * @author: zhang jing - * @date: 2023/8/26 16:41 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void + * 导出收入明细 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REVENUE_DETAI_LIST, method = EOperationMethod.EXPORT) @PostMapping("/export-revenue-detai") public void exportRevenueDetai(HttpServletResponse response, RevenueDetailsVO revenueDetailsVO) { revenueDetailsVO.setPkCountry(SecurityUtils.getPkCountry()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); List list = iCuMemberAwardsStatService.selectRevenueDetailsList(revenueDetailsVO); @@ -526,75 +461,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 16:41 - * @param: [response, cuMemberAwardsAnalysisVO] - * @return: void - **/ - @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 = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - Date date = DateUtils.currentDate(); - cuMemberAwardsAnalysisVO.setPkCountry(SecurityUtils.getPkCountry()); - //当前日期前一天 - String dateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date)); - //查询最新期数 - int endperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(dateStr)).getData().getPkId(); - cuMemberAwardsAnalysisVO.setPeriod(endperiod); - String achieveTableName = TableNameConstants.CU_MEMBER_SETTLE + endperiod; - cuMemberAwardsAnalysisVO.setAchieveTableName(achieveTableName); - List list = iCuMemberAwardsStatService.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); - for (CuMemberAwardsAnalysisVO pe : list) { - pe.setAchieveTableName(TableNameConstants.CU_MEMBER_SETTLE + pe.getPeriod()); - } - List realList = iCuMemberAwardsStatService.selectAwardsAnalysisList(list); - if (CollectionUtil.isNotEmpty(list) && CollectionUtil.isNotEmpty(realList)) { - list.forEach(itm -> { - itm.setUpTypeVal(transactionMap.get(EnumsPrefixConstants.UPGRADE_TYPE + itm.getUpType())); - itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards())); - itm.setPkRangeAwardsVal(transactionMap1.get(itm.getPkRangeAwards())); - itm.setPkRegisterGradeVal(transactionMap1.get(itm.getPkRegisterGrade())); - //业绩转为当前国家的汇率 - list.forEach(itmm -> { - if (itm.getPkMember().equals(itmm.getPkMember()) && - itm.getPeriod().equals(itmm.getPeriod())) { - if (null != currency.getData().getInExchangeRate()) { - itm.setASumRealPv(itmm.getASumRealPv().multiply(currency.getData().getInExchangeRate())); - itm.setBSumRealPv(itmm.getBSumRealPv().multiply(currency.getData().getInExchangeRate())); - } else { - itm.setASumRealPv(itmm.getASumRealPv()); - itm.setBSumRealPv(itmm.getBSumRealPv()); - } - } - }); - }); - } - ExcelUtil util = new ExcelUtil<>(CuMemberAwardsAnalysisVO.class); - util.exportExcel(response, list, "真实奖衔分析"); - } - - - /** - * @description: 复购pv统计 - * @author: zhang jing - * @date: 2023/8/29 15:33 - * @param: [repurchasePVStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 复购pv统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REPURCHASE_PV_STAT, method = EOperationMethod.SELECT) @GetMapping("/repurchasepv-list") public TableDataInfo repurchasePVStat(RepurchasePVStatVO repurchasePVStatVO) { Date date = DateUtils.currentDate(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); repurchasePVStatVO.setPkCountry(SecurityUtils.getPkCountry()); if (StringUtils.isNull(repurchasePVStatVO.getStartDate()) || StringUtils.isNull(repurchasePVStatVO.getEndDate())) { @@ -621,7 +495,7 @@ public class CuMemberAwardsStatController extends BaseController { repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); } //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(repurchasePVStatVO.getStartDate())).getData().getPkId(); repurchasePVStatVO.setPeriod(staperiod); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(repurchasePVStatVO.getStartDate()); @@ -645,13 +519,8 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(list); } - /** - * @description: 导出复购pv统计 - * @author: zhang jing - * @date: 2023/8/30 10:14 - * @param: [response, repurchasePVStatVO] - * @return: void + * 导出复购pv统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.REPURCHASE_PV_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-repurchasepv") @@ -662,7 +531,7 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); repurchasePVStatVO.setPkCountry(SecurityUtils.getPkCountry()); if (StringUtils.isNull(repurchasePVStatVO.getStartDate()) || StringUtils.isNull(repurchasePVStatVO.getEndDate())) { @@ -689,7 +558,7 @@ public class CuMemberAwardsStatController extends BaseController { repurchasePVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); } //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(repurchasePVStatVO.getStartDate())).getData().getPkId(); repurchasePVStatVO.setPeriod(staperiod); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(repurchasePVStatVO.getStartDate()); @@ -720,11 +589,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 10:44 - * @param: [mallPVStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 商城BV统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MALL_BV_STAT, method = EOperationMethod.SELECT) @GetMapping("/mallPv-list") @@ -756,7 +621,7 @@ public class CuMemberAwardsStatController extends BaseController { mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); } //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(mallPVStatVO.getStartDate())).getData().getPkId(); mallPVStatVO.setPeriod(staperiod); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mallPVStatVO.getStartDate()); @@ -771,11 +636,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description:导出-商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 11:21 - * @param: [response, mallPVStatVO] - * @return: void + * 导出-商城BV统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MALL_BV_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-mallPv") @@ -810,7 +671,7 @@ public class CuMemberAwardsStatController extends BaseController { mallPVStatVO.setEndDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date))); } //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(mallPVStatVO.getStartDate())).getData().getPkId(); mallPVStatVO.setPeriod(staperiod); String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mallPVStatVO.getStartDate()); @@ -834,11 +695,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 个人统计 - * @author: zhang jing - * @date: 2023/9/1 11:32 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 个人统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_STAT, method = EOperationMethod.SELECT) @GetMapping("/personStatList") @@ -885,7 +742,7 @@ public class CuMemberAwardsStatController extends BaseController { if (CollectionUtil.isNotEmpty(firstDaysOfMonth)) { for (String dateStr : firstDaysOfMonth) { //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); PersonStatVO per = new PersonStatVO(); per.setPeriod(staperiod); @@ -910,11 +767,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出 个人统计 - * @author: zhang jing - * @date: 2023/9/1 14:26 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出 个人统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-personStat") @@ -961,7 +814,7 @@ public class CuMemberAwardsStatController extends BaseController { if (CollectionUtil.isNotEmpty(firstDaysOfMonth)) { for (String dateStr : firstDaysOfMonth) { //查询最新期数 - int staperiod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int staperiod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(dateStr)).getData().getPkId(); PersonStatVO per = new PersonStatVO(); per.setPeriod(staperiod); @@ -988,17 +841,13 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推统计 - * @author: zhang jing - * @date: 2023/9/1 16:13 - * @param: [personStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_STAT, method = EOperationMethod.SELECT) @GetMapping("/directPushStatList") public TableDataInfo directPushStatList(DirectPushVO directPushVO) { Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { directPushVO.setRate(exchangeRate); @@ -1018,11 +867,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出直推统计 - * @author: zhang jing - * @date: 2023/9/4 15:27 - * @param: [directPushVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出直推统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-directPush") @@ -1033,7 +878,7 @@ public class CuMemberAwardsStatController extends BaseController { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderBusiness.values()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { directPushVO.setRate(exchangeRate); @@ -1063,11 +908,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 11:09 - * @param: [prVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 个人复购统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_REPURCHASE, method = EOperationMethod.SELECT) @GetMapping("/personRepurchaseList") @@ -1076,7 +917,7 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(new ArrayList<>()); } Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); prVO.setPkCountry(pkCountry); startPage(); @@ -1092,11 +933,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 14:19 - * @param: [response, prVO] - * @return: void + * 导出个人复购统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PERSON_REPURCHASE, method = EOperationMethod.EXPORT) @PostMapping("/export-personRepurchase") @@ -1104,7 +941,7 @@ public class CuMemberAwardsStatController extends BaseController { if (StringUtils.isNotEmpty(prVO.getStartDate()) && StringUtils.isNotEmpty(prVO.getEndDate())) { Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); prVO.setPkCountry(pkCountry); List list = iCuMemberAwardsStatService.personRepurchaseList(prVO); @@ -1125,11 +962,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出安置业绩统计 - * @author: zhang jing - * @date: 2024/2/25 14:53 - * @param: [response, psVO] - * @return: void + * 导出安置业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.POSIT_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-positStat") @@ -1141,7 +974,7 @@ public class CuMemberAwardsStatController extends BaseController { if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { return; } - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; psVO.setPkCountry(pkCountry); @@ -1183,11 +1016,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推数据列表 - * @author: zhang jing - * @date: 2023/12/18 16:40 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推数据列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.SELECT) @GetMapping("/directPushDataList") @@ -1212,7 +1041,7 @@ public class CuMemberAwardsStatController extends BaseController { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1278,11 +1107,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出直推数据 - * @author: zhang jing - * @date: 2023/12/20 11:54 - * @param: [response, dpdVO] - * @return: void + * 导出直推数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.EXPORT) @PostMapping("/export-directPushData") @@ -1303,7 +1128,7 @@ public class CuMemberAwardsStatController extends BaseController { } Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1370,11 +1195,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 直推数据详情 - * @author: zhang jing - * @date: 2023/12/20 14:10 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 直推数据详情 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.SELECT) @GetMapping("/directPushDataDetails") @@ -1383,7 +1204,7 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(new ArrayList<>()); } Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); dpdVO.setRate(exchangeRate); dpdVO.setPkCountry(pkCountry); @@ -1393,11 +1214,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 直推数据-发送站内信展示 - * @author: zhang jing - * @date: 2023/12/20 17:36 - * @param: [dpdVO] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推数据-发送站内信展示 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_DATA, method = EOperationMethod.CONFIRM) @GetMapping("/sendingMessages") @@ -1429,7 +1246,7 @@ public class CuMemberAwardsStatController extends BaseController { //查询会员 Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { dpdVO.setRate(exchangeRate); @@ -1504,18 +1321,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 14:14 - * @param: [directPushVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员订单分布统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_SCATTER, method = EOperationMethod.SELECT) @GetMapping("/memberOrderScatter") public TableDataInfo memberOrderScatter(OrderScatterVO orderScatterVO) { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); orderScatterVO.setRate(exchangeRate); orderScatterVO.setPkCountry(pkCountry); @@ -1534,18 +1347,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 15:39 - * @param: [response, orderScatterVO] - * @return: void + * 导出会员订单分布统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_SCATTER, method = EOperationMethod.EXPORT) @PostMapping("/export-OrderScatter") public void exportOrderScatter(HttpServletResponse response, OrderScatterVO orderScatterVO) { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); orderScatterVO.setRate(exchangeRate); orderScatterVO.setPkCountry(pkCountry); @@ -1565,11 +1374,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 地区业绩统计 - * @author: zhang jing - * @date: 2024/5/6 15:37 - * @param: [orderScatterVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 地区业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.SELECT) @GetMapping("/areaAchieveStat") @@ -1578,7 +1383,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -1779,18 +1584,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出地区业绩统计 - * @author: zhang jing - * @date: 2024/5/8 9:40 - * @param: [areaAchieveStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出地区业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-areaAchieveStat") public void exportAreaAchieveStat(HttpServletResponse response, AreaAchieveStatVO areaAchieveStatVO) throws IOException { Date date = DateUtils.currentDate(); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); areaAchieveStatVO.setRate(exchangeRate); areaAchieveStatVO.setPkCountry(pkCountry); @@ -1981,11 +1782,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 查询跨月时间 - * @author: zhang jing - * @date: 2023/8/28 14:10 - * @param: [startDate, endDate] - * @return: java.util.List + * 查询跨月时间 **/ public List getStrideMonth(String startDate, String endDate) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); @@ -2002,18 +1799,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下血缘去重 - * @author: zhang jing - * @date: 2023/10/11 11:16 - * @param: [bloodRemoveSameVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下血缘去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/blood-remove-same") public TableDataInfo bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); List orderTypeList = EOrderBusiness.getOrderTypeList(bloodRemoveSameVO.getOrderType()); bloodRemoveSameVO.setOrderTypeList(orderTypeList); @@ -2033,7 +1826,7 @@ public class CuMemberAwardsStatController extends BaseController { pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); } - pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); + pkAwardsList = iCuMemberAwardsStatService.awardsLevelList(pkAwardsList, SecurityUtils.getPkCountry()); } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); @@ -2056,18 +1849,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下血缘去重历史数据 - * @author: zhang jing - * @date: 2024/5/14 14:39 - * @param: [bloodRemoveSameVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下血缘去重历史数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.SELECT) @GetMapping("/blood-remove-same-history") public TableDataInfo bloodRemoveSameListHistory(BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); List orderTypeList = EOrderBusiness.getOrderTypeList(bloodRemoveSameVO.getOrderType()); bloodRemoveSameVO.setOrderTypeList(orderTypeList); @@ -2075,23 +1864,6 @@ public class CuMemberAwardsStatController extends BaseController { bloodRemoveSameVO.setOrderType(EOrderBusiness.WHOLE.getValue()); } List pkAwardsList = new ArrayList<>(); -// if (bloodRemoveSameVO.getPkAwardsLevel() != null) { -// if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.MANAGER_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.MANAGER.getValue()); -// pkAwardsList.add(EAwards.HIGH_MANAGER.getValue()); -// pkAwardsList.add(EAwards.SENIOR_MANAGER.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHIEF_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHIEF.getValue()); -// pkAwardsList.add(EAwards.HIGH_CHIEF.getValue()); -// pkAwardsList.add(EAwards.SENIOR_CHIEF.getValue()); -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHAIRMAN_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); -// } -// pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); -// } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); } @@ -2106,9 +1878,9 @@ public class CuMemberAwardsStatController extends BaseController { //查询最新期数 //开始时间减一天 bloodRemoveSameVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, bloodRemoveSameVO.getStartDate())); - bloodRemoveSameVO.setPeriodSta(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodSta(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getStartDate())).getData().getPkId()); - bloodRemoveSameVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getEndDate())).getData().getPkId()); bloodRemoveSameVO.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getStartDate())); bloodRemoveSameVO.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getEndDate())); @@ -2126,18 +1898,14 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出伞下血缘去重 - * @author: zhang jing - * @date: 2023/10/19 16:08 - * @param: [response, lcVO] - * @return: void + * 导出伞下血缘去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-blood-remove-same") public void exportBloodRemoveSame(HttpServletResponse response, BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); @@ -2159,7 +1927,7 @@ public class CuMemberAwardsStatController extends BaseController { pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); } - pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); + pkAwardsList = iCuMemberAwardsStatService.awardsLevelList(pkAwardsList, SecurityUtils.getPkCountry()); } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); @@ -2184,18 +1952,14 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下血缘去重历史数据 - * @author: zhang jing - * @date: 2024/5/14 14:41 - * @param: [response, bloodRemoveSameVO] - * @return: void + * 导出伞下血缘去重历史数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AWARD_ANALYSIS, method = EOperationMethod.EXPORT) @PostMapping("/export-blood-remove-same-history") public void exportBloodRemoveSameHistory(HttpServletResponse response, BloodRemoveSameVO bloodRemoveSameVO) { List list = new ArrayList<>(); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( EnumsPrefixConstants.KEY_AWARD); bloodRemoveSameVO.setPkCountry(SecurityUtils.getPkCountry()); @@ -2205,23 +1969,6 @@ public class CuMemberAwardsStatController extends BaseController { if (StringUtils.isNull(bloodRemoveSameVO.getOrderType())) { bloodRemoveSameVO.setOrderType(EOrderBusiness.WHOLE.getValue()); } -// if (bloodRemoveSameVO.getPkAwardsLevel() != null) { -// if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.MANAGER_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.MANAGER.getValue()); -// pkAwardsList.add(EAwards.HIGH_MANAGER.getValue()); -// pkAwardsList.add(EAwards.SENIOR_MANAGER.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHIEF_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHIEF.getValue()); -// pkAwardsList.add(EAwards.HIGH_CHIEF.getValue()); -// pkAwardsList.add(EAwards.SENIOR_CHIEF.getValue()); -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// } else if (bloodRemoveSameVO.getPkAwardsLevel() == EAwardsLevel.CHAIRMAN_LEVEL.getValue()) { -// pkAwardsList.add(EAwards.CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.HONOR_CHAIRMAN.getValue()); -// pkAwardsList.add(EAwards.GLOBAL_CHAIRMAN.getValue()); -// } -// pkAwardsList = iCuMemberAwardsStatService.awardsLevellist(pkAwardsList, SecurityUtils.getPkCountry()); -// } if (bloodRemoveSameVO.getPkAwards() != null) { pkAwardsList.add(bloodRemoveSameVO.getPkAwards()); } @@ -2236,9 +1983,9 @@ public class CuMemberAwardsStatController extends BaseController { } else { //查询最新期数 bloodRemoveSameVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, bloodRemoveSameVO.getStartDate())); - bloodRemoveSameVO.setPeriodSta(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodSta(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getStartDate())).getData().getPkId()); - bloodRemoveSameVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + bloodRemoveSameVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(bloodRemoveSameVO.getEndDate())).getData().getPkId()); bloodRemoveSameVO.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getStartDate())); bloodRemoveSameVO.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(bloodRemoveSameVO.getEndDate())); @@ -2257,11 +2004,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 安置血缘查询 - * @author: zhang jing - * @date: 2023/12/6 15:38 - * @param: [resettleBloodVOVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD, method = EOperationMethod.SELECT) @GetMapping("/resettle-blood-list") @@ -2281,11 +2024,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出安置血缘查询 - * @author: zhang jing - * @date: 2023/12/7 15:01 - * @param: [response, resettleBloodVO] - * @return: void + * 导出安置血缘查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD, method = EOperationMethod.EXPORT) @PostMapping("/resettle-blood-excel") @@ -2307,11 +2046,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 安置血缘查询-左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 10:47 - * @param: [resettleBloodVOVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询-左右区人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/resettle-details-list") @@ -2323,11 +2058,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 安置血缘查询-左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:21 - * @param: [resettleBloodVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 安置血缘查询-左右区血缘人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD_DETAILS, method = EOperationMethod.SELECT) @GetMapping("/resettle-blood-details-list") @@ -2340,11 +2071,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 15:04 - * @param: [response, resettleBloodVO] - * @return: void + * 导出左右区血缘人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_BLOOD_DETAILS, method = EOperationMethod.EXPORT) @PostMapping("/resettle-details-excel") @@ -2364,11 +2091,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 15:04 - * @param: [response, resettleBloodVO] - * @return: void + * 导出左右区人数详情列表 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.RESETTLE_DETAILS, method = EOperationMethod.EXPORT) @PostMapping("/resettle-blood-details-excel") @@ -2389,11 +2112,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 伞下直推产品查询 - * @author: zhang jing - * @date: 2024/2/23 16:00 - * @param: [ubpVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_PRODUCT, method = EOperationMethod.SELECT) @GetMapping("/umbrella-below-product") @@ -2410,7 +2129,7 @@ public class CuMemberAwardsStatController extends BaseController { R member = iMemberServiceApi.getMemberByCode(ubpVO.getMemberCode()); ubpVO.setPkMember(member.getData().getPkId()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowProductList(ubpVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2427,11 +2146,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品查询 - * @author: zhang jing - * @date: 2024/2/26 10:09 - * @param: [response, ubpVO] - * @return: void + * 导出伞下直推产品查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_PRODUCT, method = EOperationMethod.EXPORT) @PostMapping("/umbrella-below-product-excel") @@ -2446,7 +2161,7 @@ public class CuMemberAwardsStatController extends BaseController { R member = iMemberServiceApi.getMemberByCode(ubpVO.getMemberCode()); ubpVO.setPkMember(member.getData().getPkId()); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowProductList(ubpVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2471,11 +2186,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/24 14:23 - * @param: [ubpVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_REPEAT, method = EOperationMethod.SELECT) @GetMapping("/umbrella-below-repeat") @@ -2498,7 +2209,7 @@ public class CuMemberAwardsStatController extends BaseController { } ubrVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.umbrellaBelowRepeatList(ubrVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2515,11 +2226,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/26 10:11 - * @param: [response, ubrVO] - * @return: void + * 导出伞下直推产品去重 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.UMBRELLA_BELOW_REPEAT, method = EOperationMethod.EXPORT) @PostMapping("/umbrella-below-repeat-excel") @@ -2540,7 +2247,7 @@ public class CuMemberAwardsStatController extends BaseController { } ubrVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.umbrellaBelowRepeatList(ubrVO); if (CollectionUtil.isNotEmpty(list)) { Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values()); @@ -2560,11 +2267,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/25 11:39 - * @param: [sptVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 伞下直推产品统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.STAT_PRODUCT, method = EOperationMethod.SELECT) @GetMapping("/stat-product") @@ -2587,7 +2290,7 @@ public class CuMemberAwardsStatController extends BaseController { } sptVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); startPage(); List list = iCuMemberAwardsStatService.statProductList(sptVO); if (CollectionUtil.isNotEmpty(list)) { @@ -2604,11 +2307,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/26 10:12 - * @param: [response, sptVO] - * @return: void + * 导出伞下直推产品统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.STAT_PRODUCT, method = EOperationMethod.EXPORT) @PostMapping("/stat-product-excel") @@ -2629,7 +2328,7 @@ public class CuMemberAwardsStatController extends BaseController { } sptVO.setPkMemberList(pkMemberList); //查询当前国家的汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List list = iCuMemberAwardsStatService.statProductList(sptVO); if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -2648,11 +2347,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/6 14:29 - * @param: [ddVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 会员户籍数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DOMICILE_DATA_LIST, method = EOperationMethod.SELECT) @GetMapping("/domicileDataList") @@ -2664,11 +2359,11 @@ public class CuMemberAwardsStatController extends BaseController { String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); //查询最新期数 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getData().getPkId(); String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; ddVO.setEndPeriod(endPeriod); ddVO.setEndAchieveTableName(endAchieveTableName); @@ -2691,11 +2386,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/6 14:29 - * @param: [response, psVO] - * @return: void + * 导出会员户籍数据查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DOMICILE_DATA_LIST, method = EOperationMethod.EXPORT) @PostMapping("/export-domicileDataList") @@ -2707,11 +2398,11 @@ public class CuMemberAwardsStatController extends BaseController { String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); //查询最新期数 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + int endPeriod = iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( DateUtils.parseDateToStr(endDateStr)).getData().getPkId(); String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); Integer pkCountry = SecurityUtils.getPkCountry(); - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.isSuccess() ? (currency.getData().getInExchangeRate() != null ? currency.getData().getInExchangeRate() : BigDecimal.ONE) : BigDecimal.ONE; ddVO.setEndPeriod(endPeriod); ddVO.setEndAchieveTableName(endAchieveTableName); @@ -2737,11 +2428,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 系统业绩统计 - * @author: zhang jing - * @date: 2024/5/6 15:37 - * @param: [orderScatterVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 系统业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.SELECT) @GetMapping("/vertexAchieveStat") @@ -2750,7 +2437,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -2931,11 +2618,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出系统业绩统计 - * @author: zhang jing - * @date: 2024/5/8 9:40 - * @param: [areaAchieveStatVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 导出系统业绩统计 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.AREA_ACHIEVE_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-vertexAchieveStat") @@ -2944,7 +2627,7 @@ public class CuMemberAwardsStatController extends BaseController { Integer pkCountry = SecurityUtils.getPkCountry(); // 获取货币数据和汇率 - R currency = currencyServiceApi.getCurrency(pkCountry); + R currency = iCurrencyServiceApi.getCurrency(pkCountry); BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate(); // 在输入对象中设置汇率和国家 @@ -3126,11 +2809,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/21 9:31 - * @param: [monthlyJobLevelVo] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 月度职级名单查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MONTHLY_JOB_LEVEL, method = EOperationMethod.SELECT) @GetMapping("/monthly-job-level") @@ -3153,7 +2832,7 @@ public class CuMemberAwardsStatController extends BaseController { return getDataTable(new ArrayList<>()); } else { //汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); mjlVO.setRate(currency.getData().getInExchangeRate()); mjlVO.setPkCountry(pkCountry); //判断是否为当前月 @@ -3169,14 +2848,14 @@ public class CuMemberAwardsStatController extends BaseController { mjlVO.setEndDate(DateUtils.currentMonthLastDateStr(mjlVO.getStatDate())); } //当前月期数,当前月表 - mjlVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + mjlVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( mjlVO.getEndDate()).getData().getPkId()); mjlVO.setAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getEndDate())); mjlVO.setSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getEndDate())); //查询上一个月 mjlVO.setLastMonthEndDate(DateUtils.beforeMonthLastDateStr(DateUtils.parseStringToDate(mjlVO.getEndDate()))); - mjlVO.setLastMonthPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + mjlVO.setLastMonthPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( mjlVO.getLastMonthEndDate()).getData().getPkId()); mjlVO.setLastMonthAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); mjlVO.setLastMonthSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); @@ -3206,11 +2885,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 导出月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/25 12:02 - * @param: [response, mjlVO] - * @return: void + * 导出月度职级名单查询 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MONTHLY_JOB_LEVEL, method = EOperationMethod.SELECT) @PostMapping("/export-monthly-job-level") @@ -3231,7 +2906,7 @@ public class CuMemberAwardsStatController extends BaseController { } if (StringUtils.isNotNull(mjlVO.getStatDate())) { //汇率 - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); mjlVO.setRate(currency.getData().getInExchangeRate()); mjlVO.setPkCountry(pkCountry); //判断是否为当前月 @@ -3247,14 +2922,14 @@ public class CuMemberAwardsStatController extends BaseController { mjlVO.setEndDate(DateUtils.currentMonthLastDateStr(mjlVO.getStatDate())); } //当前月期数,当前月表 - mjlVO.setPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + mjlVO.setPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( mjlVO.getEndDate()).getData().getPkId()); mjlVO.setAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getEndDate())); mjlVO.setSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getEndDate())); //查询上一个月 mjlVO.setLastMonthEndDate(DateUtils.beforeMonthLastDateStr(DateUtils.parseStringToDate(mjlVO.getEndDate()))); - mjlVO.setLastMonthPeriodEnd(cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + mjlVO.setLastMonthPeriodEnd(iCuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate( mjlVO.getLastMonthEndDate()).getData().getPkId()); mjlVO.setLastMonthAchieveTableName(TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); mjlVO.setLastMonthSettleTableName(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(mjlVO.getLastMonthEndDate())); @@ -3284,11 +2959,7 @@ public class CuMemberAwardsStatController extends BaseController { /** - * @description: 查询收益区域数据 - * @author: zhang jing - * @date: 2025/1/10 14:20 - * @param: [directPushVO] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询收益区域数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RETAIL_STAT, method = EOperationMethod.SELECT) @GetMapping("/revenueAreaList") @@ -3297,16 +2968,16 @@ public class CuMemberAwardsStatController extends BaseController { revenueAreaVO.setPkCountry(pkCountry); startPage(); List list = iCuMemberAwardsStatService.revenueAreaList(revenueAreaVO); - if(CollectionUtil.isNotEmpty(list)){ + if (CollectionUtil.isNotEmpty(list)) { // 调用system服务，获取地址 Map areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData(); - list.forEach(itm->{ + list.forEach(itm -> { itm.setEffectiveVal(EDealerYesNo.getLabelByIntValue(itm.getEffective())); itm.setProvinceVal(areaMap.get(itm.getProvince())); - if(itm.getCity()!=null){ + if (itm.getCity() != null) { itm.setCityVal(areaMap.get(itm.getCity())); } - if(itm.getCounty()!=null){ + if (itm.getCounty() != null) { itm.setCountyVal(areaMap.get(itm.getCounty())); } }); @@ -3315,11 +2986,7 @@ public class CuMemberAwardsStatController extends BaseController { } /** - * @description: 导出 收益区域数据 - * @author: zhang jing - * @date: 2025/1/12 12:04 - * @param: [response, revenueAreaVO] - * @return: void + * 导出 收益区域数据 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RETAIL_STAT, method = EOperationMethod.EXPORT) @PostMapping("/export-revenueArea") @@ -3328,16 +2995,16 @@ public class CuMemberAwardsStatController extends BaseController { revenueAreaVO.setPkCountry(pkCountry); startPage(); List list = iCuMemberAwardsStatService.revenueAreaList(revenueAreaVO); - if(CollectionUtil.isNotEmpty(list)){ + if (CollectionUtil.isNotEmpty(list)) { // 调用system服务，获取地址 Map areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData(); - list.forEach(itm->{ + list.forEach(itm -> { itm.setEffectiveVal(EDealerYesNo.getLabelByIntValue(itm.getEffective())); itm.setProvinceVal(areaMap.get(itm.getProvince())); - if(itm.getCity()!=null){ + if (itm.getCity() != null) { itm.setCityVal(areaMap.get(itm.getCity())); } - if(itm.getCounty()!=null){ + if (itm.getCounty() != null) { itm.setCountyVal(areaMap.get(itm.getCounty())); } }); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java index feb86a89..8644104b 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberAwardsStatMapper.java @@ -9,82 +9,41 @@ import java.util.List; /** * 会员信息-奖衔升级记录 Mapper 接口 - * - * @author hzs - * @since 2022-08-31 */ public interface CuMemberAwardsStatMapper extends BaseMapper { - /** - * @description: 真实业绩新增奖衔查询 - * @author: zhang jing - * @date: 2023/8/24 17:55 - * @param: [cuMemberAwardsVO] - * @return: java.util.List + * 真实业绩新增奖衔查询 **/ List selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO); /** - * @description: 奖衔晋升列表 - * @author: zhang jing - * @date: 2024/1/2 10:37 - * @param: [awardPromotionVO] - * @return: java.util.List + * 奖衔晋升列表 **/ List awardPromotionList(AwardPromotionVO awardPromotionVO); /** - * @description: 会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 14:32 - * @param: [memberAchieveVO] - * @return: java.util.List + * 会员业绩数据查询 **/ List memberAchieveList(MemberAchieveVO memberAchieveVO); /** - * @description: 个人统计 - * @author: zhang jing - * @date: 2023/9/1 10:37 - * @param: [personStatVO] - * @return: java.util.List + * 个人统计 **/ List selectPersonStatList(PersonStatVO personStatVO); /** - * @description: 真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 16:01 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List + * 真实奖衔分析 **/ List selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); /** - * @description: 查询会员结算等级升级记录 - * @author: zhang jing - * @date: 2025/3/3 16:01 - * @param: [cuMemberGradeRecordVO] - * @return: java.util.List + * 查询会员结算等级升级记录 **/ - List querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); + List queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); /** - * @description:查询会员左右区累计真实业绩 - * @author: zhang jing - * @date: 2024/8/20 9:59 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List - **/ - List selectAwardsAnalysisList(@Param("list") List list); - - /** - * @description: 查询全部伞下血缘业绩 - * @author: zhang jing - * @date: 2023/10/14 16:05 - * @param: [bloodList] - * @return: java.util.List + * 查询全部伞下血缘业绩 **/ List bloodRemoveSameAllList(@Param("brs") BloodRemoveSameVO bloodList, @Param("startDate") String startDate, @@ -94,11 +53,7 @@ public interface CuMemberAwardsStatMapper extends BaseMapper { ); /** - * @description: 查询会员推荐伞下业绩(历史) - * @author: zhang jing - * @date: 2024/5/15 14:03 - * @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType] - * @return: java.util.List + * 查询会员推荐伞下业绩(历史) **/ List bloodSameAllListHistory(@Param("bloodList") List bloodList, @Param("periodEnd") Integer periodEnd, @@ -122,34 +77,21 @@ public interface CuMemberAwardsStatMapper extends BaseMapper { @Param("pkCountry") Integer pkCountry, @Param("pkAwardsList") List pkAwardsList - ); /** - * @description: 根据奖衔查询所有会员 - * @author: zhang jing - * @date: 2023/10/11 14:06 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 根据奖衔查询所有会员 **/ List queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 根据奖衔查询会员（历史） - * @author: zhang jing - * @date: 2024/5/17 14:14 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 根据奖衔查询会员（历史） **/ List queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 真实奖衔分析详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/26 14:27 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List + * 真实奖衔分析详情（穿透页面接口） **/ List selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); @@ -157,235 +99,119 @@ public interface CuMemberAwardsStatMapper extends BaseMapper { List selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); /** - * @description: 复购bv统计-业绩，考核记录 - * @author: zhang jing - * @date: 2023/8/29 15:31 - * @param: [repurchasePVStatVO] - * @return: java.util.List + * 复购bv统计-业绩，考核记录 **/ List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); /** - * @description: 商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 10:52 - * @param: [mallPVStatVO] - * @return: java.util.List + * 商城BV统计 **/ List selectMallPVStatList(MallPVStatVO mallPVStatVO); /** - * @description: 个人统计业绩查询 - * @author: zhang jing - * @date: 2023/9/1 11:04 - * @param: [personStatVO] - * @return: java.util.List + * 个人统计业绩查询 **/ List selectPersonPvList(@Param("perList") List perList); /** - * @description: 直推统计 - * @author: zhang jing - * @date: 2023/9/4 11:46 - * @param: [directPushVO] - * @return: java.util.List + * 直推统计 **/ List selectDirectPushStatList(DirectPushVO directPushVO); /** - * @description: 三方直推统计 - * @author: zhang jing - * @date: 2023/10/25 16:16 - * @param: [directPushVO] - * @return: java.util.List - **/ - List selectThreeDirectPushStatList(DirectPushVO directPushVO); - - /** - * @description: 直推数据列表 - * @author: zhang jing - * @date: 2023/12/18 17:15 - * @param: [dpdVO] - * @return: java.util.List + * 直推数据列表 **/ List selectDirectPushDataList(@Param("dpdVO") DirectPushDataVO dpdVO); /** - * @description: 直推数据详情 - * @author: zhang jing - * @date: 2023/12/20 14:36 - * @param: [dpdVO] - * @return: java.util.List + * 直推数据详情 **/ List selectDirectPushDataDetails(DirectPushDataVO dpdVO); - /** - * @description: 会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 14:47 - * @param: [orderScatterVO] - * @return: java.util.List + * 会员订单分布统计 **/ List memberOrderScatter(OrderScatterVO orderScatterVO); - /** - * @description: 三方会员订单分布统计 - * @author: zhang jing - * @date: 2023/10/25 16:30 - * @param: [orderScatterVO] - * @return: java.util.List + * 根据奖衔级别查询奖衔 **/ - List memberThreeOrderScatter(OrderScatterVO orderScatterVO); - + List awardsLevelList(@Param("pkAwardsList") List pkAwardsList, @Param("pkCountry") Integer pkCountry); /** - * @description: 根据奖衔级别查询奖衔 - * @author: zhang jing - * @date: 2023/10/17 11:17 - * @param: [pkAwardsList] - * @return: java.util.List - **/ - List awardsLevellist(@Param("pkAwardsList") List pkAwardsList, @Param("pkCountry") Integer pkCountry); - - /** - * @description: 安置血缘查询-左右区人数 - * @author: zhang jing - * @date: 2023/12/6 15:49 - * @param: [resettleBloodVOVO] - * @return: java.util.List + * 安置血缘查询-左右区人数 **/ List lrMemberCountList(ResettleBloodVO resettleBloodVO); /** - * @description: 安置血缘查询-左右血缘人数 - * @author: zhang jing - * @date: 2023/12/7 9:45 - * @param: [resettleBloodVOVO] - * @return: java.util.List + * 安置血缘查询-左右血缘人数 **/ List lrbMemberCountList(ResettleBloodVO resettleBloodVO); /** - * @description: 安置血缘查询-左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:34 - * @param: [resettleBloodVO] - * @return: java.util.List + * 安置血缘查询-左右区人数详情列表 **/ List lrMemberDetailsList(ResettleBloodVO resettleBloodVO); /** - * @description: 安置血缘查询-左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:35 - * @param: [resettleBloodVO] - * @return: java.util.List + * 安置血缘查询-左右区血缘人数详情列表 **/ List lrbMemberDetailsList(ResettleBloodVO resettleBloodVO); /** - * @description: 个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 15:07 - * @param: [prVO] - * @return: java.util.List + * 个人复购统计 **/ List personRepurchaseList(PersonRepurchaseVO prVO); /** - * @description: 安置业绩统计-查询会员 - * @author: zhang jing - * @date: 2024/1/25 15:36 - * @param: [psVO] - * @return: java.util.List + * 安置业绩统计-查询会员 **/ List positStatList(PositStatVO psVO); /** - * @description:安置业绩统计-查询左右区业绩 - * @author: zhang jing - * @date: 2024/1/26 11:53 - * @param: [psVO] - * @return: java.util.List + * 安置业绩统计-查询左右区业绩 **/ List positStatAchieve(@Param("psVO") PositStatVO psVO); /** - * @description: 查询伞下直推产品列表 - * @author: zhang jing - * @date: 2024/2/23 16:31 - * @param: [ubpVO] - * @return: java.util.List + * 查询伞下直推产品列表 **/ List umbrellaBelowProductList(@Param("ubpVO") UmbrellaBelowProductVO ubpVO); /** - * @description: 伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/24 14:46 - * @param: [ubrVO] - * @return: java.util.List + * 伞下直推产品去重 **/ List umbrellaBelowRepeatList(@Param("ubrVO") UmbrellaBelowRepeatVO ubrVO); /** - * @description: 伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/25 11:05 - * @param: [sptVO] - * @return: java.util.List + * 伞下直推产品统计 **/ List statProductList(@Param("sptVO") StatProductVO sptVO); /** - * @description: 会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/11 11:39 - * @param: [ddVO] - * @return: java.util.List + * 会员户籍数据查询 **/ List domicileDataList(@Param("ddVO") DomicileDataVO ddVO); /** - * @description: 地区业绩统计 - * @author: zhang jing - * @date: 2024/5/6 16:13 - * @param: [areaAchieveStatVO] - * @return: java.util.List + * 地区业绩统计 **/ List areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO); /** - * @description: 系统业绩统计 - * @author: zhang jing - * @date: 2024/6/18 14:29 - * @param: [vertexAchieveStatVO] - * @return: java.util.List + * 系统业绩统计 **/ List vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO); /** - * @description: 月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/24 15:22 - * @param: [mjlvo] - * @return: java.util.List + * 月度职级名单查询 **/ List monthlyJobLevelList(MonthlyJobLevelVo mjlvo); - /** - * @description: 查询收益区域数据 - * @author: zhang jing - * @date: 2025/1/10 16:28 - * @param: [revenueAreaVO] - * @return: java.util.List + * 查询收益区域数据 **/ List revenueAreaList(RevenueAreaVO revenueAreaVO); - - } 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..20ddf6b4 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 { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberConsumptionParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberConsumptionParam.java index 3c3984c6..61369b17 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberConsumptionParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberConsumptionParam.java @@ -1,44 +1,30 @@ -package com.hzs.report.member.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/28 18:16 - * @Classname: MemberConsumptionParam - * @PackageName: com.hzs.report.member.param - */ +package com.hzs.report.member.param; import lombok.Data; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.param - *@Author: yh - *@CreateTime: 2023-11-28 18:16 - *@Description: TODO - *@Version: 1.0 - */ @Data public class MemberConsumptionParam { /** * 会员编号 */ - private String memberCode; + private String memberCode; /** * 会员名称 */ - private String memberName; + private String memberName; /** * 开始支付时间 */ - private Date startPayTime; + private Date startPayTime; /** * 结束支付时间 */ - private Date endPayTime; + private Date endPayTime; /** * 商品主键 */ - private Integer pkWares; + private Integer pkWares; } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberResettleAchieveParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberResettleAchieveParam.java index 723e894e..2b7294a8 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberResettleAchieveParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/MemberResettleAchieveParam.java @@ -1,23 +1,9 @@ -package com.hzs.report.member.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/28 18:21 - * @Classname: MemberResettleAchieveParam - * @PackageName: com.hzs.report.member.param - */ +package com.hzs.report.member.param; import lombok.Data; import java.util.Date; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.report.member.param - * @Author: yh - * @CreateTime: 2023-11-28 18:21 - * @Description: TODO - * @Version: 1.0 - */ @Data public class MemberResettleAchieveParam { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductDetailQueryParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductDetailQueryParam.java index 2fc261c0..56144618 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductDetailQueryParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductDetailQueryParam.java @@ -1,25 +1,10 @@ -package com.hzs.report.member.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/10/8 13:56 - * @Classname: ProductDetailQueryParam - * @PackageName: com.hzs.report.member.param - */ +package com.hzs.report.member.param; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.param - *@Author: yh - *@CreateTime: 2023-10-08 13:56 - *@Description: TODO - *@Version: 1.0 - */ @Data public class ProductDetailQueryParam { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductShippingDetailsParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductShippingDetailsParam.java index 85a1ac11..058c66c8 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductShippingDetailsParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/ProductShippingDetailsParam.java @@ -1,23 +1,9 @@ -package com.hzs.report.member.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/11/28 18:27 - * @Classname: ProductShippingDetailsParam - * @PackageName: com.hzs.report.member.param - */ +package com.hzs.report.member.param; import lombok.Data; import java.util.Date; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.param - *@Author: yh - *@CreateTime: 2023-11-28 18:27 - *@Description: TODO - *@Version: 1.0 - */ @Data public class ProductShippingDetailsParam { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/WaresInfoParam.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/WaresInfoParam.java deleted file mode 100644 index 3303aa58..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/WaresInfoParam.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.report.member.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/7/23 11:05 - * @Classname: WaresInfoParam - * @PackageName: com.hzs.report.member.param - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.report.member.param - *@Author: yh - *@CreateTime: 2024-07-23 11:05 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class WaresInfoParam { - - /** - * 产品 - */ - private Integer pkProduct; - - /** - * 所属规格 - */ - private Integer pkSpecs; -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java index 11e5cada..9d6b3798 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/ICuMemberAwardsStatService.java @@ -8,81 +8,41 @@ import java.util.List; /** * 会员信息-奖衔升级记录 服务类 - * - * @author hzs - * @since 2022-08-31 */ public interface ICuMemberAwardsStatService { /** - * @description: 真实业绩新增奖衔查询 - * @author: zhang jing - * @date: 2023/8/24 17:56 - * @param: [cuMemberAwardsVO] - * @return: java.util.List + * 真实业绩新增奖衔查询 **/ List selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO); /** - * @description: 奖衔晋升列表 - * @author: zhang jing - * @date: 2024/1/2 10:37 - * @param: [awardPromotionVO] - * @return: java.util.List + * 奖衔晋升列表 **/ List awardPromotionList(AwardPromotionVO awardPromotionVO); /** - * @description: 会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 14:32 - * @param: [memberAchieveVO] - * @return: java.util.List + * 会员业绩数据查询 **/ List memberAchieveList(MemberAchieveVO memberAchieveVO); /** - * @description: 个人统计 - * @author: zhang jing - * @date: 2023/9/1 10:37 - * @param: [personStatVO] - * @return: java.util.List + * 个人统计 **/ List selectPersonStatList(PersonStatVO personStatVO); /** - * @description: 真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 16:01 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List + * 真实奖衔分析 **/ List selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); /** - * @description: 查询会员结算等级升级记录 - * @author: zhang jing - * @date: 2025/3/3 16:02 - * @param: [cuMemberGradeRecordVO] - * @return: java.util.List + * 查询会员结算等级升级记录 **/ - List querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); + List queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO); /** - * @description: 查询会员左右区累计真实业绩 - * @author: zhang jing - * @date: 2024/8/20 9:59 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List - **/ - List selectAwardsAnalysisList(List list); - - /** - * @description: 查询全部伞下血缘业绩 - * @author: zhang jing - * @date: 2023/10/14 16:05 - * @param: [bloodList] - * @return: java.util.List + * 查询全部伞下血缘业绩 **/ List bloodRemoveSameAllList(BloodRemoveSameVO bloodList, String startDate, String endDate, @@ -90,11 +50,7 @@ public interface ICuMemberAwardsStatService { List pkAwardsList); /** - * @description: 查询会员推荐伞下业绩(历史) - * @author: zhang jing - * @date: 2024/5/15 14:03 - * @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType] - * @return: java.util.List + * 查询会员推荐伞下业绩(历史) **/ List bloodSameAllListHistory(List bloodList, Integer periodEnd, @@ -120,297 +76,155 @@ public interface ICuMemberAwardsStatService { ); /** - * @description: 查询奖衔业绩 - * @author: zhang jing - * @date: 2023/10/11 14:05 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 查询奖衔业绩 **/ List queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 根据奖衔查询会员（历史） - * @author: zhang jing - * @date: 2024/5/17 14:15 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 根据奖衔查询会员（历史） **/ List queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 真实奖衔分析详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/26 14:28 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List + * 真实奖衔分析详情（穿透页面接口） **/ List selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO); /** - * @description: 收入明细 - * @author: zhang jing - * @date: 2023/9/26 15:07 - * @param: [revenueDetailsVO] - * @return: java.util.List + * 收入明细 **/ List selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO); /** - * @description: 复购bv统计 - * @author: zhang jing - * @date: 2023/8/29 15:30 - * @param: [repurchasePVStatVO] - * @return: java.util.List + * 复购bv统计 **/ List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO); /** - * @description: 商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 10:53 - * @param: [mallPVStatVO] - * @return: java.util.List + * 商城BV统计 **/ List selectMallPVStatList(MallPVStatVO mallPVStatVO); /** - * @description: 个人统计业绩查询 - * @author: zhang jing - * @date: 2023/9/4 9:35 - * @param: [perList] - * @return: java.util.List + * 个人统计业绩查询 **/ List selectPersonPvList(List perList); /** - * @description: 直推统计 - * @author: zhang jing - * @date: 2023/9/4 11:47 - * @param: [directPushVO] - * @return: java.util.List + * 直推统计 **/ List selectDirectPushStatList(DirectPushVO directPushVO); /** - * @description: 三方直推统计 - * @author: zhang jing - * @date: 2023/10/25 16:17 - * @param: [directPushVO] - * @return: java.util.List - **/ - List selectThreeDirectPushStatList(DirectPushVO directPushVO); - - /** - * @description: 直推数据列表 - * @author: zhang jing - * @date: 2023/12/18 17:15 - * @param: [dpdVO] - * @return: java.util.List + * 直推数据列表 **/ List selectDirectPushDataList(DirectPushDataVO dpdVO); /** - * @description: 直推数据列表详情 - * @author: zhang jing - * @date: 2023/12/20 14:11 - * @param: [dpdVO] - * @return: java.util.List + * 直推数据列表详情 **/ List selectDirectPushDataDetails(DirectPushDataVO dpdVO); - /** - * @description: 会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 14:46 - * @param: [orderScatterVO] - * @return: java.util.List + * 会员订单分布统计 **/ List memberOrderScatter(OrderScatterVO orderScatterVO); /** - * @description: 三方会员订单分布统计 - * @author: zhang jing - * @date: 2023/10/25 16:31 - * @param: [orderScatterVO] - * @return: java.util.List + * 根据奖衔级别查询奖衔 **/ - List memberThreeOrderScatter(OrderScatterVO orderScatterVO); - + List awardsLevelList(List pkAwardsList, Integer pkCountry); /** - * @description: 根据奖衔级别查询奖衔 - * @author: zhang jing - * @date: 2023/10/17 11:15 - * @param: [] - * @return: java.util.List - **/ - List awardsLevellist(List pkAwardsList, Integer pkCountry); - - /** - * @description: 处理伞下去重查询方法 - * @author: zhang jing - * @date: 2023/12/6 15:45 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 处理伞下去重查询方法 **/ List bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 伞下去重业绩查询（新） - * @author: zhang jing - * @date: 2024/5/23 14:50 - * @param: [bloodRemoveSameVO] - * @return: java.util.List + * 伞下去重业绩查询（新） **/ List bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO); /** - * @description: 安置血缘查询 - * @author: zhang jing - * @date: 2023/12/6 16:01 - * @param: [resettleBloodVOVO] - * @return: java.util.List + * 安置血缘查询 **/ List resettleBloodList(ResettleBloodVO resettleBloodVO); - /** - * @description: 安置血缘查询-左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:38 - * @param: [resettleBloodVO] - * @return: java.util.List + * 安置血缘查询-左右区人数详情列表 **/ List lrMemberDetailsList(ResettleBloodVO resettleBloodVO); /** - * @description: 安置血缘查询-左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:38 - * @param: [resettleBloodVO] - * @return: java.util.List + * 安置血缘查询-左右区血缘人数详情列表 **/ List lrbMemberDetailsList(ResettleBloodVO resettleBloodVO); /** - * @description: 个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 15:07 - * @param: [prVO] - * @return: java.util.List + * 个人复购统计 **/ List personRepurchaseList(PersonRepurchaseVO prVO); /** - * @description: 安置业绩统计-查询会员 - * @author: zhang jing - * @date: 2024/1/25 15:36 - * @param: [psVO] - * @return: java.util.List + * 安置业绩统计-查询会员 **/ List positStatList(PositStatVO psVO); - /** - * @description:安置业绩统计 查询左右区业绩 - * @author: zhang jing - * @date: 2024/1/26 14:50 - * @param: [psVO] - * @return: java.util.List + * 安置业绩统计 查询左右区业绩 **/ List positStatAchieve(PositStatVO psVO); /** - * @description: 查询伞下直推产品列表 - * @author: zhang jing - * @date: 2024/2/23 16:02 - * @param: [ubpVO] - * @return: java.util.List + * 查询伞下直推产品列表 **/ List umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO); /** - * @description: 伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/24 14:46 - * @param: [ubrVO] - * @return: java.util.List + * 伞下直推产品去重 **/ List umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO); /** - * @description: 伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/24 14:46 - * @param: [ubrVO] - * @return: java.util.List + * 伞下直推产品统计 **/ List statProductList(StatProductVO sptVO); /** - * @description: 会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/11 11:40 - * @param: [ddVO] - * @return: java.util.List + * 会员户籍数据查询 **/ List domicileDataList(DomicileDataVO ddVO); /** - * @description: 地区业绩统计 - * @author: zhang jing - * @date: 2024/5/6 16:12 - * @param: [areaAchieveStatVO] - * @return: java.util.List + * 地区业绩统计 **/ List areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO); /** - * @description: 系统业绩统计 - * @author: zhang jing - * @date: 2024/5/6 16:12 - * @param: [areaAchieveStatVO] - * @return: java.util.List + * 系统业绩统计 **/ List vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO); /** - * @description: 导出地区业绩 - * @author: zhang jing - * @date: 2024/5/20 14:58 - * @param: [response, fileName, dataList] - * @return: void + * 导出地区业绩 **/ void exportExcelWithMergedCells(HttpServletResponse response, String fileName, List dataList) throws IOException; /** - * @description: 导出系统业绩统计 - * @author: zhang jing - * @date: 2024/5/20 14:58 - * @param: [response, fileName, dataList] - * @return: void + * 导出系统业绩统计 **/ void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName, List dataList) throws IOException; /** - * @description: 月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/24 15:22 - * @param: [mjlvo] - * @return: java.util.List + * 月度职级名单查询 **/ List monthlyJobLevelList(MonthlyJobLevelVo mjlvo); /** - * @description: 查询收益区域数据 - * @author: zhang jing - * @date: 2025/1/10 16:29 - * @param: [revenueAreaVO] - * @return: java.util.List + * 查询收益区域数据 **/ List revenueAreaList(RevenueAreaVO revenueAreaVO); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java index e6c936af..a5378910 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberAwardsStatServiceImpl.java @@ -8,9 +8,9 @@ import com.hzs.report.member.vo.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; @@ -21,124 +21,52 @@ import java.util.stream.Collectors; /** * 会员信息-奖衔升级记录 服务实现类 - * - * @author hzs - * @since 2022-08-31 */ @Service public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService { - @Autowired - private CuMemberAwardsStatMapper memberAwardsStatMapper; + @Resource + private CuMemberAwardsStatMapper cuMemberAwardsStatMapper; - /** - * @description: 真实业绩新增奖衔查询 - * @author: zhang jing - * @date: 2023/8/24 17:56 - * @param: [cuMemberAwardsVO] - * @return: java.util.List - **/ @Override public List selectCuMemberAwardsList(CuMemberAwardsStatVO cuMemberAwardsStatVO) { - return memberAwardsStatMapper.selectCuMemberAwardsList(cuMemberAwardsStatVO); + return cuMemberAwardsStatMapper.selectCuMemberAwardsList(cuMemberAwardsStatVO); } - /** - * @description: 奖衔晋升列表 - * @author: zhang jing - * @date: 2024/1/2 10:37 - * @param: [awardPromotionVO] - * @return: java.util.List - **/ @Override public List awardPromotionList(AwardPromotionVO awardPromotionVO) { - return memberAwardsStatMapper.awardPromotionList(awardPromotionVO); + return cuMemberAwardsStatMapper.awardPromotionList(awardPromotionVO); } - /** - * @description: 会员业绩数据查询 - * @author: zhang jing - * @date: 2024/1/4 14:32 - * @param: [memberAchieveVO] - * @return: java.util.List - **/ @Override public List memberAchieveList(MemberAchieveVO memberAchieveVO) { - return memberAwardsStatMapper.memberAchieveList(memberAchieveVO); + return cuMemberAwardsStatMapper.memberAchieveList(memberAchieveVO); } - - /** - * @description: 个人统计 - * @author: zhang jing - * @date: 2023/9/1 10:37 - * @param: [personStatVO] - * @return: java.util.List - **/ @Override public List selectPersonStatList(PersonStatVO personStatVO) { - return memberAwardsStatMapper.selectPersonStatList(personStatVO); + return cuMemberAwardsStatMapper.selectPersonStatList(personStatVO); } - /** - * @description: 真实奖衔分析 - * @author: zhang jing - * @date: 2023/8/26 16:01 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List - **/ @Override public List selectCuMemberAwardsAnalysisList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { - return memberAwardsStatMapper.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); + return cuMemberAwardsStatMapper.selectCuMemberAwardsAnalysisList(cuMemberAwardsAnalysisVO); } - /** - * @description: 查询会员结算等级升级记录 - * @author: zhang jing - * @date: 2025/3/3 16:01 - * @param: [cuMemberGradeRecordVO] - * @return: java.util.List - **/ @Override - public List querMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO) { - return memberAwardsStatMapper.querMemberGradeRecordList(cuMemberGradeRecordVO); + public List queryMemberGradeRecordList(CuMemberGradeRecordVO cuMemberGradeRecordVO) { + return cuMemberAwardsStatMapper.queryMemberGradeRecordList(cuMemberGradeRecordVO); } - /** - * @description: 查询会员左右区累计真实业绩 - * @author: zhang jing - * @date: 2024/8/20 10:00 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List - **/ - @Override - public List selectAwardsAnalysisList(List list) { - return memberAwardsStatMapper.selectAwardsAnalysisList(list); - } - - /** - * @description: 查询全部伞下血缘业绩 - * @author: zhang jing - * @date: 2023/10/14 16:05 - * @param: [bloodList] - * @return: java.util.List - **/ @Override public List bloodRemoveSameAllList(BloodRemoveSameVO bloodList, String startDate, String endDate, List orderTypeList, List pkAwardsList ) { - return memberAwardsStatMapper.bloodRemoveSameAllList(bloodList, startDate, endDate, orderTypeList, pkAwardsList); + return cuMemberAwardsStatMapper.bloodRemoveSameAllList(bloodList, startDate, endDate, orderTypeList, pkAwardsList); } - /** - * @description: 查询会员推荐伞下业绩(历史) - * @author: zhang jing - * @date: 2024/5/15 14:03 - * @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType] - * @return: java.util.List - **/ @Override public List bloodSameAllListHistory(List bloodList, Integer periodEnd, @@ -150,17 +78,10 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService Integer orderType ) { - return memberAwardsStatMapper.bloodSameAllListHistory(bloodList, periodEnd, periodSta, achieveTableNameEnd, + return cuMemberAwardsStatMapper.bloodSameAllListHistory(bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType); } - /** - * @description: 伞下去重业绩查询（新） - * @author: zhang jing - * @date: 2024/5/23 14:50 - * @param: [bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType, pkCountry, pkAwardsList] - * @return: java.util.List - **/ @Override public List bloodRemoveSameMemberAchieveNew(List bloodList, Integer periodEnd, @@ -173,176 +94,70 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService Integer pkCountry, List pkAwardsList ) { - return memberAwardsStatMapper.bloodRemoveSameMemberAchieveNew(bloodList, periodEnd, periodSta, achieveTableNameEnd, + return cuMemberAwardsStatMapper.bloodRemoveSameMemberAchieveNew(bloodList, periodEnd, periodSta, achieveTableNameEnd, achieveTableNameSta, settleTableNameSta, settleTableNameEnd, orderType, pkCountry, pkAwardsList); } - - /** - * @description: 根据奖衔查询所有会员 - * @author: zhang jing - * @date: 2023/10/11 14:05 - * @param: [bloodRemoveSameVO] - * @return: java.util.List - **/ @Override public List queryAwardAchieList(BloodRemoveSameVO bloodRemoveSameVO) { - return memberAwardsStatMapper.queryAwardAchieList(bloodRemoveSameVO); + return cuMemberAwardsStatMapper.queryAwardAchieList(bloodRemoveSameVO); } - /** - * @description: 根据奖衔查询会员（历史） - * @author: zhang jing - * @date: 2024/5/17 14:15 - * @param: [bloodRemoveSameVO] - * @return: java.util.List - **/ @Override public List queryAwardAchieListHistory(BloodRemoveSameVO bloodRemoveSameVO) { - return memberAwardsStatMapper.queryAwardAchieListHistory(bloodRemoveSameVO); + return cuMemberAwardsStatMapper.queryAwardAchieListHistory(bloodRemoveSameVO); } - - /** - * @description: 真实奖衔分析详情（穿透页面接口） - * @author: zhang jing - * @date: 2023/9/26 14:27 - * @param: [cuMemberAwardsAnalysisVO] - * @return: java.util.List - **/ @Override public List selectCuMemberAwardsAnalysisDetailsList(CuMemberAwardsAnalysisVO cuMemberAwardsAnalysisVO) { - return memberAwardsStatMapper.selectCuMemberAwardsAnalysisDetailsList(cuMemberAwardsAnalysisVO); + return cuMemberAwardsStatMapper.selectCuMemberAwardsAnalysisDetailsList(cuMemberAwardsAnalysisVO); } - /** - * @description: 收入明细 - * @author: zhang jing - * @date: 2023/9/26 15:07 - * @param: [revenueDetailsVO] - * @return: java.util.List - **/ @Override public List selectRevenueDetailsList(RevenueDetailsVO revenueDetailsVO) { - return memberAwardsStatMapper.selectRevenueDetailsList(revenueDetailsVO); + return cuMemberAwardsStatMapper.selectRevenueDetailsList(revenueDetailsVO); } - /** - * @description: 复购bv统计 - * @author: zhang jing - * @date: 2023/8/29 15:31 - * @param: [repurchasePVStatVO] - * @return: java.util.List - **/ @Override public List selectRepurchasePVStatList(RepurchasePVStatVO repurchasePVStatVO) { - return memberAwardsStatMapper.selectRepurchasePVStatList(repurchasePVStatVO); + return cuMemberAwardsStatMapper.selectRepurchasePVStatList(repurchasePVStatVO); } - /** - * @description: 商城BV统计 - * @author: zhang jing - * @date: 2023/8/30 10:54 - * @param: [mallPVStatVO] - * @return: java.util.List - **/ @Override public List selectMallPVStatList(MallPVStatVO mallPVStatVO) { - return memberAwardsStatMapper.selectMallPVStatList(mallPVStatVO); + return cuMemberAwardsStatMapper.selectMallPVStatList(mallPVStatVO); } - /** - * @description: 个人统计业绩查询 - * @author: zhang jing - * @date: 2023/9/1 11:04 - * @param: [personStatVO] - * @return: java.util.List - **/ @Override public List selectPersonPvList(List perList) { - return memberAwardsStatMapper.selectPersonPvList(perList); + return cuMemberAwardsStatMapper.selectPersonPvList(perList); } - /** - * @description: 直推统计 - * @author: zhang jing - * @date: 2023/9/4 11:46 - * @param: [directPushVO] - * @return: java.util.List - **/ @Override public List selectDirectPushStatList(DirectPushVO directPushVO) { - return memberAwardsStatMapper.selectDirectPushStatList(directPushVO); + return cuMemberAwardsStatMapper.selectDirectPushStatList(directPushVO); } - @Override - public List selectThreeDirectPushStatList(DirectPushVO directPushVO) { - return memberAwardsStatMapper.selectThreeDirectPushStatList(directPushVO); - } - - /** - * @description: 直推数据列表 - * @author: zhang jing - * @date: 2023/12/18 17:15 - * @param: [dpdVO] - * @return: java.util.List - **/ @Override public List selectDirectPushDataList(DirectPushDataVO dpdVO) { - return memberAwardsStatMapper.selectDirectPushDataList(dpdVO); + return cuMemberAwardsStatMapper.selectDirectPushDataList(dpdVO); } - /** - * @description: 直推数据详情 - * @author: zhang jing - * @date: 2023/12/20 14:36 - * @param: [dpdVO] - * @return: java.util.List - **/ @Override public List selectDirectPushDataDetails(DirectPushDataVO dpdVO) { - return memberAwardsStatMapper.selectDirectPushDataDetails(dpdVO); + return cuMemberAwardsStatMapper.selectDirectPushDataDetails(dpdVO); } - - /** - * @description: 会员订单分布统计 - * @author: zhang jing - * @date: 2023/9/20 14:46 - * @param: [orderScatterVO] - * @return: java.util.List - **/ @Override public List memberOrderScatter(OrderScatterVO orderScatterVO) { - return memberAwardsStatMapper.memberOrderScatter(orderScatterVO); + return cuMemberAwardsStatMapper.memberOrderScatter(orderScatterVO); } @Override - public List memberThreeOrderScatter(OrderScatterVO orderScatterVO) { - return memberAwardsStatMapper.memberThreeOrderScatter(orderScatterVO); + public List awardsLevelList(List pkAwardsList, Integer pkCountry) { + return cuMemberAwardsStatMapper.awardsLevelList(pkAwardsList, pkCountry); } - - /** - * @description: 根据奖衔级别查询奖衔 - * @author: zhang jing - * @date: 2023/10/17 11:17 - * @param: [pkAwardsList] - * @return: java.util.List - **/ - @Override - public List awardsLevellist(List pkAwardsList, Integer pkCountry) { - return memberAwardsStatMapper.awardsLevellist(pkAwardsList, pkCountry); - } - - - /** - * @description: 处理伞下去重查询方法 - * @author: zhang jing - * @date: 2024/5/14 14:38 - * @param: [bloodRemoveSameVO] - * @return: java.util.List - **/ @Override public List bloodRemoveSameList(BloodRemoveSameVO bloodRemoveSameVO) { List orderTypeList = bloodRemoveSameVO.getOrderTypeList(); @@ -369,13 +184,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService return allList; } - /** - * @description: 伞下去重业绩查询（新） - * @author: zhang jing - * @date: 2024/5/23 14:50 - * @param: [bloodRemoveSameVO] - * @return: java.util.List - **/ @Override public List bloodRemoveSameListHistoryNew(BloodRemoveSameVO bloodRemoveSameVO) { List orderTypeList = bloodRemoveSameVO.getOrderTypeList(); @@ -388,8 +196,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService List allList = new ArrayList<>(); //根据奖衔查询所有会员 List achieList = queryAwardAchieListHistory(bloodRemoveSameVO); -// List achieList1 = new ArrayList<>(); -// achieList1.add(achieList.get(0)); if (CollectionUtil.isNotEmpty(achieList)) { //查询会员的所有血缘业绩 @@ -425,17 +231,10 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService return allList; } - /** - * @description: 安置血缘查询 - * @author: zhang jing - * @date: 2023/12/6 15:50 - * @param: [resettleBloodVOVO] - * @return: java.util.List - **/ @Override public List resettleBloodList(ResettleBloodVO resettleBloodVO) { List resettleBloodList = new ArrayList<>(); - List lrMemberCountList = memberAwardsStatMapper.lrMemberCountList(resettleBloodVO); + List lrMemberCountList = cuMemberAwardsStatMapper.lrMemberCountList(resettleBloodVO); if (CollectionUtil.isNotEmpty(lrMemberCountList)) { lrMemberCountList.forEach(itm -> { if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { @@ -446,7 +245,7 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService } }); } - List lrbMemberCountList = memberAwardsStatMapper.lrbMemberCountList(resettleBloodVO); + List lrbMemberCountList = cuMemberAwardsStatMapper.lrbMemberCountList(resettleBloodVO); if (CollectionUtil.isNotEmpty(lrbMemberCountList)) { lrbMemberCountList.forEach(itm -> { if (itm.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) { @@ -461,146 +260,61 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService return resettleBloodList; } - /** - * @description: 安置血缘查询-左右区人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:38 - * @param: [resettleBloodVO] - * @return: java.util.List - **/ @Override public List lrMemberDetailsList(ResettleBloodVO resettleBloodVO) { - return memberAwardsStatMapper.lrMemberDetailsList(resettleBloodVO); + return cuMemberAwardsStatMapper.lrMemberDetailsList(resettleBloodVO); } - /** - * @description: 安置血缘查询-左右区血缘人数详情列表 - * @author: zhang jing - * @date: 2023/12/7 11:38 - * @param: [resettleBloodVO] - * @return: java.util.List - **/ @Override public List lrbMemberDetailsList(ResettleBloodVO resettleBloodVO) { - return memberAwardsStatMapper.lrbMemberDetailsList(resettleBloodVO); + return cuMemberAwardsStatMapper.lrbMemberDetailsList(resettleBloodVO); } - /** - * @description: 个人复购统计 - * @author: zhang jing - * @date: 2024/1/25 15:07 - * @param: [prVO] - * @return: java.util.List - **/ @Override public List personRepurchaseList(PersonRepurchaseVO prVO) { - return memberAwardsStatMapper.personRepurchaseList(prVO); + return cuMemberAwardsStatMapper.personRepurchaseList(prVO); } - /** - * @description: 安置业绩统计-查询会员 - * @author: zhang jing - * @date: 2024/1/25 15:36 - * @param: [psVO] - * @return: java.util.List - **/ @Override public List positStatList(PositStatVO psVO) { - return memberAwardsStatMapper.positStatList(psVO); + return cuMemberAwardsStatMapper.positStatList(psVO); } - /** - * @description: 安置业绩统计 查询左右区业绩 - * @author: zhang jing - * @date: 2024/1/26 14:50 - * @param: [psVO] - * @return: java.util.List - **/ @Override public List positStatAchieve(PositStatVO psVO) { - return memberAwardsStatMapper.positStatAchieve(psVO); + return cuMemberAwardsStatMapper.positStatAchieve(psVO); } - /** - * @description: 查询伞下直推产品列表 - * @author: zhang jing - * @date: 2024/2/23 16:04 - * @param: [ubpVO] - * @return: java.util.List - **/ @Override public List umbrellaBelowProductList(UmbrellaBelowProductVO ubpVO) { - return memberAwardsStatMapper.umbrellaBelowProductList(ubpVO); + return cuMemberAwardsStatMapper.umbrellaBelowProductList(ubpVO); } - /** - * @description: 伞下直推产品去重 - * @author: zhang jing - * @date: 2024/2/24 14:46 - * @param: [ubrVO] - * @return: java.util.List - **/ @Override public List umbrellaBelowRepeatList(UmbrellaBelowRepeatVO ubrVO) { - return memberAwardsStatMapper.umbrellaBelowRepeatList(ubrVO); + return cuMemberAwardsStatMapper.umbrellaBelowRepeatList(ubrVO); } - /** - * @description: 伞下直推产品统计 - * @author: zhang jing - * @date: 2024/2/25 11:05 - * @param: [sptVO] - * @return: java.util.List - **/ @Override public List statProductList(StatProductVO sptVO) { - return memberAwardsStatMapper.statProductList(sptVO); + return cuMemberAwardsStatMapper.statProductList(sptVO); } - /** - * @description: 会员户籍数据查询 - * @author: zhang jing - * @date: 2024/3/11 11:39 - * @param: [ddVO] - * @return: java.util.List - **/ @Override public List domicileDataList(DomicileDataVO ddVO) { - return memberAwardsStatMapper.domicileDataList(ddVO); + return cuMemberAwardsStatMapper.domicileDataList(ddVO); } - /** - * @description: 地区业绩统计 - * @author: zhang jing - * @date: 2024/5/6 16:12 - * @param: [areaAchieveStatVO] - * @return: java.util.List - **/ @Override public List areaAchieveStat(AreaAchieveStatVO areaAchieveStatVO) { - return memberAwardsStatMapper.areaAchieveStat(areaAchieveStatVO); + return cuMemberAwardsStatMapper.areaAchieveStat(areaAchieveStatVO); } - /* - * @description: 系统业绩统计 - * @author: zhang jing - * @date: 2024/6/18 14:29 - * @param: [vertexAchieveStatVO] - * @return: java.util.List - **/ @Override public List vertexAchieveStat(VertexAchieveStatVO vertexAchieveStatVO) { - return memberAwardsStatMapper.vertexAchieveStat(vertexAchieveStatVO); + return cuMemberAwardsStatMapper.vertexAchieveStat(vertexAchieveStatVO); } - - /** - * @description: 导出地区业绩 - * @author: zhang jing - * @date: 2024/5/20 10:09 - * @param: [response, fileName, dataList] - * @return: void - **/ @Override public void exportExcelWithMergedCells(HttpServletResponse response, String fileName, List dataList) throws IOException { @@ -686,13 +400,6 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService workbook.close(); } - /** - * @description: 导出系统业绩统计 - * @author: zhang jing - * @date: 2024/6/18 15:39 - * @param: [response, fileName, dataList] - * @return: void - **/ @Override public void exportExcelVertexWithMergedCells(HttpServletResponse response, String fileName, List dataList) throws IOException { @@ -778,28 +485,14 @@ public class CuMemberAwardsStatServiceImpl implements ICuMemberAwardsStatService workbook.close(); } - /** - * @description: 月度职级名单查询 - * @author: zhang jing - * @date: 2024/6/24 15:22 - * @param: [mjlvo] - * @return: java.util.List - **/ @Override public List monthlyJobLevelList(MonthlyJobLevelVo mjlvo) { - return memberAwardsStatMapper.monthlyJobLevelList(mjlvo); + return cuMemberAwardsStatMapper.monthlyJobLevelList(mjlvo); } - /** - * @description: 查询收益区域数据 - * @author: zhang jing - * @date: 2025/1/10 16:28 - * @param: [revenueAreaVO] - * @return: java.util.List - **/ @Override public List revenueAreaList(RevenueAreaVO revenueAreaVO) { - return memberAwardsStatMapper.revenueAreaList(revenueAreaVO); + return cuMemberAwardsStatMapper.revenueAreaList(revenueAreaVO); } // 获取对象属性值的通用方法 diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemAchieveStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemAchieveStatVO.java deleted file mode 100644 index 60cfde5c..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemAchieveStatVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.hzs.report.member.vo; - -import lombok.Data; - -import java.util.List; - -/** - *

- * 会员信息-奖衔升级记录VO - *

- * - * @author hzs - * @since 2022-08-31 - */ -@Data -public class CuMemAchieveStatVO { - private static final long serialVersionUID = 1L; - /** - * 会员编号 - */ - private List pkMemberList; - /** - * 结算期间 - */ - private Integer period; - /** - * 业绩表 - */ - private String achieveTableName; - - - - - - - -} diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAchieveVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAchieveVO.java deleted file mode 100644 index 252f69f2..00000000 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAchieveVO.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.hzs.report.member.vo; - -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 安置反差返回的数据 - * @author: sui q - * @time: 2023/8/28 10:17 - * @classname: CuMemberAchieveVO - * @package_name: com.hzs.report.member.vo - * version 1.0.0 - */ -@Data -public class CuMemberAchieveVO implements Serializable { - - -// private Long pkMember; - - /** - * 层/代 - */ - @Excel(name = "层级") - private Integer algebra; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员名称 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 手机号码 - */ - @Excel(name = "联系方式") - private String phone; - - /** - * 等级 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_GRADE) - private Integer pkGrade; - - @Excel(name = "注册等级") - private String pkGradeVal; - - /** - * 真实奖衔 - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkAwards; - @Excel(name = "真实奖衔") - private String pkAwardsVal; - - /** - * 体系名称 - */ - @Excel(name = "隶属体系") - private String vertexName; - - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamName; - - /** - * 考核状态 (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/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 f54c4056..e724784b 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 { @@ -63,6 +58,7 @@ public class CuMemberAwardsAnalysisVO { */ @Excel(name = "注册等级") private String pkRegisterGradeVal; + /** * 奖衔 */ @@ -73,20 +69,19 @@ public class CuMemberAwardsAnalysisVO { * 荣誉奖衔 */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) - private Integer pkRangeAwards; - + private Integer pkMaxAwards; /** - * 奖衔 + * 当月奖衔 */ - @Excel(name = "真实奖衔") + @Excel(name = "当月奖衔") private String pkAwardsVal; /** * 荣誉奖衔 */ @Excel(name = "荣誉奖衔") - private String pkRangeAwardsVal; + private String pkMaxAwardsVal; /** * 隶属体系 @@ -101,41 +96,42 @@ public class CuMemberAwardsAnalysisVO { * 左区真实累计业绩 */ @BigDecimalFormat - private BigDecimal aSumRealPv=BigDecimal.ZERO; + private BigDecimal aSumRealPv = BigDecimal.ZERO; /** * 右区真实累计业绩 */ @BigDecimalFormat - private BigDecimal bSumRealPv=BigDecimal.ZERO; + private BigDecimal bSumRealPv = BigDecimal.ZERO; /** * 结算期间 */ private Integer period; + + /** + * 有效日期 + */ + @Excel(name = "有效日期", dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endValidityDate; + /** * 晋升方式 */ @Transaction(transactionKey = EnumsPrefixConstants.UPGRADE_TYPE) private Integer upType; + @Excel(name = "晋升方式") private String upTypeVal; /** * 创建时间 */ - @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; - /** - * 有效日期 - */ - @Excel(name = "有效日期",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endValidityDate; - - /** * 创建时间开始时间 */ @@ -157,7 +153,6 @@ public class CuMemberAwardsAnalysisVO { private String endEffectiveDate; - /** * 隶属体系 */ @@ -167,7 +162,7 @@ public class CuMemberAwardsAnalysisVO { */ private Integer pkTeamCode; /** - * 业绩表 + * 业绩表 */ private String achieveTableName; @@ -187,5 +182,4 @@ public class CuMemberAwardsAnalysisVO { private Integer pkGrade; - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsStatVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsStatVO.java index 12b5bc08..43977e33 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsStatVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberAwardsStatVO.java @@ -11,12 +11,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员信息-奖衔升级记录VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class CuMemberAwardsStatVO { @@ -83,13 +78,13 @@ public class CuMemberAwardsStatVO { * A区新增业绩 */ @Excel(name = "左区新增业绩(PV)") - private BigDecimal aNewPv=BigDecimal.ZERO; + private BigDecimal aNewPv = BigDecimal.ZERO; /** * B区新增业绩 */ @Excel(name = "右左区新增业绩(PV)") - private BigDecimal bNewPv=BigDecimal.ZERO; + private BigDecimal bNewPv = BigDecimal.ZERO; /** @@ -101,7 +96,7 @@ public class CuMemberAwardsStatVO { /** * 创建时间 */ - @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; /** @@ -123,7 +118,7 @@ public class CuMemberAwardsStatVO { */ private Integer pkTeamCode; /** - * 业绩表 + * 业绩表 */ private String achieveTableName; @@ -143,7 +138,4 @@ public class CuMemberAwardsStatVO { private List pkMemberList; - - - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberGradeRecordVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberGradeRecordVO.java index f1c81339..ce24cf7b 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberGradeRecordVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberGradeRecordVO.java @@ -9,12 +9,7 @@ import lombok.Data; import java.util.Date; /** - *

* 会员信息-结算等级升级记录VO - *

- * - * @author hzs - * @since 2022-08-31 */ @Data public class CuMemberGradeRecordVO { @@ -41,6 +36,13 @@ public class CuMemberGradeRecordVO { */ @Excel(name = "会员姓名") private String memberName; + + /** + * 订单编号 + */ + @Excel(name = "订单编号") + private String orderCode; + /** * 手机号码 */ @@ -87,13 +89,6 @@ public class CuMemberGradeRecordVO { @Excel(name = "隶属体系") private String teamName; - /** - * 订单编号 - */ - @Excel(name = "订单编号") - private String orderCode; - - /** @@ -107,7 +102,7 @@ public class CuMemberGradeRecordVO { /** * 创建时间 */ - @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; @@ -144,5 +139,4 @@ public class CuMemberGradeRecordVO { private Integer pkGrade; - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberImportVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberImportVO.java index 61a2df20..d0a556b0 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberImportVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberImportVO.java @@ -8,13 +8,8 @@ import lombok.NoArgsConstructor; import java.util.Date; - /** - * @Description: 会员编号导入实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo + * 会员编号导入实体vo */ @Data @EqualsAndHashCode(callSuper = false) 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 e946da05..3e76e539 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 @@ -10,12 +10,7 @@ import java.io.Serializable; import java.util.Date; /** - * @description: 推荐反差返回的数据 - * @author: zhangjing - * @time: 2023/8/28 10:17 - * @classname: CuMemberAchieveVO - * @package_name: com.hzs.report.member.vo - * version 1.0.0 + * 推荐反差返回的数据 */ @Data public class CuMemberPushAchieveVO implements Serializable { 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..f0160830 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 @@ -12,11 +12,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) diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberWalletVO.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberWalletVO.java index cc44b197..21250e07 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberWalletVO.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/CuMemberWalletVO.java @@ -15,12 +15,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员钱包 - *

- * - * @author hzs - * @since 2024-03-22 */ @Data @AllArgsConstructor 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 a2e410fa..1ccb8405 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 @@ -264,72 +264,72 @@ AND cm.pk_id =#{pkMember} - - + select pkmember, + period, + uptype, + membercode, + membername, + phone, + pkAwardsVal, + pkMaxAwardsVal, + pkRegisterGradeVal, + vertexname, + creationtime, + endvaliditydate + from (select cm.pk_id as pkmember, + cma.period, + cma.up_type as uptype, + cm.member_code as membercode, + cm.member_name as membername, + cm.phone, + baa.awards_name as pkAwardsVal, + bam.awards_name as pkMaxAwardsVal, + bg.grade_name as pkRegisterGradeVal, + ver.vertex_name as vertexname, + cma.creation_time as creationtime, + cma.end_validity_date as endvaliditydate, + row_number() over(partition by cm.member_code order by cma.new_level desc) as rn + from cu_member cm + left join bd_grade bg + on bg.pk_id = cm.pk_register_grade + and bg.del_flag = 0 + left join bd_vertex ver + on cm.pk_vertex = ver.pk_id + and ver.del_flag = 0 + left join cu_member_awards cma + on cma.pk_member = cm.pk_id + and cma.award_type = 1 + and cma.del_flag = 0 + left join cu_member_settle_period cmsp + on cmsp.pk_id = cma.period + left join bd_awards baa + on baa.pk_id = cma.new_level + and baa.del_flag = 0 + left join bd_awards bam + on bam.pk_id = cm.pk_max_awards + and bam.del_flag = 0 + where cm.del_flag = 0 + and cm.pk_settle_country = #{pkCountry} + and cma.del_flag = 0 AND cm.MEMBER_CODE like #{memberCode} || '%' - - AND cma.UP_TYPE=#{upType} - AND cm.MEMBER_NAME like #{memberName} || '%' AND cm.phone like #{phone} || '%' - - AND AW.PK_ID=#{pkAwards} + + AND cma.UP_TYPE = #{upType} - - AND AWW.PK_ID=#{pkRangeAwards} + + AND AW.PK_ID = #{pkAwards} + + + AND AWW.PK_ID = #{pkMaxAwards} and cmsp.SETTLE_DATE >= to_date(#{startDate}, 'yyyy-mm-dd') @@ -344,22 +344,18 @@ and CMA.END_VALIDITY_DATE <= to_date(#{endEffectiveDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - AND cm.pk_vertex=#{pkVertex} - - - AND cm.pk_team_code=#{pkTeamCode} + AND cm.pk_vertex = #{pkVertex} - AND cm.PK_REGISTER_GRADE=#{pkRegisterGrade} + AND cm.PK_REGISTER_GRADE = #{pkRegisterGrade} ) t - WHERE rn = 1 - ORDER BY CREATIONTIME DESC + where rn = 1 + order by creationtime desc - - select * from ( SELECT CM.PK_ID AS PKMEMBER, @@ -388,19 +384,19 @@ ON cm.pk_team_code=cmt.pk_id AND cmt.del_flag=0 WHERE CML.DEL_FLAG = 0 AND CM.DEL_FLAG = 0 - AND cm.PK_SETTLE_COUNTRY=#{pkCountry} - AND cm.system_Type=#{systemType} + AND cm.PK_SETTLE_COUNTRY = #{pkCountry} + AND cm.system_Type = #{systemType} AND cm.MEMBER_CODE like #{memberCode} || '%' + + AND cm.pk_vertex = #{pkVertex} + + + AND cm.pk_team_code = #{pkTeamCode} + - AND CML.UP_TYPE=#{upType} - - - AND cm.MEMBER_NAME like #{memberName} || '%' - - - AND cm.phone like #{phone} || '%' + AND CML.UP_TYPE = #{upType} and CML.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') @@ -408,15 +404,6 @@ and CML.CREATION_TIME <= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - AND cm.pk_vertex=#{pkVertex} - - - AND cm.pk_team_code=#{pkTeamCode} - - - AND cm.PK_REGISTER_GRADE=#{pkRegisterGrade} - UNION SELECT CM.PK_ID AS PKMEMBER, @@ -443,19 +430,19 @@ ON cm.pk_team_code=cmt.pk_id AND cmt.del_flag=0 WHERE CMG.DEL_FLAG = 0 AND CM.DEL_FLAG = 0 - AND cm.PK_SETTLE_COUNTRY=#{pkCountry} - AND cm.system_Type=#{systemType} + AND cm.PK_SETTLE_COUNTRY = #{pkCountry} + AND cm.system_Type = #{systemType} AND cm.MEMBER_CODE like #{memberCode} || '%' + + AND cm.pk_vertex = #{pkVertex} + + + AND cm.pk_team_code = #{pkTeamCode} + - AND CMG.UP_TYPE=#{upType} - - - AND cm.MEMBER_NAME like #{memberName} || '%' - - - AND cm.phone like #{phone} || '%' + AND CMG.UP_TYPE = #{upType} and CMG.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd') @@ -463,42 +450,10 @@ and CMG.CREATION_TIME <= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss') - - AND cm.pk_vertex=#{pkVertex} - - - AND cm.pk_team_code=#{pkTeamCode} - - - AND cm.PK_REGISTER_GRADE=#{pkRegisterGrade} - - ) ORDER BY CREATIONTIME DESC - - - - - - - - + - -