From 97b0e16142be37e2df4dfffc67bccb71782e0930 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 3 Jun 2025 16:00:03 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= =?UTF-8?q?=E4=B8=8B=E4=BC=9E=E4=B8=8B=E5=AE=89=E7=BD=AE=E3=80=81=E7=9B=B4?= =?UTF-8?q?=E6=8E=A8=E6=96=B0=E5=A2=97=E4=B8=9A=E7=BB=A9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/MemberReportController.java | 529 ++++++++---------- .../member/mapper/MemberReportMapper.java | 19 +- .../member/service/MemberReportService.java | 3 +- .../service/impl/MemberReportServiceImpl.java | 7 +- .../hzs/report/member/vo/DirectPushNewVo.java | 9 +- .../member/vo/MemberResettleAchieveVo.java | 23 +- .../report/member/MemberReportMapper.xml | 167 +++--- 7 files changed, 342 insertions(+), 415 deletions(-) diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java index 50b70268..9f0b7147 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java @@ -63,19 +63,14 @@ public class MemberReportController extends BaseController { **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT) @GetMapping("/direct-push-new") - public TableDataInfo directPushNew(String memberCode, String memberName, - Integer pkAwards, Integer pkTeamCode, Integer pkCountry, + public TableDataInfo directPushNew(String memberCode, String memberName, Integer pkAwards, Integer pkTeamCode, Date startPayTime, Date endPayTime, Integer pkVertex, Integer orderType) { - + Integer pkCountry = SecurityUtils.getPkCountry(); List orderTypeList = EOrderBusiness.getOrderTypeList(orderType); Long pkMember; - if (pkCountry == null) { - pkCountry = SecurityUtils.getPkCountry(); - } if (StringUtils.isNotBlank(memberCode)) { - R memberDto = iMemberServiceApi.getMemberByCode(memberCode); - CuMember member = memberDto.getData(); + CuMember member = iMemberServiceApi.getMemberByCode(memberCode).getData(); if (null != member) { pkMember = member.getPkId(); } else { @@ -84,31 +79,27 @@ public class MemberReportController extends BaseController { } else { return getDataTable(new ArrayList<>()); } + Date date = DateUtils.currentDate(); - if (StringUtils.isNull(startPayTime) || - StringUtils.isNull(endPayTime)) { + if (StringUtils.isNull(startPayTime) || StringUtils.isNull(endPayTime)) { //当前月的第一天 startPayTime = DateUtils.currentMonthFirstDate(); endPayTime = date; } + //伞下直推新增业绩 startPage(); List memberList = memberReportService.directPushNewList(pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex); - startPayTime = DateUtils.getStartTime(startPayTime); - endPayTime = DateUtils.getEndTime(endPayTime); - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - - List achieList = memberReportService.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderTypeList, pkCountry); if (CollectionUtil.isNotEmpty(memberList)) { + startPayTime = DateUtils.getStartTime(startPayTime); + endPayTime = DateUtils.getEndTime(endPayTime); + List achieList = memberReportService.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderTypeList, pkCountry); + + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); memberList.forEach(itm -> { if (null != achieList.get(0)) { - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - //中国业绩转为人民币 - itm.setOrderAchieve(achieList.get(0).getOrderAchieve().multiply(currency.getData().getInExchangeRate())); - } else { - itm.setOrderAchieve(achieList.get(0).getOrderAchieve()); - } + itm.setOrderAchieve(achieList.get(0).getOrderAchieve().multiply(currency.getData().getInExchangeRate())); itm.setOrderType(orderType); itm.setOrderAmount(achieList.get(0).getOrderAmount()); } @@ -123,13 +114,12 @@ public class MemberReportController extends BaseController { @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT) @PostMapping("/export-direct-push-new") public void export(DirectPushNewVo directPushNewVo, HttpServletResponse response) { - List orderTypeList = EOrderBusiness.getOrderTypeList(directPushNewVo.getOrderType()); - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderBusiness.values()); - Long pkMember = null; Integer pkCountry = SecurityUtils.getPkCountry(); + List orderTypeList = EOrderBusiness.getOrderTypeList(directPushNewVo.getOrderType()); + + Long pkMember = null; if (StringUtils.isNotBlank(directPushNewVo.getMemberCode())) { - R memberDto = iMemberServiceApi.getMember(directPushNewVo.getMemberCode()); - CuMember member = memberDto.getData(); + CuMember member = iMemberServiceApi.getMemberByCode(directPushNewVo.getMemberCode()).getData(); if (null != member) { pkMember = member.getPkId(); } else { @@ -140,35 +130,30 @@ public class MemberReportController extends BaseController { ExcelUtil util = new ExcelUtil<>(DirectPushNewVo.class); util.exportExcel(response, new ArrayList<>(), "伞下直推新增业绩导出"); } + Date date = DateUtils.currentDate(); - if (StringUtils.isNull(directPushNewVo.getStartPayTime()) || - StringUtils.isNull(directPushNewVo.getEndPayTime())) { + if (StringUtils.isNull(directPushNewVo.getStartPayTime()) || StringUtils.isNull(directPushNewVo.getEndPayTime())) { //当前月的第一天 - Date startPayTime = DateUtils.currentMonthFirstDate(); - directPushNewVo.setStartPayTime(startPayTime); + directPushNewVo.setStartPayTime(DateUtils.currentMonthFirstDate()); directPushNewVo.setEndPayTime(date); } //伞下直推新增业绩 List memberList = memberReportService.directPushNewList(pkMember, directPushNewVo.getMemberName(), directPushNewVo.getPkAwards(), directPushNewVo.getPkTeamCode(), pkCountry, directPushNewVo.getStartPayTime(), directPushNewVo.getEndPayTime(), directPushNewVo.getPkVertex()); - Date startPayTime = DateUtils.getStartTime(directPushNewVo.getStartPayTime()); - Date endPayTime = DateUtils.getEndTime(directPushNewVo.getEndPayTime()); - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - List achieList = memberReportService.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderTypeList, pkCountry); if (CollectionUtil.isNotEmpty(memberList)) { + Date startPayTime = DateUtils.getStartTime(directPushNewVo.getStartPayTime()); + Date endPayTime = DateUtils.getEndTime(directPushNewVo.getEndPayTime()); + List achieList = memberReportService.directPushNewAchieList(pkMember, startPayTime, endPayTime, orderTypeList, pkCountry); + + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderBusiness.values()); memberList.forEach(itm -> { if (null != achieList.get(0)) { itm.setOrderType(directPushNewVo.getOrderType()); itm.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_BUSINESS + directPushNewVo.getOrderType())); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - //中国业绩转为人民币 - itm.setOrderAchieve(achieList.get(0).getOrderAchieve().multiply(currency.getData().getInExchangeRate())); - } else { - itm.setOrderAchieve(achieList.get(0).getOrderAchieve()); - } - + itm.setOrderAchieve(achieList.get(0).getOrderAchieve().multiply(currency.getData().getInExchangeRate())); itm.setOrderAmount(achieList.get(0).getOrderAmount()); } }); @@ -182,20 +167,16 @@ public class MemberReportController extends BaseController { **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT) @GetMapping("/direct-push-new-up") - public TableDataInfo directPushNewUp(String memberCode, String memberName, - Integer pkAwards, Integer pkTeamCode, Integer pkCountry, + public TableDataInfo directPushNewUp(String memberCode, String memberName, Integer pkAwards, Integer pkTeamCode, Date startPayTime, Date endPayTime, Integer pkVertex, Integer orderType) { - Long pkMember; - if (pkCountry == null) { - pkCountry = SecurityUtils.getPkCountry(); - } if (orderType == null) { orderType = EOrderUpBusiness.WHOLE.getValue(); } - CuMember member; + + Integer pkCountry = SecurityUtils.getPkCountry(); + Long pkMember; if (StringUtils.isNotBlank(memberCode)) { - R memberDto = iMemberServiceApi.getMember(memberCode); - member = memberDto.getData(); + CuMember member = iMemberServiceApi.getMember(memberCode).getData(); if (null != member) { pkMember = member.getPkId(); } else { @@ -204,17 +185,18 @@ public class MemberReportController extends BaseController { } else { return getDataTable(new ArrayList<>()); } + Date date = DateUtils.currentDate(); if (DateUtils.compareDate(startPayTime, date) > 0) { startPayTime = null; endPayTime = null; } - if (StringUtils.isNull(startPayTime) || - StringUtils.isNull(endPayTime)) { + if (StringUtils.isNull(startPayTime) || StringUtils.isNull(endPayTime)) { //当前月的第一天 startPayTime = DateUtils.currentMonthFirstDate(); endPayTime = date; } + //开始时间减一天 String startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, startPayTime)); String endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); @@ -231,19 +213,17 @@ public class MemberReportController extends BaseController { dpo.setSettleTableNameEnd(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(endDateStr)); //伞下直推新增业绩 List memberList = memberReportService.directPushNewList(pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex); - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - List achieList = memberReportService.directPushNewAchieUpList(dpo, pkMember, orderType); if (CollectionUtil.isNotEmpty(memberList)) { + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + List achieList = memberReportService.directPushNewAchieUpList(dpo, pkMember, orderType); Integer finalOrderType = orderType; + memberList.forEach(itm -> { if (null != achieList.get(0)) { itm.setOrderAchieve(achieList.get(0).getOrderAchieve()); itm.setOrderAmount(achieList.get(0).getOrderAmount()); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - //中国业绩转为人民币 - itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate())); - itm.setOrderAmount(itm.getOrderAmount().multiply(currency.getData().getInExchangeRate())); - } + itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getInExchangeRate())); + itm.setOrderAmount(itm.getOrderAmount().multiply(currency.getInExchangeRate())); itm.setOrderType(finalOrderType); } }); @@ -257,22 +237,17 @@ public class MemberReportController extends BaseController { **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT) @PostMapping("/export-direct-push-new-up") - public void exportUp(String memberCode, String memberName, - Integer pkAwards, Integer pkTeamCode, Integer pkCountry, + public void exportUp(String memberCode, String memberName, Integer pkAwards, Integer pkTeamCode, Date startPayTime, Date endPayTime, Integer pkVertex, Integer orderType, HttpServletResponse response) { - Long pkMember; - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderUpBusiness.values()); - if (pkCountry == null) { - pkCountry = SecurityUtils.getPkCountry(); - } if (orderType == null) { orderType = EOrderUpBusiness.WHOLE.getValue(); } - CuMember member; + + Integer pkCountry = SecurityUtils.getPkCountry(); + Long pkMember; if (StringUtils.isNotBlank(memberCode)) { - R memberDto = iMemberServiceApi.getMember(memberCode); - member = memberDto.getData(); + CuMember member = iMemberServiceApi.getMember(memberCode).getData(); if (null != member) { pkMember = member.getPkId(); } else { @@ -287,8 +262,7 @@ public class MemberReportController extends BaseController { startPayTime = null; endPayTime = null; } - if (StringUtils.isNull(startPayTime) || - StringUtils.isNull(endPayTime)) { + if (StringUtils.isNull(startPayTime) || StringUtils.isNull(endPayTime)) { //当前月的第一天 startPayTime = DateUtils.currentMonthFirstDate(); endPayTime = date; @@ -310,19 +284,18 @@ public class MemberReportController extends BaseController { dpo.setSettleTableNameEnd(TableNameConstants.CU_MEMBER_TREE + DateUtils.getMonth(endDateStr)); //伞下直推新增业绩 List memberList = memberReportService.directPushNewList(pkMember, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex); - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - List achieList = memberReportService.directPushNewAchieUpList(dpo, pkMember, orderType); if (CollectionUtil.isNotEmpty(memberList)) { + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + List achieList = memberReportService.directPushNewAchieUpList(dpo, pkMember, orderType); Integer finalOrderType = orderType; + Map transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderUpBusiness.values()); + memberList.forEach(itm -> { if (null != achieList.get(0)) { itm.setOrderAchieve(achieList.get(0).getOrderAchieve()); itm.setOrderAmount(achieList.get(0).getOrderAmount()); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - //中国业绩转为人民币 - itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate())); - itm.setOrderAmount(itm.getOrderAmount().multiply(currency.getData().getInExchangeRate())); - } + itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getInExchangeRate())); + itm.setOrderAmount(itm.getOrderAmount().multiply(currency.getInExchangeRate())); itm.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_UP_BUSINESS + finalOrderType)); } }); @@ -359,31 +332,26 @@ public class MemberReportController extends BaseController { @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT) @GetMapping("/member-resettle-achieve") public TableDataInfo memberResettleAchieve(String memberCode, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer orderType, Integer pkAwards) { + if (StringUtils.isEmpty(memberCode)) { + return getDataTable(new ArrayList<>()); + } if (startPayTime != null) { startPayTime = DateUtils.getStartTime(startPayTime); } if (endPayTime != null) { endPayTime = DateUtils.getEndTime(endPayTime); } - if (StringUtils.isEmpty(memberCode)) { - return getDataTable(new ArrayList<>()); - } - R memberDto = iMemberServiceApi.getMember(memberCode); - CuMember member = memberDto.getData(); - Integer pkCountry = null; - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - pkCountry = SecurityUtils.getPkCountry(); - } + CuMember member = iMemberServiceApi.getMember(memberCode).getData(); if (member == null) { return getDataTable(new ArrayList<>()); } - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - CurrencyDTO currency = currencyDto.getData(); + Integer pkCountry = SecurityUtils.getPkCountry(); List orderTypeList = EOrderBusiness.getOrderTypeList(orderType); + List memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberName, startPayTime, endPayTime, + pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); - List memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); Map memberResettleAchieveMap = memberResettleAchieveList.stream().collect(Collectors.toMap(MemberResettleAchieveVo::getPlaceDept, Function.identity())); // 左区新增业绩 BigDecimal leftNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAchieve(); @@ -393,6 +361,7 @@ public class MemberReportController extends BaseController { BigDecimal leftNewAddAmount = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAmount(); // 右区新增金额 BigDecimal rightNewAddAmount = memberResettleAchieveMap.get(EPlaceDept.RIGHT_DEPT.getValue()).getAmount(); + MemberResettleAchieveVo mr = memberResettleAchieveList.get(0); // 查询会员业绩 MemberResettleAchieveVo memberResettleAchieveVo = new MemberResettleAchieveVo(); @@ -405,198 +374,26 @@ public class MemberReportController extends BaseController { memberResettleAchieveVo.setAwardsName(mr.getAwardsName()); memberResettleAchieveVo.setVertexName(mr.getVertexName()); memberResettleAchieveVo.setTeamCodeName(mr.getTeamCodeName()); - BigDecimal inExchangeRate = currency.getInExchangeRate(); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount); - memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount); - memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve.multiply(inExchangeRate)); - memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve.multiply(inExchangeRate)); - } else { - memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP)); - memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP)); - memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve); - memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve); - } + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + BigDecimal inExchangeRate = currency.getInExchangeRate(); + memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount); + memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount); + memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve.multiply(inExchangeRate)); + memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve.multiply(inExchangeRate)); memberResettleAchieveVo.setOrderTime(mr.getOrderTime()); + return getDataTable(Collections.singletonList(memberResettleAchieveVo)); } - /** - * 伞下新增安置业绩列表（历史） - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT) - @GetMapping("/member-resettle-achieve_up") - public TableDataInfo memberResettleAchieveUp(String memberCode, String memberName, Date startPayTime, - Date endPayTime, Integer pkVertex, Integer pkTeamCode, - Integer orderType, Integer pkAwards) { - if (startPayTime == null || endPayTime == null) { - return getDataTable(new ArrayList<>()); - } - Date date = new Date(); - String startDateStr = ""; - String endDateStr = ""; - if (DateUtils.compareDate(startPayTime, date) > 0) { - startPayTime = date; - startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); - startDateStr = DateUtils.beforeDateStr(2, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); - } else { - startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); - startDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); - } - if (DateUtils.compareDate(endPayTime, date) > 0) { - endPayTime = date; - endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); - endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); - } else { - endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); - } - - if (StringUtils.isEmpty(memberCode)) { - return getDataTable(new ArrayList<>()); - } - R memberDto = iMemberServiceApi.getMemberByCode(memberCode); - CuMember member = memberDto.getData(); - if (member == null) { - return getDataTable(new ArrayList<>()); - } - Integer pkCountry = SecurityUtils.getPkCountry(); - - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - CurrencyDTO currency = currencyDto.getData(); - - List memberResettleAchieveList = new ArrayList<>(); - BigDecimal inExchangeRate = currency.getInExchangeRate(); - //查询最新期数 - int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(startDateStr)).getPkId(); - int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(endDateStr)).getPkId(); - String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); - String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); - List staAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, - pkVertex, pkTeamCode, pkCountry, pkAwards, staAchieveTableName, staPeriod); - List endAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, - pkVertex, pkTeamCode, pkCountry, pkAwards, endAchieveTableName, endPeriod); - if (CollectionUtil.isNotEmpty(staAchieveList) && CollectionUtil.isNotEmpty(endAchieveList)) { - for (MemberResettleAchieveVo end : endAchieveList) { - for (MemberResettleAchieveVo sta : staAchieveList) { - if (end.getPkMember().equals(sta.getPkMember())) { - end.setLeftNewAddAmount(end.getASumAmount().subtract(sta.getASumAmount())); - end.setRightNewAddAmount(end.getBSumAmount().subtract(sta.getBSumAmount())); - end.setLeftNewAddAchieve(end.getASumPv().subtract(sta.getASumPv())); - end.setRightNewAddAchieve(end.getBSumPv().subtract(sta.getBSumPv())); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - end.setLeftNewAddAmount(end.getLeftNewAddAmount().multiply(inExchangeRate)); - end.setRightNewAddAmount(end.getRightNewAddAmount().multiply(inExchangeRate)); - end.setLeftNewAddAchieve(end.getLeftNewAddAchieve().multiply(inExchangeRate)); - end.setRightNewAddAchieve(end.getRightNewAddAchieve().multiply(inExchangeRate)); - } - } - } - memberResettleAchieveList.add(end); - } - } - return getDataTable(memberResettleAchieveList); - } - - /** - * 导出伞下新增安置业绩列表 - **/ - @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT) - @PostMapping("/member-resettle-achieve_up_export") - public void memberResettleAchieveUpExport(HttpServletResponse response, String memberCode, String memberName, Date startPayTime, - Date endPayTime, Integer pkVertex, Integer pkTeamCode, - Integer orderType, Integer pkAwards) { - if (startPayTime == null || endPayTime == null) { - return; - } - Date date = new Date(); - String startDateStr = ""; - String endDateStr = ""; - if (DateUtils.compareDate(startPayTime, date) > 0) { - startPayTime = date; - startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); - startDateStr = DateUtils.beforeDateStr(2, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); - } else { - startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); - startDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); - } - if (DateUtils.compareDate(endPayTime, date) > 0) { - endPayTime = date; - endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); - endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); - } else { - endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); - } - - if (StringUtils.isEmpty(memberCode)) { - return; - } - R memberDto = iMemberServiceApi.getMemberByCode(memberCode); - CuMember member = memberDto.getData(); - Integer pkCountry = null; - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - pkCountry = SecurityUtils.getPkCountry(); - } - - if (member == null) { - return; - } - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - CurrencyDTO currency = currencyDto.getData(); - List memberResettleAchieveList = new ArrayList<>(); - BigDecimal inExchangeRate = currency.getInExchangeRate(); - //查询最新期数 - int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(startDateStr)).getPkId(); - int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( - DateUtils.parseDateToStr(endDateStr)).getPkId(); - String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); - - String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); - List staAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, - pkVertex, pkTeamCode, pkCountry, pkAwards, staAchieveTableName, staPeriod); - List endAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, - pkVertex, pkTeamCode, pkCountry, pkAwards, endAchieveTableName, endPeriod); - if (CollectionUtil.isNotEmpty(staAchieveList) && CollectionUtil.isNotEmpty(endAchieveList)) { - for (MemberResettleAchieveVo end : endAchieveList) { - for (MemberResettleAchieveVo sta : staAchieveList) { - if (end.getPkMember().equals(sta.getPkMember())) { - end.setLeftNewAddAmount(end.getASumAmount().subtract(sta.getASumAmount())); - end.setRightNewAddAmount(end.getBSumAmount().subtract(sta.getBSumAmount())); - end.setLeftNewAddAchieve(end.getASumPv().subtract(sta.getASumPv())); - end.setRightNewAddAchieve(end.getBSumPv().subtract(sta.getBSumPv())); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - end.setLeftNewAddAmount(end.getLeftNewAddAmount().multiply(inExchangeRate)); - end.setRightNewAddAmount(end.getRightNewAddAmount().multiply(inExchangeRate)); - end.setLeftNewAddAchieve(end.getLeftNewAddAchieve().multiply(inExchangeRate)); - end.setRightNewAddAchieve(end.getRightNewAddAchieve().multiply(inExchangeRate)); - } - } - } - memberResettleAchieveList.add(end); - } - } - ExcelUtil util = new ExcelUtil<>(MemberResettleAchieveVo.class); - util.exportExcel(response, memberResettleAchieveList, "伞下新增安置业绩导出"); - } - /** * 伞下新增安置业绩导出 */ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT) @PostMapping("/member-resettle-achieve-export") public void memberResettleAchieveExport(MemberResettleAchieveParam memberResettleAchieveParam, HttpServletResponse response) { - if (memberResettleAchieveParam.getStartPayTime() != null) { - memberResettleAchieveParam.setStartPayTime(DateUtils.getStartTime(memberResettleAchieveParam.getStartPayTime())); - } - if (memberResettleAchieveParam.getEndPayTime() != null) { - memberResettleAchieveParam.setEndPayTime(DateUtils.getEndTime(memberResettleAchieveParam.getEndPayTime())); - } - R memberDto = iMemberServiceApi.getMember(memberResettleAchieveParam.getMemberCode()); - CuMember member = memberDto.getData(); - if (member == null) { + CuMember member = iMemberServiceApi.getMember(memberResettleAchieveParam.getMemberCode()).getData(); + if (null == member) { ExcelUtil util = new ExcelUtil<>(MemberResettleAchieveVo.class); util.exportExcel(response, Collections.singletonList(new MemberResettleAchieveVo()), "伞下新增安置业绩导出"); } else { @@ -607,22 +404,16 @@ public class MemberReportController extends BaseController { memberResettleAchieveParam.setEndPayTime(DateUtils.getEndTime(memberResettleAchieveParam.getEndPayTime())); } - Integer pkCountry = null; - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - pkCountry = SecurityUtils.getPkCountry(); - } - R currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - CurrencyDTO currency = currencyDto.getData(); + Integer pkCountry = SecurityUtils.getPkCountry(); List orderTypeList = EOrderBusiness.getOrderTypeList(memberResettleAchieveParam.getOrderType()); - - List memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberResettleAchieveParam.getMemberName(), memberResettleAchieveParam.getStartPayTime(), memberResettleAchieveParam.getEndPayTime(), memberResettleAchieveParam.getPkVertex(), memberResettleAchieveParam.getPkTeamCode(), pkCountry, memberResettleAchieveParam.getPkAwards(), orderTypeList); + List memberResettleAchieveList = memberReportService.memberResettleAchieve(member.getPkId(), memberResettleAchieveParam.getMemberName(), memberResettleAchieveParam.getStartPayTime(), + memberResettleAchieveParam.getEndPayTime(), memberResettleAchieveParam.getPkVertex(), memberResettleAchieveParam.getPkTeamCode(), pkCountry, memberResettleAchieveParam.getPkAwards(), orderTypeList); Map memberResettleAchieveMap = memberResettleAchieveList.stream().collect(Collectors.toMap(MemberResettleAchieveVo::getPlaceDept, Function.identity())); - // 左区新增业绩 + // 左区新增业绩 BigDecimal leftNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAchieve(); // 右区新增业绩 BigDecimal rightNewAddAchieve = memberResettleAchieveMap.get(EPlaceDept.RIGHT_DEPT.getValue()).getAchieve(); - // 左区新增金额 BigDecimal leftNewAddAmount = memberResettleAchieveMap.get(EPlaceDept.LEFT_DEPT.getValue()).getAmount(); // 右区新增金额 @@ -639,24 +430,178 @@ public class MemberReportController extends BaseController { memberResettleAchieveVo.setAwardsName(mr.getAwardsName()); memberResettleAchieveVo.setVertexName(mr.getVertexName()); memberResettleAchieveVo.setTeamCodeName(mr.getTeamCodeName()); + + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); BigDecimal inExchangeRate = currency.getInExchangeRate(); - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount); - memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount); - memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve.multiply(inExchangeRate)); - memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve.multiply(inExchangeRate)); - } else { - memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP)); - memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount.divide(inExchangeRate, 2, BigDecimal.ROUND_HALF_UP)); - memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve); - memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve); - } + memberResettleAchieveVo.setLeftNewAddAmount(leftNewAddAmount); + memberResettleAchieveVo.setRightNewAddAmount(rightNewAddAmount); + memberResettleAchieveVo.setLeftNewAddAchieve(leftNewAddAchieve.multiply(inExchangeRate)); + memberResettleAchieveVo.setRightNewAddAchieve(rightNewAddAchieve.multiply(inExchangeRate)); memberResettleAchieveVo.setOrderTime(mr.getOrderTime()); ExcelUtil util = new ExcelUtil<>(MemberResettleAchieveVo.class); util.exportExcel(response, Collections.singletonList(memberResettleAchieveVo), "伞下新增安置业绩导出"); } } + /** + * 伞下新增安置业绩列表（历史） + **/ + @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT) + @GetMapping("/member-resettle-achieve_up") + public TableDataInfo memberResettleAchieveUp(String memberCode, String memberName, Date startPayTime, Date endPayTime, + Integer pkVertex, Integer pkTeamCode, Integer orderType, Integer pkAwards) { + if (startPayTime == null || endPayTime == null) { + return getDataTable(new ArrayList<>()); + } + + Date date = new Date(); + String startDateStr = ""; + String endDateStr = ""; + if (DateUtils.compareDate(startPayTime, date) > 0) { + startPayTime = date; + startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); + startDateStr = DateUtils.beforeDateStr(2, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); + } else { + startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); + startDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); + } + if (DateUtils.compareDate(endPayTime, date) > 0) { + endPayTime = date; + endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); + endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); + } else { + endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); + } + + if (StringUtils.isEmpty(memberCode)) { + return getDataTable(new ArrayList<>()); + } + CuMember member = iMemberServiceApi.getMemberByCode(memberCode).getData(); + if (null == member) { + return getDataTable(new ArrayList<>()); + } + + Integer pkCountry = SecurityUtils.getPkCountry(); + + List memberResettleAchieveList = new ArrayList<>(); + + //查询最新期数 + int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + DateUtils.parseDateToStr(startDateStr)).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + DateUtils.parseDateToStr(endDateStr)).getPkId(); + + String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); + String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); + + List staAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, + pkVertex, pkTeamCode, pkCountry, pkAwards, staAchieveTableName, staPeriod); + List endAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, + pkVertex, pkTeamCode, pkCountry, pkAwards, endAchieveTableName, endPeriod); + + if (CollectionUtil.isNotEmpty(staAchieveList) && CollectionUtil.isNotEmpty(endAchieveList)) { + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + BigDecimal inExchangeRate = currency.getInExchangeRate(); + + for (MemberResettleAchieveVo end : endAchieveList) { + for (MemberResettleAchieveVo sta : staAchieveList) { + if (end.getPkMember().equals(sta.getPkMember())) { + end.setLeftNewAddAmount(end.getASumAmount().subtract(sta.getASumAmount())); + end.setRightNewAddAmount(end.getBSumAmount().subtract(sta.getBSumAmount())); + end.setLeftNewAddAchieve(end.getASumPv().subtract(sta.getASumPv())); + end.setRightNewAddAchieve(end.getBSumPv().subtract(sta.getBSumPv())); + end.setLeftNewAddAmount(end.getLeftNewAddAmount().multiply(inExchangeRate)); + end.setRightNewAddAmount(end.getRightNewAddAmount().multiply(inExchangeRate)); + end.setLeftNewAddAchieve(end.getLeftNewAddAchieve().multiply(inExchangeRate)); + end.setRightNewAddAchieve(end.getRightNewAddAchieve().multiply(inExchangeRate)); + } + } + memberResettleAchieveList.add(end); + } + } + return getDataTable(memberResettleAchieveList); + } + + /** + * 导出伞下新增安置业绩列表 + **/ + @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT) + @PostMapping("/member-resettle-achieve_up_export") + public void memberResettleAchieveUpExport(HttpServletResponse response, String memberCode, String memberName, Date startPayTime, Date endPayTime, + Integer pkVertex, Integer pkTeamCode, Integer orderType, Integer pkAwards) { + if (startPayTime == null || endPayTime == null) { + return; + } + + Date date = new Date(); + String startDateStr = ""; + String endDateStr = ""; + if (DateUtils.compareDate(startPayTime, date) > 0) { + startPayTime = date; + startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); + startDateStr = DateUtils.beforeDateStr(2, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); + } else { + startDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startPayTime); + startDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, startDateStr); + } + if (DateUtils.compareDate(endPayTime, date) > 0) { + endPayTime = date; + endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); + endDateStr = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, endDateStr); + } else { + endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, endPayTime); + } + + if (StringUtils.isEmpty(memberCode)) { + return; + } + CuMember member = iMemberServiceApi.getMemberByCode(memberCode).getData(); + if (null == member) { + return; + } + + Integer pkCountry = SecurityUtils.getPkCountry(); + + List memberResettleAchieveList = new ArrayList<>(); + + //查询最新期数 + int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + DateUtils.parseDateToStr(startDateStr)).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( + DateUtils.parseDateToStr(endDateStr)).getPkId(); + + String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); + String endAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(endDateStr); + + List staAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, + pkVertex, pkTeamCode, pkCountry, pkAwards, staAchieveTableName, staPeriod); + List endAchieveList = memberReportService.selectBrollyNewABAchieve(member.getPkId(), memberName, startPayTime, endPayTime, + pkVertex, pkTeamCode, pkCountry, pkAwards, endAchieveTableName, endPeriod); + + if (CollectionUtil.isNotEmpty(staAchieveList) && CollectionUtil.isNotEmpty(endAchieveList)) { + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()).getData(); + BigDecimal inExchangeRate = currency.getInExchangeRate(); + + for (MemberResettleAchieveVo end : endAchieveList) { + for (MemberResettleAchieveVo sta : staAchieveList) { + if (end.getPkMember().equals(sta.getPkMember())) { + end.setLeftNewAddAmount(end.getASumAmount().subtract(sta.getASumAmount())); + end.setRightNewAddAmount(end.getBSumAmount().subtract(sta.getBSumAmount())); + end.setLeftNewAddAchieve(end.getASumPv().subtract(sta.getASumPv())); + end.setRightNewAddAchieve(end.getBSumPv().subtract(sta.getBSumPv())); + end.setLeftNewAddAmount(end.getLeftNewAddAmount().multiply(inExchangeRate)); + end.setRightNewAddAmount(end.getRightNewAddAmount().multiply(inExchangeRate)); + end.setLeftNewAddAchieve(end.getLeftNewAddAchieve().multiply(inExchangeRate)); + end.setRightNewAddAchieve(end.getRightNewAddAchieve().multiply(inExchangeRate)); + } + } + memberResettleAchieveList.add(end); + } + } + ExcelUtil util = new ExcelUtil<>(MemberResettleAchieveVo.class); + util.exportExcel(response, memberResettleAchieveList, "伞下新增安置业绩导出"); + } + /** * 订单币种查询 * diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java index 6d443a7d..9f014656 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberReportMapper.java @@ -14,7 +14,14 @@ public interface MemberReportMapper { * * @return */ - List directPushNewList(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("pkAwards") Integer pkAwards, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex); + List directPushNewList(@Param("pkMember") Long pkMember, + @Param("memberName") String memberName, + @Param("pkAwards") Integer pkAwards, + @Param("pkTeamCode") Integer pkTeamCode, + @Param("pkCountry") Integer pkCountry, + @Param("startPayTime") Date startPayTime, + @Param("endPayTime") Date endPayTime, + @Param("pkVertex") Integer pkVertex); /** * 查询伞下直推新增业绩-业绩 @@ -49,7 +56,15 @@ public interface MemberReportMapper { * * @return */ - List memberResettleAchieve(@Param("pkMember") Long pkMember, @Param("memberName") String memberName, @Param("startPayTime") Date startPayTime, @Param("endPayTime") Date endPayTime, @Param("pkVertex") Integer pkVertex, @Param("pkTeamCode") Integer pkTeamCode, @Param("pkCountry") Integer pkCountry, @Param("pkAwards") Integer pkAwards, @Param("orderTypeList") List orderTypeList); + List memberResettleAchieve(@Param("pkMember") Long pkMember, + @Param("memberName") String memberName, + @Param("startPayTime") Date startPayTime, + @Param("endPayTime") Date endPayTime, + @Param("pkVertex") Integer pkVertex, + @Param("pkTeamCode") Integer pkTeamCode, + @Param("pkCountry") Integer pkCountry, + @Param("pkAwards") Integer pkAwards, + @Param("orderTypeList") List orderTypeList); /** * 伞下新增安置业绩 diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java index 0c3c1919..f6375aa6 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/MemberReportService.java @@ -42,7 +42,8 @@ public interface MemberReportService { * * @return */ - List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList); + List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, + Integer pkCountry, Integer pkAwards, List orderTypeList); /** * 查询伞下新增安置业绩 diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java index fabfb653..7140e303 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java @@ -48,7 +48,7 @@ public class MemberReportServiceImpl implements MemberReportService { @DubboReference IAccountServiceApi iAccountServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; @Override public List directPushNewList(Long pkMember, String memberName, Integer pkAwards, Integer pkTeamCode, Integer pkCountry, Date startPayTime, Date endPayTime, Integer pkVertex) { @@ -71,7 +71,8 @@ public class MemberReportServiceImpl implements MemberReportService { } @Override - public List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList) { + public List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, + Integer pkCountry, Integer pkAwards, List orderTypeList) { return memberReportMapper.memberResettleAchieve(pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); } @@ -237,7 +238,7 @@ public class MemberReportServiceImpl implements MemberReportService { Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); //根据国家查询汇率 - CurrencyDTO currency = currencyServiceApi.getCurrency(pkCountry).getData(); + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(pkCountry).getData(); //汇率 BigDecimal exchangeRate = currency.getInExchangeRate(); for (CuMemberWalletVO cuMemberWalletVO : cuMemberWalletVOList) { diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java index dab36ef1..f84e1421 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/DirectPushNewVo.java @@ -18,6 +18,7 @@ import java.util.Date; @Builder @Data public class DirectPushNewVo { + /** * 国旗 */ @@ -70,14 +71,14 @@ public class DirectPushNewVo { /** * 订单实际金额 */ - @Excel(name = "新增金额(￥)") + @Excel(name = "新增金额(￥)", scale = 2) @BigDecimalFormat() - private BigDecimal orderAmount=BigDecimal.ZERO; + private BigDecimal orderAmount = BigDecimal.ZERO; /** * 订单实际业绩 */ - @Excel(name = "新增业绩(PV)") + @Excel(name = "新增业绩(PV)", scale = 2) @BigDecimalFormat() private BigDecimal orderAchieve; @@ -97,7 +98,6 @@ public class DirectPushNewVo { */ private BigDecimal LcMemberCode; - /** * 联创姓名 */ @@ -194,5 +194,4 @@ public class DirectPushNewVo { private String settleTableNameEnd; - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberResettleAchieveVo.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberResettleAchieveVo.java index e91bbf5e..3288b73d 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberResettleAchieveVo.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/MemberResettleAchieveVo.java @@ -79,34 +79,33 @@ public class MemberResettleAchieveVo { * 左区新增金额 */ @BigDecimalFormat - @Excel(name = "左区新增金额") + @Excel(name = "左区新增金额", scale = 2) private BigDecimal leftNewAddAmount = BigDecimal.ONE; /** * 右区新增金额 */ @BigDecimalFormat - @Excel(name = "右区新增金额") + @Excel(name = "右区新增金额", scale = 2) private BigDecimal rightNewAddAmount = BigDecimal.ONE; /** * 左区新增业绩（pv） */ @BigDecimalFormat - @Excel(name = "左区新增业绩") + @Excel(name = "左区新增业绩", scale = 2) private BigDecimal leftNewAddAchieve = BigDecimal.ONE; /** * 右区新增业绩（pv） */ @BigDecimalFormat - @Excel(name = "右区新增业绩") + @Excel(name = "右区新增业绩", scale = 2) private BigDecimal rightNewAddAchieve = BigDecimal.ONE; /** * 订单日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - // @Excel(name = "订单日期",dateFormat = "yyyy-MM-dd HH:mm:ss") private Date orderTime; /** * 首购累计 @@ -115,19 +114,5 @@ public class MemberResettleAchieveVo { private BigDecimal bSumAmount; private BigDecimal aSumPv; private BigDecimal bSumPv; - /** - * 复购 - */ -// private BigDecimal repASumAmount; -// private BigDecimal repBSumAmount; -// private BigDecimal repASumPv; -// private BigDecimal repBSumPv; - /** - * 真实（首购+复购） - */ -// private BigDecimal aSumRealAmount; -// private BigDecimal bSumRealAmount; -// private BigDecimal aSumRealPv; -// private BigDecimal bSumRealPv; } diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml index 8314b9a8..be0f407c 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberReportMapper.xml @@ -19,25 +19,25 @@ left join bd_awards ba on ba.pk_id = cm.PK_AWARDS left join bd_vertex bv on bv.PK_ID = cm.PK_VERTEX left join cu_member_team cmt on cm.pk_team_code = cmt.pk_id - where cm.del_flag = 0 and cm.pk_id=#{pkMember} + where cm.del_flag = 0 and cm.pk_id = #{pkMember} - and cm.MEMBER_NAME=#{memberName} + and cm.MEMBER_NAME = #{memberName} - and cm.PK_AWARDS=#{pkAwards} + and cm.PK_AWARDS = #{pkAwards} - and cm.PK_VERTEX=#{pkVertex} + and cm.PK_VERTEX = #{pkVertex} - and cm.PK_TEAM_CODE=#{pkTeamCode} + and cm.PK_TEAM_CODE = #{pkTeamCode} - and cm.PK_SETTLE_COUNTRY=#{pkCountry} + and cm.PK_SETTLE_COUNTRY = #{pkCountry} - + - select cm.PAY_TIME orderTime, cm.pk_id pkMember, bc.NATIONAL_FLAG1 nationalFlag, @@ -304,10 +285,10 @@ ba.AWARDS_NAME awardsName, mt.TEAM_NAME teamCodeName, bv.VERTEX_NAME vertexName, - nvl(cmpv.aSumAmount,0) aSumAmount, - nvl(cmpv.bSumAmount,0) bSumAmount, - nvl(cmpv.aSumPv,0) aSumPv, - nvl(cmpv.bSumPv,0) bSumPv + nvl(cmpv.aSumAmount, 0) aSumAmount, + nvl(cmpv.bSumAmount, 0) bSumAmount, + nvl(cmpv.aSumPv, 0) aSumPv, + nvl(cmpv.bSumPv, 0) bSumPv from cu_member cm left join BD_COUNTRY bc on bc.PK_ID = cm.PK_SETTLE_COUNTRY left join bd_awards ba on ba.pk_id = cm.PK_AWARDS @@ -320,17 +301,17 @@ sum(b_sum_amount) bSumAmount, sum(a_sum_pv) aSumPv, sum(b_sum_pv) bSumPv - from ${achieveTableName} where PERIOD=#{period} and PK_COUNTRY=#{pkCountry} and PK_MEMBER =#{pkMember} - )cmpv on cm.pk_id=cmpv.pkMember + from ${achieveTableName} where PERIOD = #{period} and PK_COUNTRY = #{pkCountry} and PK_MEMBER = #{pkMember} + ) cmpv on cm.pk_id = cmpv.pkMember where cm.del_flag = 0 - and PK_AWARDS=#{pkAwards} + and PK_AWARDS = #{pkAwards} - and PK_VERTEX=#{pkVertex} + and PK_VERTEX = #{pkVertex} - and PK_TEAM_CODE=#{pkTeamCode} + and PK_TEAM_CODE = #{pkTeamCode}