angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 伞下直推业绩统计报错（178）；

This commit is contained in:
cabbage 2025-06-13 16:57:46 +08:00
parent 7403bb2b86
commit d2474562db
4 changed files with 122 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

308
bd-business/bd-business-report/src/main/java/com/hzs/report/member/controller/manage/MemberReportController.java
View File

@ -8,12 +8,14 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.poi.ExcelUtil;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.ext.CuMemberExt;
@ -41,14 +43,6 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.report.member.controller
* @Author: yh
* @CreateTime: 2023-08-26 09:40
* @Description:
* @Version: 1.0
*/
@RequestMapping("/manager/member-report")
@RestController
public class MemberReportController extends BaseController {
@ -58,23 +52,19 @@ public class MemberReportController extends BaseController {
@Autowired
private ITransactionCommonService iTransactionCommonService;
@Autowired
private IMemberService memberService;
private IMemberService iMemberService;
@Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@DubboReference
IMemberServiceApi memberServiceApi;
IMemberServiceApi iMemberServiceApi;
@DubboReference
IAreaServiceApi areaServiceApi;
IAreaServiceApi iAreaServiceApi;
@DubboReference
ICurrencyServiceApi currencyServiceApi;
ICurrencyServiceApi iCurrencyServiceApi;
/**
* @description: 伞下直推新增业绩
* @author: zhang jing
* @date: 2023/10/10 9:53
* @param: [memberCode, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex, orderType]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 伞下直推新增业绩
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT)
@GetMapping("/direct-push-new")
@ -105,8 +95,14 @@ public class MemberReportController extends BaseController {
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
dpo.setZonpayTime(zonpayTime);
dpo.setEndPayTime(endPayTime);
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr);
if (null == startPeriod) {
throw new ServiceException("查询开始时间不存在数据");
}
int periodSta = startPeriod.getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta);
@ -124,7 +120,7 @@ public class MemberReportController extends BaseController {
if (CollectionUtil.isEmpty(memberList)) {
return getDataTable(new ArrayList<>());
}
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
//伞下直推新增业绩
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieUpList(dpo, Collections.singletonList(memberList.get(0).getPkMember()));
//查询大小区业绩
@ -150,11 +146,7 @@ public class MemberReportController extends BaseController {
/**
* @description: 导入批量查询会员信息
* @author: zhang jing
* @date: 2025/2/11 10:01
* @param: [file]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 导入批量查询会员信息
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.IMPORT)
@PostMapping("/batch-importData")
@ -184,11 +176,7 @@ public class MemberReportController extends BaseController {
/**
* @description: 导出伞下直推新增业绩
* @author: zhang jing
* @date: 2023/10/10 9:53
* @param: [memberCode, memberName, pkAwards, pkTeamCode, pkCountry, startPayTime, endPayTime, pkVertex, response, orderType]
* @return: void
* 导出伞下直推新增业绩
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT)
@PostMapping("/export-direct-push-new")
@ -223,15 +211,15 @@ public class MemberReportController extends BaseController {
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
dpo.setZonpayTime(zonpayTime);
//查询最新期数
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodSta);
dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
//伞下直推新增业绩
List<DirectPushNewVo> memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime);
List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieUpList(dpo, pkMemberList);
if (CollectionUtil.isNotEmpty(memberList)) {
@ -260,11 +248,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 伞下直推新增业金额绩大小区金额业绩详情
* @author: zhang jing
* @date: 2025/2/17 16:05
* @param: [dpo]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 伞下直推新增业金额绩大小区金额业绩详情
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW_DETAILS, method = EOperationMethod.SELECT)
@GetMapping("/directPush-up-details")
@ -275,9 +259,9 @@ public class MemberReportController extends BaseController {
if (StringUtils.isNull(dpo.getMemberCode())) {
return getDataTable(new ArrayList<>());
}
R<CuMember> memberDto = memberServiceApi.getMember(dpo.getMemberCode());
R<CuMember> memberDto = iMemberServiceApi.getMember(dpo.getMemberCode());
CuMember member = memberDto.getData();
if(member==null){
if (member == null) {
return getDataTable(new ArrayList<>());
}
dpo.setPkMember(member.getPkId());
@ -297,8 +281,8 @@ public class MemberReportController extends BaseController {
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
}
dpo.setEndPayTime(dpo.getEndPayTime());
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@ -314,18 +298,18 @@ public class MemberReportController extends BaseController {
return getDataTable(new ArrayList<>());
}
List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
//伞下直推新增业绩
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, pkMemberList);
if (CollectionUtil.isNotEmpty(memberList)) {
memberList.forEach(itm -> {
if (CollectionUtil.isNotEmpty(achieList)) {
achieList.forEach(itmm->{
if(itm.getPkMember().equals(itmm.getPkMember())){
achieList.forEach(itmm -> {
if (itm.getPkMember().equals(itmm.getPkMember())) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
//中国业绩转为人民币
itm.setOrderAchieve(itmm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
}else{
} else {
itm.setOrderAchieve(itmm.getOrderAchieve());
}
itm.setOrderAmount(itmm.getOrderAmount());
@ -334,36 +318,32 @@ public class MemberReportController extends BaseController {
}
});
}
List<DirectPushNewDetailsVo> dpdVoList=new ArrayList<>();
List<DirectPushNewDetailsVo> dpdVoList = new ArrayList<>();
memberList.forEach(itm -> dpdVoList.add(BeanUtil.copyProperties(itm, DirectPushNewDetailsVo.class)));
return getDataTable(dpdVoList);
}
/**
* @description: 导出伞下直推新增业金额绩大小区金额业绩详情
* @author: zhang jing
* @date: 2025/2/17 16:46
* @param: [response, dpo]
* @return: void
* 导出伞下直推新增业金额绩大小区金额业绩详情
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW_DETAILS, method = EOperationMethod.EXPORT)
@PostMapping("/export-directPush-up-details")
public void exportDirectPushUpDetails(HttpServletResponse response,DirectPushNewVo dpo) {
public void exportDirectPushUpDetails(HttpServletResponse response, DirectPushNewVo dpo) {
if (StringUtils.isNull(dpo.getStartPayTime()) || StringUtils.isNull(dpo.getEndPayTime())) {
return ;
return;
}
if (StringUtils.isNull(dpo.getMemberCode())) {
return ;
return;
}
Integer pkCountry = SecurityUtils.getPkCountry();
Date date = DateUtils.currentDate();
if (DateUtils.compareDate(dpo.getStartPayTime(), date) > 0 || DateUtils.compareDate(dpo.getEndPayTime(), date) > 0) {
return ;
return;
}
R<CuMember> memberDto = memberServiceApi.getMember(dpo.getMemberCode());
R<CuMember> memberDto = iMemberServiceApi.getMember(dpo.getMemberCode());
CuMember member = memberDto.getData();
if(member==null){
return ;
if (member == null) {
return;
}
dpo.setPkMember(member.getPkId());
String date1 = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
@ -376,8 +356,8 @@ public class MemberReportController extends BaseController {
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
}
dpo.setEndPayTime(dpo.getEndPayTime());
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@ -385,25 +365,25 @@ public class MemberReportController extends BaseController {
if (memberReportService.selectExistTable(dpo.getAchieveTableNameSta()) == 0 ||
memberReportService.selectExistTable(dpo.getAchieveTableNameEnd()) == 0
) {
return ;
return;
}
//查询会员
List<DirectPushNewVo> memberList = memberReportService.querDirectPushDetails(dpo);
if (CollectionUtil.isEmpty(memberList)) {
return ;
return;
}
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
//伞下直推新增业绩
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, Arrays.asList(memberList.get(0).getPkMember()));
if (CollectionUtil.isNotEmpty(memberList)) {
memberList.forEach(itm -> {
if (CollectionUtil.isNotEmpty(achieList)) {
achieList.forEach(itmm->{
if(itm.getPkMember().equals(itmm.getPkMember())){
achieList.forEach(itmm -> {
if (itm.getPkMember().equals(itmm.getPkMember())) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
//中国业绩转为人民币
itm.setOrderAchieve(itmm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
}else{
} else {
itm.setOrderAchieve(itmm.getOrderAchieve());
}
itm.setOrderAmount(itmm.getOrderAmount());
@ -412,18 +392,14 @@ public class MemberReportController extends BaseController {
}
});
}
List<DirectPushNewDetailsVo> dpdVoList=new ArrayList<>();
List<DirectPushNewDetailsVo> dpdVoList = new ArrayList<>();
memberList.forEach(itm -> dpdVoList.add(BeanUtil.copyProperties(itm, DirectPushNewDetailsVo.class)));
ExcelUtil<DirectPushNewDetailsVo> util = new ExcelUtil<>(DirectPushNewDetailsVo.class);
util.exportExcel(response, dpdVoList, "伞下直推新增业绩详情导出");
}
/**
* @description: 伞下直推新增业金额绩大小区金额业绩(新)
* @author: zhang jing
* @date: 2025/2/21 9:52
* @param: [memberCode, pkCountry, startPayTime, endPayTime]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 伞下直推新增业金额绩大小区金额业绩(新)
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.SELECT)
@GetMapping("/direct-push-new-up")
@ -449,14 +425,19 @@ public class MemberReportController extends BaseController {
if (date1.equals(date2) || (DateUtils.compareDate(endPayTime, date) >= 0)) {
dpo.setPayTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date));
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
}
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
dpo.setZonpayTime(zonpayTime);
dpo.setEndPayTime(endPayTime);
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
CuMemberSettlePeriod startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr);
if (null == startPeriod) {
throw new ServiceException("查询开始时间不存在数据");
}
int periodSta = startPeriod.getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@ -474,31 +455,31 @@ public class MemberReportController extends BaseController {
if (CollectionUtil.isEmpty(memberList)) {
return getDataTable(new ArrayList<>());
}
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
//伞下直推新增业绩
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, Collections.singletonList(memberList.get(0).getPkMember()));
//查询大小区业绩
DirectPushNewVo sizeZoneAchie = memberReportService.sizeZoneAchieAmount(dpo, memberList.get(0).getPkMember(), currency.getData().getInExchangeRate());
if (CollectionUtil.isNotEmpty(memberList)) {
memberList.forEach(itm -> {
if (null != achieList.get(0)) {
itm.setOrderAchieve(achieList.get(0).getOrderAchieve());
itm.setOrderAmount(achieList.get(0).getOrderAmount());
itm.setRegAmount(achieList.get(0).getRegAmount());
itm.setRegAchieve(achieList.get(0).getRegAchieve());
itm.setUpgAmount(achieList.get(0).getUpgAmount());
itm.setUpgAchieve(achieList.get(0).getUpgAchieve());
itm.setRepAmount(achieList.get(0).getRepAmount());
itm.setRepAchieve(achieList.get(0).getRepAchieve());
itm.setConAmount(achieList.get(0).getConAmount());
itm.setConAchieve(achieList.get(0).getConAchieve());
if (sizeZoneAchie != null) {
itm.setSmallAreaPv(sizeZoneAchie.getSmallAreaPv());
itm.setBigArealPv(sizeZoneAchie.getBigArealPv());
itm.setSmallAreaAm(sizeZoneAchie.getSmallAreaAm());
itm.setBigArealAm(sizeZoneAchie.getBigArealAm());
}
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
if (CollectionUtil.isNotEmpty(achieList)) {
if (null != achieList.get(0)) {
itm.setOrderAchieve(achieList.get(0).getOrderAchieve());
itm.setOrderAmount(achieList.get(0).getOrderAmount());
itm.setRegAmount(achieList.get(0).getRegAmount());
itm.setRegAchieve(achieList.get(0).getRegAchieve());
itm.setUpgAmount(achieList.get(0).getUpgAmount());
itm.setUpgAchieve(achieList.get(0).getUpgAchieve());
itm.setRepAmount(achieList.get(0).getRepAmount());
itm.setRepAchieve(achieList.get(0).getRepAchieve());
itm.setConAmount(achieList.get(0).getConAmount());
itm.setConAchieve(achieList.get(0).getConAchieve());
if (sizeZoneAchie != null) {
itm.setSmallAreaPv(sizeZoneAchie.getSmallAreaPv());
itm.setBigArealPv(sizeZoneAchie.getBigArealPv());
itm.setSmallAreaAm(sizeZoneAchie.getSmallAreaAm());
itm.setBigArealAm(sizeZoneAchie.getBigArealAm());
}
//中国业绩转为人民币
itm.setOrderAchieve(itm.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
itm.setRegAchieve(itm.getRegAchieve().multiply(currency.getData().getInExchangeRate()));
@ -512,13 +493,8 @@ public class MemberReportController extends BaseController {
return getDataTable(memberList);
}
/**
* @description: 导出伞下直推新增业金额绩大小区金额业绩(新)
* @author: zhang jing
* @date: 2024/3/19 10:57
* @param: [directPushNewVo, response]
* @return: void
* 导出伞下直推新增业金额绩大小区金额业绩(新)
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_NEW, method = EOperationMethod.EXPORT)
@PostMapping("/export-direct-push-new-up")
@ -549,21 +525,21 @@ public class MemberReportController extends BaseController {
if (date1.equals(date2) || (DateUtils.compareDate(endPayTime, date) >= 0)) {
dpo.setPayTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date));
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
}
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
dpo.setZonpayTime(zonpayTime);
//查询最新期数
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodEnd);
//伞下直推新增业绩
List<DirectPushNewVo> memberList = memberReportService.directPushNewList(dpo.getMemberCodeList(), pkCountry, startPayTime, endPayTime);
List<Long> pkMemberList = memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList());
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<DirectPushNewVo> achieList = memberReportService.directPushNewAchieList(dpo, pkMemberList);
if (CollectionUtil.isNotEmpty(memberList)) {
@ -606,11 +582,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 伞下直推新增盒数大小区盒数
* @author: zhang jing
* @date: 2025/2/14 9:53
* @param: [memberCode, pkCountry, startPayTime, endPayTime]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 伞下直推新增盒数大小区盒数
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_BOX, method = EOperationMethod.SELECT)
@GetMapping("/direct-push-box")
@ -643,15 +615,15 @@ public class MemberReportController extends BaseController {
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, endPayTime);
dpo.setZonpayTime(zonpayTime);
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
}
dpo.setEndPayTime(endPayTime);
dpo.setStartPayTime(startPayTime);
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
dpo.setPkCountry(pkCountry);
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
@ -659,7 +631,7 @@ public class MemberReportController extends BaseController {
dpo.setMemberRetailTable(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
if (StringUtils.isNotEmpty(dpo.getPayTime())) {
//查询会员是否激活
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period);
}
@ -701,11 +673,7 @@ public class MemberReportController extends BaseController {
/**
* @description: 导出伞下直推新增盒数大小区盒数
* @author: zhang jing
* @date: 2025/2/17 9:58
* @param: [response, dpo]
* @return: void
* 导出伞下直推新增盒数大小区盒数
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.DIRECT_PUSH_BOX, method = EOperationMethod.EXPORT)
@PostMapping("export-direct-push-box")
@ -742,19 +710,19 @@ public class MemberReportController extends BaseController {
endDateStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(1, ChronoUnit.DAYS, date));
Date zonpayTime = DateUtils.afterDate(1, ChronoUnit.DAYS, dpo.getEndPayTime());
dpo.setZonpayTime(zonpayTime);
String dateNow=DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
String dateNow = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
dpo.setAchieveTableNameNow(TableNameConstants.CU_MEMBER_RETAIL_S + iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dateNow).getPkId());
}
int periodSta = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
int periodSta = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDateStr).getPkId();
int periodEnd = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDateStr).getPkId();
//查询最新期数
dpo.setAchieveTableNameSta(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodSta);
dpo.setAchieveTableNameEnd(TableNameConstants.CU_MEMBER_AMOUNT_BOX + periodEnd);
dpo.setMemberRetailTable(TableNameConstants.CU_MEMBER_RETAIL_RANGE + periodEnd);
if (StringUtils.isNotEmpty(dpo.getPayTime())) {
//查询会员是否激活
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(dpo.getPayTime()).getPkId();
dpo.setMemberRetailSTable(TableNameConstants.CU_MEMBER_RETAIL_S + period);
}
@ -771,7 +739,7 @@ public class MemberReportController extends BaseController {
List<Long> pkMemberList = new ArrayList<>();
pkMemberList.addAll(memberList.stream().map(DirectPushNewVo::getPkMember).collect(Collectors.toList()));
//查询会员是否激活
List<DirectPushBoxVo> enableStatusList = memberReportService.selectMemberActiveState(dpo,pkMemberList);
List<DirectPushBoxVo> enableStatusList = memberReportService.selectMemberActiveState(dpo, pkMemberList);
List<DirectPushBoxVo> boxVoList = new ArrayList<>();
memberList.forEach(item -> boxVoList.add(BeanUtil.copyProperties(item, DirectPushBoxVo.class)));
//伞下直推新增盒数
@ -831,7 +799,7 @@ public class MemberReportController extends BaseController {
if (endPayTime != null) {
endPayTime = DateUtils.getEndTime(endPayTime);
}
R<CuMember> memberDto = memberServiceApi.getMember(memberCode);
R<CuMember> memberDto = iMemberServiceApi.getMember(memberCode);
CuMember member = memberDto.getData();
Integer pkCountry = null;
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@ -841,7 +809,7 @@ public class MemberReportController extends BaseController {
if (member == null) {
return getDataTable(new ArrayList<>());
}
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
CurrencyDTO currency = currencyDto.getData();
List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(orderType);
@ -889,11 +857,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 伞下新增安置业绩列表（历史）
* @author: zhang jing
* @date: 2024/3/12 15:15
* @param: [memberCode, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, orderType, pkAwards]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 伞下新增安置业绩列表（历史）
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.SELECT)
@GetMapping("/member-resettle-achieve_up")
@ -925,22 +889,22 @@ public class MemberReportController extends BaseController {
if (StringUtils.isEmpty(memberCode)) {
return getDataTable(new ArrayList<>());
}
R<CuMemberExt> memberDto = memberServiceApi.getMemberByCode(memberCode);
R<CuMemberExt> memberDto = iMemberServiceApi.getMemberByCode(memberCode);
CuMember member = memberDto.getData();
if (member == null) {
return getDataTable(new ArrayList<>());
}
Integer pkCountry = SecurityUtils.getPkCountry();
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
CurrencyDTO currency = currencyDto.getData();
List<MemberResettleAchieveVo> memberResettleAchieveList = new ArrayList<>();
BigDecimal inExchangeRate = currency.getInExchangeRate();
//查询最新期数
int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(startDateStr)).getPkId();
int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
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);
@ -972,11 +936,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 导出伞下新增安置业绩列表
* @author: zhang jing
* @date: 2024/3/15 14:19
* @param: [response, memberCode, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, orderType, pkAwards]
* @return: void
* 导出伞下新增安置业绩列表
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.MEMBER_RESETTLE_ACHIEVE, method = EOperationMethod.EXPORT)
@PostMapping("/member-resettle-achieve_up_export")
@ -1008,7 +968,7 @@ public class MemberReportController extends BaseController {
if (StringUtils.isEmpty(memberCode)) {
return;
}
R<CuMemberExt> memberDto = memberServiceApi.getMemberByCode(memberCode);
R<CuMemberExt> memberDto = iMemberServiceApi.getMemberByCode(memberCode);
CuMember member = memberDto.getData();
Integer pkCountry = null;
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
@ -1018,14 +978,14 @@ public class MemberReportController extends BaseController {
if (member == null) {
return;
}
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
CurrencyDTO currency = currencyDto.getData();
List<MemberResettleAchieveVo> memberResettleAchieveList = new ArrayList<>();
BigDecimal inExchangeRate = currency.getInExchangeRate();
//查询最新期数
int staPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int staPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(startDateStr)).getPkId();
int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(endDateStr)).getPkId();
String staAchieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr);
@ -1069,7 +1029,7 @@ public class MemberReportController extends BaseController {
if (memberResettleAchieveParam.getEndPayTime() != null) {
memberResettleAchieveParam.setEndPayTime(DateUtils.getEndTime(memberResettleAchieveParam.getEndPayTime()));
}
R<CuMember> memberDto = memberServiceApi.getMember(memberResettleAchieveParam.getMemberCode());
R<CuMember> memberDto = iMemberServiceApi.getMember(memberResettleAchieveParam.getMemberCode());
CuMember member = memberDto.getData();
if (member == null) {
ExcelUtil<MemberResettleAchieveVo> util = new ExcelUtil<>(MemberResettleAchieveVo.class);
@ -1086,7 +1046,7 @@ public class MemberReportController extends BaseController {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
pkCountry = SecurityUtils.getPkCountry();
}
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
CurrencyDTO currency = currencyDto.getData();
List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(memberResettleAchieveParam.getOrderType());
@ -1135,9 +1095,6 @@ public class MemberReportController extends BaseController {
/**
* 订单币种查询
*
* @param
* @return
*/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.ORDER_CURRENCY_LIST, method = EOperationMethod.SELECT)
@GetMapping("/order-currency-list")
@ -1203,9 +1160,6 @@ public class MemberReportController extends BaseController {
/**
* 订单分布统计
*
* @param
* @return
*/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.GET_ORDER_DISTRIBUTION, method = EOperationMethod.SELECT)
@GetMapping("/get-order-distribution")
@ -1233,9 +1187,6 @@ public class MemberReportController extends BaseController {
/**
* 出货明细汇总统计
*
* @param
* @return
*/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PRODUCT_SHIPPING_DETAILS_LIST, method = EOperationMethod.SELECT)
@GetMapping("/product-shipping-details-list")
@ -1360,7 +1311,7 @@ public class MemberReportController extends BaseController {
// 补全23:59:59
reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime()));
}
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
startPage();
reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry());
List<ReportSummaryVo> reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo);
@ -1390,7 +1341,7 @@ public class MemberReportController extends BaseController {
// 补全23:59:59
reportSummaryVo.setEndCreateTime(DateUtils.getEndTime(reportSummaryVo.getEndCreateTime()));
}
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
reportSummaryVo.setPkCountry(SecurityUtils.getPkCountry());
List<ReportSummaryVo> reportSummaryList = memberReportService.reportSummaryList(reportSummaryVo);
for (ReportSummaryVo summaryVo : reportSummaryList) {
@ -1409,10 +1360,7 @@ public class MemberReportController extends BaseController {
}
/*
* @description: 推荐反查
* @author: sui q
* @date: 2023/8/28 10:07
* @param: null null
* 推荐反查
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.SELECT)
@PostMapping("/parent-peg")
@ -1420,7 +1368,7 @@ public class MemberReportController extends BaseController {
List<CuMemberPushAchieveVO> cuMemberPushAchieveVOList = new ArrayList<>();
if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
startPage();
List<CuMemberAchieveExt> cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) {
CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class);
cuMemberPushAchieveVOList.add(vo);
@ -1433,11 +1381,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 导出推荐反查
* @author: zhang jing zj
* @date: 2023/9/12 10:04
* @param: [response, cuMemberUmbrellaParam]
* @return: void
* 导出推荐反查
**/
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.EXPORT)
@PostMapping("/export-parent-peg")
@ -1445,7 +1389,7 @@ public class MemberReportController extends BaseController {
List<CuMemberPushAchieveVO> cuMemberPushAchieveVOList = new ArrayList<>();
if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) {
List<CuMemberAchieveExt> cuMemberAchieveExtList = memberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
List<CuMemberAchieveExt> cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam);
if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ECategory.values());
@ -1471,7 +1415,7 @@ public class MemberReportController extends BaseController {
@GetMapping("/product-detail-query-list")
public TableDataInfo productDetailQuery(ProductDetailQueryParam productDetailQueryParam) {
// if (StringUtils.isNotBlank(productDetailQueryParam.getMemberCode())) {
// R<CuMember> memberDto = memberServiceApi.getMember(productDetailQueryParam.getMemberCode());
// R<CuMember> memberDto = iMemberServiceApi.getMember(productDetailQueryParam.getMemberCode());
// CuMember member = memberDto.getData();
// if (member != null) {
// productDetailQueryParam.setMemberCode(null);
@ -1486,7 +1430,7 @@ public class MemberReportController extends BaseController {
productDetailQueryParam.setEndPayTime(DateUtils.getEndTime(productDetailQueryParam.getEndPayTime()));
}
R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
Map<Integer, String> map = areaMap.getData();
startPage();
List<Integer> orderTypeList = EOrderBusiness.getOrderTypeList(productDetailQueryParam.getOrderType());
@ -1537,7 +1481,7 @@ public class MemberReportController extends BaseController {
@Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PRODUCT_DETAIL_QUERY_LIST, method = EOperationMethod.EXPORT)
@PostMapping("/product-detail-query-list-export")
public void productDetailQueryExport(ProductDetailQueryParam productDetailQueryParam, HttpServletResponse response) {
R<Map<Integer, String>> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
R<Map<Integer, String>> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry());
Map<Integer, String> map = areaMap.getData();
if (productDetailQueryParam.getStartPayTime() != null) {
productDetailQueryParam.setStartPayTime(DateUtils.getStartTime(productDetailQueryParam.getStartPayTime()));
@ -1603,11 +1547,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 手动统计会员直推金额业绩盒数数据
* @author: zhang jing
* @date: 2025/2/12 16:15
* @param: [staDate, endDate]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 手动统计会员直推金额业绩盒数数据
**/
@GetMapping("/staAmountBox")
public AjaxResult staAmountBox(String staDate, String endDate) {
@ -1616,11 +1556,7 @@ public class MemberReportController extends BaseController {
}
/**
* @description: 初始化数据会员直推金额业绩盒数数据
* @author: zhang jing
* @date: 2025/2/12 17:32
* @param: [staDate, endDate]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 初始化数据会员直推金额业绩盒数数据
**/
@GetMapping("/initial")
public AjaxResult initial(String staDate, String endDate) {

3
bd-business/bd-business-report/src/main/java/com/hzs/report/report/mapper/CuMemberSettlePeriodMapper.java
View File

@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
/**
* 会员结算期间 Mapper 接口
*
* @author hzs
* @since 2022-10-26
*/
public interface CuMemberSettlePeriodMapper extends BaseMapper<CuMemberSettlePeriod> {

6
bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/ICuMemberSettlePeriodService.java
View File

@ -5,9 +5,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
/**
* 会员结算期间 服务类
*
* @author hzs
* @since 2022-10-26
*/
public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePeriod> {
@ -15,9 +12,6 @@ public interface ICuMemberSettlePeriodService extends IService<CuMemberSettlePer
* 根据日期获得日期对应的期间
*
* @param date 日期 2023-02-02
* @return: CuMemberSettlePeriod
* @Author: sui q
* @Date: 2022/11/2 13:32
*/
CuMemberSettlePeriod getCuMemberSettlePeriodByDate(String date);

3
bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberSettlePeriodServiceImpl.java
View File

@ -14,9 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
/**
* 会员结算期间 服务实现类
*
* @author hzs
* @since 2022-10-26
*/
@Service
public class CuMemberSettlePeriodServiceImpl extends ServiceImpl<CuMemberSettlePeriodMapper, CuMemberSettlePeriod> implements ICuMemberSettlePeriodService {