From 3c679ce8a8286c1aeb61c81ac4076df633d3a185 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 17 Jun 2025 17:28:17 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8E=A8=E8=8D=90=E6=AD=A3=E5=8F=8D?= =?UTF-8?q?=E6=9F=A5=E8=B0=83=E6=95=B4=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/MemberReportController.java | 27 +- .../report/member/mapper/MemberMapper.java | 38 +- .../member/param/CuMemberUmbrellaParam.java | 5 - .../report/member/service/IMemberService.java | 41 +-- .../member/service/MemberReportService.java | 85 +---- .../service/impl/MemberReportServiceImpl.java | 333 +++--------------- .../service/impl/MemberServiceImpl.java | 42 +-- .../member/vo/CuMemberPushAchieveVO.java | 2 +- .../mapper/report/member/MemberMapper.xml | 38 +- .../controller/manage/BdShopController.java | 200 ++++------- .../manage/BdStoreLevelController.java | 42 +-- .../hzs/system/config/vo/BdStoreLevelVO.java | 3 - .../core/constant/EnumsPrefixConstants.java | 24 -- .../com/hzs/common/core/enums/ECategory.java | 13 + .../java/com/hzs/common/core/enums/EShop.java | 6 +- .../common/core/enums/ETransactionKey.java | 11 - .../achieve/ext/CuMemberAchieveExt.java | 9 +- .../domain/system/config/BdStoreLevel.java | 3 - 18 files changed, 194 insertions(+), 728 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 3ccb2f69..4ef2b016 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 @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.CountryConstants; -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.*; @@ -20,7 +19,6 @@ 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; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.member.base.IMemberServiceApi; import com.hzs.report.member.param.*; import com.hzs.report.member.service.IMemberService; @@ -50,8 +48,6 @@ public class MemberReportController extends BaseController { @Autowired private MemberReportService memberReportService; @Autowired - private ITransactionCommonService iTransactionCommonService; - @Autowired private IMemberService iMemberService; @Autowired private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @@ -1348,7 +1344,6 @@ public class MemberReportController extends BaseController { if (summaryVo.getRegisterAuthority() != null) { summaryVo.setRegisterName(ERegistrationAuthority.getEnumByValue(summaryVo.getRegisterAuthority()).getLabel()); } - // summaryVo.setConsumeAchieve(summaryVo.getConsumeAchieve().multiply(currency.getData().getInExchangeRate())); if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { summaryVo.setConsumeAchieve(summaryVo.getConsumeAchieve().multiply(currency.getData().getInExchangeRate())); } else { @@ -1359,8 +1354,8 @@ public class MemberReportController extends BaseController { util.exportExcel(response, reportSummaryList, "报单汇总导出"); } - /* - * 推荐反查 + /** + * 推荐反查 **/ @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PARENT_PEG, method = EOperationMethod.SELECT) @PostMapping("/parent-peg") @@ -1391,15 +1386,9 @@ public class MemberReportController extends BaseController { if (StringUtils.isNotEmpty(cuMemberUmbrellaParam.getMemberCode())) { List cuMemberAchieveExtList = iMemberService.queryParentCuMemberAchieveExt(cuMemberUmbrellaParam); if (CollectionUtil.isNotEmpty(cuMemberAchieveExtList)) { - // 获取需要翻译的枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(ECategory.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD); - for (CuMemberAchieveExt cuMemberAchieveExt : cuMemberAchieveExtList) { CuMemberPushAchieveVO vo = BeanUtil.copyProperties(cuMemberAchieveExt, CuMemberPushAchieveVO.class); - vo.setPkGradeVal(transactionMap1.get(cuMemberAchieveExt.getPkGrade())); - vo.setPkAwardsVal(transactionMap1.get(cuMemberAchieveExt.getPkAwards())); - vo.setCategoryVal(transactionMap.get(EnumsPrefixConstants.ENU_CAT + cuMemberAchieveExt.getCategory())); + vo.setCategoryVal(ECategory.getLableByValue(cuMemberAchieveExt.getCategory())); cuMemberPushAchieveVOList.add(vo); } } @@ -1414,15 +1403,6 @@ public class MemberReportController extends BaseController { @Log(module = EOperationModule.STATISTIC_ANALYSIS, business = EOperationBusiness.PRODUCT_DETAIL_QUERY_LIST, method = EOperationMethod.SELECT) @GetMapping("/product-detail-query-list") public TableDataInfo productDetailQuery(ProductDetailQueryParam productDetailQueryParam) { -// if (StringUtils.isNotBlank(productDetailQueryParam.getMemberCode())) { -// R memberDto = iMemberServiceApi.getMember(productDetailQueryParam.getMemberCode()); -// CuMember member = memberDto.getData(); -// if (member != null) { -// productDetailQueryParam.setMemberCode(null); -// productDetailQueryParam.setPkMember(member.getPkId()); -// } -// } - if (productDetailQueryParam.getStartPayTime() != null) { productDetailQueryParam.setStartPayTime(DateUtils.getStartTime(productDetailQueryParam.getStartPayTime())); } @@ -1564,5 +1544,4 @@ public class MemberReportController extends BaseController { return AjaxResult.success(); } - } diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java index 758a31b2..7de6c3df 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/mapper/MemberMapper.java @@ -11,57 +11,29 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

- * 会员信息-奖衔升级记录 Mapper 接口 - *

- * - * @author hzs - * @since 2022-08-31 + * 会员信息 Mapper 接口 */ public interface MemberMapper extends BaseMapper { /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:29 - * @param: [umbrellaBalanceVO] - * @return: java.util.List + * 查询伞下账户余额 **/ List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO); /* - * @description: 用于反查统计分析，反差伞下， - * @author: sui q - * @date: 2023/8/26 10:56 - * @param: null null + * 用于反查统计分析，反差伞下， **/ List queryParentParentCuMemberAchieveExt(@Param("period") Integer period, @Param("param") CuMemberUmbrellaParam param); /** - * @description: 统计分析-伞下直推 - * @author: zhang jing - * @date: 2023/6/13 13:43 - * @param: [memberId] - * @return: java.util.List + * 统计分析-伞下直推 **/ List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO); /** - * @description: 查询会员订单消费业绩 - * @author: zhang jing - * @date: 2023/9/12 10:41 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List + * 查询会员订单消费业绩 **/ List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO); - /** - * @description: 统计分析-伞下直推会员信息 - * @author: zhang jing - * @date: 2023/6/13 13:43 - * @param: [pkId] - * @return: java.util.List - **/ - UmbrellaBelowPushVO queryUmbrellaBelowInfo(@Param("pkId") Long pkId); } 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 20ddf6b4..bc35f221 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/param/CuMemberUmbrellaParam.java @@ -26,11 +26,6 @@ public class CuMemberUmbrellaParam implements Serializable { */ private Integer placeDept; - /** - * 考核状态 - */ - private Integer isAssess; - /** * 查询方向（1=反查，2=正查） */ diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java index f0eb4521..8c863b75 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/IMemberService.java @@ -8,47 +8,28 @@ import com.hzs.report.member.vo.UmbrellaBelowPushVO; import java.util.List; /** - * @description: 会员查询的服务 - * @author: sui q - * @time: 2023/8/26 09:37 - * @classname: IMemberService - * @package_name: com.hzs.report.member.service - * version 1.0.0 + * 会员查询的服务 */ public interface IMemberService { + /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:29 - * @param: [umbrellaBalanceVO] - * @return: java.util.List - **/ + * 查询伞下账户余额 + */ List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO); - /* - * @description: 会员推荐反查 - * @author: sui q - * @date: 2023/8/28 15:03 - * @param: null null - **/ + /** + * 会员推荐反查 + */ List queryParentCuMemberAchieveExt(CuMemberUmbrellaParam cuMemberUmbrellaParam); /** - * @description: 统计分析-伞下直推 - * @author: zhang jing - * @date: 2023/6/13 9:59 - * @param: [memberId] - * @return: java.util.List - **/ + * 统计分析-伞下直推 + */ List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO); /** - * @description: 查询会员订单消费业绩 - * @author: zhang jing - * @date: 2023/9/12 10:41 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List - **/ + * 查询会员订单消费业绩 + */ List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO); } 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 316214df..98d5ab2c 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 @@ -7,13 +7,6 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/8/26 9:49 - * @Classname: MemberReportService - * @PackageName: com.hzs.report.member.service - */ public interface MemberReportService { /** @@ -25,29 +18,17 @@ public interface MemberReportService { Date startPayTime, Date endPayTime); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/1/3 16:17 - * @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ List directPushNewAchieList(DirectPushNewVo dpo, List pkMemberList); /** - * @description: 查询会员总盒数 - * @author: zhang jing - * @date: 2025/2/14 15:01 - * @param: [dpb, pkMemberList] - * @return: java.util.List + * 查询会员总盒数 **/ List directPushNewBoxList(DirectPushBoxVo dpb, List dpbList); /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/3/18 15:41 - * @param: [pkMember, startPayTime, endPayTime, pkCountry, monthList] - * @return: java.util.List + * 查询伞下直推新增业绩-业绩 **/ List directPushNewAchieUpList(DirectPushNewVo dpo, List pkMemberList); @@ -72,11 +53,7 @@ public interface MemberReportService { List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList); /** - * @description: 查询伞下新增安置业绩 - * @author: zhang jing - * @date: 2024/3/12 16:55 - * @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList] - * @return: java.util.List + * 查询伞下新增安置业绩 **/ List selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, int period); @@ -204,56 +181,32 @@ public interface MemberReportService { Integer sumQuantity(String productName, Integer pkClassify, Date startTime, Date endTime, Integer pkCountry, List orderTypeList); /** - * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2025/2/7 15:38 - * @param: [tableName] - * @return: java.lang.Integer + * 查询表是否存在 **/ Integer selectExistTable(String tableName); /** - * @description:查询会员大小区业绩 - * @author: zhang jing - * @date: 2025/2/7 15:59 - * @param: [dpo, pkMember] - * @return: java.util.List + * 查询会员大小区业绩 **/ DirectPushNewVo sizeZoneAchie(DirectPushNewVo dpo, Long pkMember, BigDecimal rate); /** - * @description: 查询会员大小区金额业绩 - * @author: zhang jing - * @date: 2025/2/14 9:26 - * @param: [dpo, pkMember, rate] - * @return: com.hzs.report.member.vo.DirectPushNewVo + * 查询会员大小区金额业绩 **/ DirectPushNewVo sizeZoneAchieAmount(DirectPushNewVo dpo, Long pkMember, BigDecimal rate); /** - * @description: 定时任务批量处理统计会员以及伞下金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 12:03 - * @param: [] - * @return: void + * 定时任务批量处理统计会员以及伞下金额业绩盒数 **/ void pushAmountBoxmethod(); /** - * @description: 定时任务7天重算直推会员金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 16:11 - * @param: [startDateStr, endDateStr] - * @return: void + * 定时任务7天重算直推会员金额业绩盒数 **/ void repeatPushAmountBoxmethod(String startDateStr, String endDateStr); /** - * @description: 初始化会员直推金额业绩盒数统计数据 - * @author: zhang jing - * @date: 2025/2/12 17:39 - * @param: [startDateStr, endDateStr] - * @return: void + * 初始化会员直推金额业绩盒数统计数据 **/ void washMemberAmountBox(String startDateStr, String endDateStr); @@ -266,29 +219,17 @@ public interface MemberReportService { DirectPushBoxVo sizeZoneBox(DirectPushBoxVo dpbVo, String memberCode, Long pkMember); /** - * @description: 查询会员是否激活 - * @author: zhang jing - * @date: 2025/2/14 14:52 - * @param: [dpbVo] - * @return: java.lang.Integer + * 查询会员是否激活 **/ List selectMemberActiveState(DirectPushBoxVo dpbVo, List pkMemberList); /** - * @description: 查询直推会员信息 - * @author: zhang jing - * @date: 2025/2/17 15:52 - * @param: [directPushNewVo] - * @return: java.util.List + * 查询直推会员信息 **/ List querDirectPushDetails(DirectPushNewVo directPushNewVo); /** - * @description: 创建表 - * @author: zhang jing - * @date: 2025/3/5 11:41 - * @param: [tabeName] - * @return: void + * 创建表 **/ void createCuMemberAmountBoxTable(String tabeName); } 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 952e4b24..a258d9a5 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 @@ -5,12 +5,9 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.ETradeType; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.system.config.BdAccount; import com.hzs.common.service.ITransactionCommonService; import com.hzs.report.member.mapper.MemberReportMapper; @@ -21,14 +18,13 @@ import com.hzs.report.report.service.ICuMemberSettlePeriodService; import com.hzs.system.base.ICurrencyServiceApi; import com.hzs.system.base.dto.CurrencyDTO; import com.hzs.system.config.IAccountServiceApi; -import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; @@ -38,35 +34,22 @@ import java.time.temporal.ChronoUnit; import java.util.*; import java.util.stream.Collectors; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.report.member.service.Impl - * @Author: yh - * @CreateTime: 2023-08-26 09:51 - * @Description: TODO - * @Version: 1.0 - */ @Slf4j @Service public class MemberReportServiceImpl implements MemberReportService { - @Autowired + @Resource private MemberReportMapper memberReportMapper; @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired private ITransactionCommonService iTransactionCommonService; @DubboReference - IAccountServiceApi accountServiceApi; + IAccountServiceApi iAccountServiceApi; @DubboReference - ICurrencyServiceApi currencyServiceApi; + ICurrencyServiceApi iCurrencyServiceApi; - /** - * 查询伞下直推新增业绩-查询会员 - * - * @return - */ @Override public List directPushNewList(List memberCodeList, Integer pkCountry, Date startPayTime, @@ -74,75 +57,31 @@ public class MemberReportServiceImpl implements MemberReportService { return memberReportMapper.directPushNewList(memberCodeList, pkCountry, startPayTime, endPayTime); } - /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2023/9/6 14:16 - * @param: [pkMember, startPayTime, endPayTime] - * @return: java.util.List - **/ @Override public List directPushNewAchieList(DirectPushNewVo dpo, List pkMemberList) { return memberReportMapper.directPushNewAchieList(dpo, pkMemberList); } - /** - * @description: 查询会员总盒数 - * @author: zhang jing - * @date: 2025/2/14 15:01 - * @param: [dpb, pkMemberList] - * @return: java.util.List - **/ @Override public List directPushNewBoxList(DirectPushBoxVo dpb, List dpbList) { return memberReportMapper.directPushNewBoxList(dpb, dpbList); } - - /** - * @description: 查询伞下直推新增业绩-业绩 - * @author: zhang jing - * @date: 2024/3/18 11:54 - * @param: [pkMember, startPayTime, endPayTime, orderType, pkCountry] - * @return: java.util.List - **/ @Override public List directPushNewAchieUpList(DirectPushNewVo dpo, List pkMemberList) { return memberReportMapper.directPushNewAchieUpList(dpo, pkMemberList); } - /** - * 用户消费统计 - * - * @param memberCode 用户编号 - * @param memberName 用户姓名 - * @param startPayTime 开始支付时间 - * @param endPayTime 结束支付时间 - * @param pkWares 商品主键 - * @return - */ @Override public List memberConsumptionList(String memberCode, String memberName, Date startPayTime, Date endPayTime, Integer pkWares) { return memberReportMapper.memberConsumptionList(memberCode, memberName, startPayTime, endPayTime, pkWares); } - /** - * 伞下新增安置业绩 - * - * @return - */ @Override public List memberResettleAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, List orderTypeList) { return memberReportMapper.memberResettleAchieve(pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, orderTypeList); } - /** - * @description: 伞下新增安置业绩 - * @author: zhang jing - * @date: 2024/3/14 15:14 - * @param: [pkMember, memberName, startPayTime, endPayTime, pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, treeTableName, period] - * @return: java.util.List - **/ @Override public List selectBrollyNewABAchieve(Long pkMember, String memberName, Date startPayTime, Date endPayTime, Integer pkVertex, Integer pkTeamCode, Integer pkCountry, Integer pkAwards, String achieveTableName, @@ -151,120 +90,51 @@ public class MemberReportServiceImpl implements MemberReportService { pkVertex, pkTeamCode, pkCountry, pkAwards, achieveTableName, period); } - - /** - * 订单币种查询 - * - * @param memberCode 会员编号 - * @param memberName 会员名称 - * @param orderCode 订单编号 - * @param orderType 订单类型 - * @return - */ @Override public List getOrderCurrencyList(String memberCode, String memberName, String orderCode, Integer orderType) { return memberReportMapper.getOrderCurrencyList(memberCode, memberName, orderCode, orderType); } - /** - * 查询订单币种 - * - * @param orderCodeList - * @return - */ @Override public List getBySourceCodeMemberTradeList(List orderCodeList) { return memberReportMapper.getBySourceCodeMemberTradeList(orderCodeList); } - /** - * 查询省订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByProvinceOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByProvinceOrderDistribution(startTime, endTime, pkCountry); } - /** - * 查询市订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByCityOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByCityOrderDistribution(startTime, endTime, pkCountry); } - /** - * 查询区县订单 - * - * @param startTime 开始时间 - * @param endTime 结束时间 - * @param pkCountry 所属国家 - * @return - */ @Override public List getByDistrictOrderDistribution(Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.getByDistrictOrderDistribution(startTime, endTime, pkCountry); } - /** - * 出货明细汇总 - * - * @param productName - * @param pkClassify - * @param startTime - * @param endTime - * @return - */ @Override public List getProductOrderInfo(String productName, Integer pkClassify, Date startTime, Date endTime, Integer pkCountry, List orderTypeList) { return memberReportMapper.getProductOrderInfo(productName, pkClassify, startTime, endTime, pkCountry, orderTypeList); } - /** - * 报单汇总 - * - * @return - */ @Override public List reportSummaryList(ReportSummaryVo reportSummaryVo) { return memberReportMapper.reportSummaryList(reportSummaryVo); } - /** - * 出货明细汇总统计详情 - * - * @param pkProduct - * @param productName - * @param - * @return - */ @Override public List productShippingDetailsList(Integer pkProduct, String productName, Integer pkClassify, Integer pkAwards, List orderTypeList, Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.productShippingDetailsList(pkProduct, productName, pkClassify, pkAwards, orderTypeList, startTime, endTime, pkCountry); } - /** - * 产品明细查询 - * - * @param productDetailQueryParam - * @return - */ @Override public List productDetailQueryList(ProductDetailQueryParam productDetailQueryParam) { return memberReportMapper.productDetailQueryList(productDetailQueryParam); } - @Override public List selectSmallAreaNewAdd(SmallAreaNewAddAchieveVO addAchieveVO) { List areaNewAddAchieveVOList = null; @@ -277,10 +147,9 @@ public class MemberReportServiceImpl implements MemberReportService { //获取期数 String date = beforeLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); //开始时间减一天的期数 - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); addAchieveVO.setBeforePeriod(period); //查询大小区业绩表 - //String settleTable = TableNameConstants.CU_MEMBER_SETTLE + period; addAchieveVO.setSettleTable(getMonthTableName(beforeLocalDate)); addAchieveVO.setMonthAchieveVOList(getAchieveMonthTable(startDate, addAchieveVO.getEndDate())); if (addAchieveVO.getAchieve().compareTo(new BigDecimal("10000")) > -1) { @@ -314,7 +183,6 @@ public class MemberReportServiceImpl implements MemberReportService { * @param endDate 结束时间 * @return List */ - private List getAchieveMonthTable(String startDate, String endDate) { MonthAchieveVO monthAchieveVO = null; List monthAchieveVOList = new ArrayList<>(); @@ -326,7 +194,7 @@ public class MemberReportServiceImpl implements MemberReportService { //相差两个月及以上 if (months >= 2) { //初月信息 - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod) .build(); @@ -338,27 +206,27 @@ public class MemberReportServiceImpl implements MemberReportService { monthAchieveVOList.add(monthAchieveVO); } //末月信息 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate)) .endPeriod(endPeriod) .build(); monthAchieveVOList.add(endMonthAchieveVO); //同一个月 } else if (months == 0) { - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); monthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod).endPeriod(endPeriod).build(); monthAchieveVOList.add(monthAchieveVO); } else { //初月信息 - int startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); + int startPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(startDate).getPkId(); MonthAchieveVO startMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(startLocalDate)) .startPeriod(startPeriod) .build(); monthAchieveVOList.add(startMonthAchieveVO); //末月信息 - int endPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); + int endPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(endDate).getPkId(); MonthAchieveVO endMonthAchieveVO = MonthAchieveVO.builder().achieveTable(getMonthTableName(endLocalDate)) .endPeriod(endPeriod) .build(); @@ -367,18 +235,17 @@ public class MemberReportServiceImpl implements MemberReportService { return monthAchieveVOList; } - @Override public List selectMemberUnderWalletList(CuMemberWalletVO walletVO) { List cuMemberWalletVOList = memberReportMapper.selectMemberUnderWalletList(walletVO); if (CollUtil.isNotEmpty(cuMemberWalletVOList)) { Integer pkCountry = walletVO.getPkCountry(); //查询币种值 - List allAccounts = accountServiceApi.queryAccountByType(null, pkCountry).getData(); + List allAccounts = iAccountServiceApi.queryAccountByType(null, pkCountry).getData(); Map map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o)); Map transactionMap = iTransactionCommonService.exportEnumTransaction(ETradeType.values()); //根据国家查询汇率 - CurrencyDTO currency = currencyServiceApi.getCurrency(pkCountry).getData(); + CurrencyDTO currency = iCurrencyServiceApi.getCurrency(pkCountry).getData(); //汇率 BigDecimal exchangeRate = currency.getInExchangeRate(); for (CuMemberWalletVO cuMemberWalletVO : cuMemberWalletVOList) { @@ -404,52 +271,21 @@ public class MemberReportServiceImpl implements MemberReportService { return cuMemberWalletVOList; } - /** - * 查询商品统计信息 - * - * @param - * @return - */ @Override public List productSaleStatList(String skuCode, String productName, Integer orderType, Date startTime, Date endTime, Integer pkCountry) { return memberReportMapper.productSaleStatList(skuCode, productName, orderType, startTime, endTime, pkCountry); } - /** - * 统计产品所有汇总 - * - * @param productName - * @param pkClassify - * @param startTime - * @param endTime - * @param pkCountry - * @param orderTypeList - * @return - */ @Override public Integer sumQuantity(String productName, Integer pkClassify, Date startTime, Date endTime, Integer pkCountry, List orderTypeList) { return memberReportMapper.sumQuantity(productName, pkClassify, startTime, endTime, pkCountry, orderTypeList); } - /** - * @description: 查询表是否存在 - * @author: zhang jing - * @date: 2025/2/7 15:38 - * @param: [tableName] - * @return: java.lang.Integer - **/ @Override public Integer selectExistTable(String tableName) { return memberReportMapper.selectExistTable(tableName); } - /** - * @description: 查询会员大小区业绩 - * @author: zhang jing - * @date: 2025/2/7 16:22 - * @param: [dpo, pkMember, memberRetailTable, rate] - * @return: com.hzs.report.member.vo.DirectPushNewVo - **/ @Override public DirectPushNewVo sizeZoneAchie(DirectPushNewVo dpo, Long pkMember, BigDecimal rate) { //查询直推会员 @@ -478,19 +314,12 @@ public class MemberReportServiceImpl implements MemberReportService { return getMemberBigAndSmallAchieve(memberSelfAchieveList, rate); } - /** - * @description: 查询会员大小区金额业绩 - * @author: zhang jing - * @date: 2025/2/13 11:26 - * @param: [dpo, pkMember, rate] - * @return: com.hzs.report.member.vo.DirectPushNewVo - **/ @Override public DirectPushNewVo sizeZoneAchieAmount(DirectPushNewVo dpo, Long pkMember, BigDecimal rate) { //会员业绩（需求修改，注册、升级上传业绩、复购、复消算自己的业绩） dpo.setPkMember(pkMember); //查询伞下业绩金额 - List memberPushAchieveList = querMemberAchieveAmountTeam(dpo); + List memberPushAchieveList = querMemberAchieveAmountTeam(dpo); if (CollUtil.isEmpty(memberPushAchieveList)) { return DirectPushNewVo .builder() @@ -503,13 +332,8 @@ public class MemberReportServiceImpl implements MemberReportService { return getMemberBigAndSmallAchieve(memberPushAchieveList, rate); } - /** - * @description: 查询会员推荐伞下业绩 - * @author: zhang jing - * @date: 2025/2/7 16:21 - * @param: [pkMemberList, memberRangeTable] - * @return: java.util.List + * 查询会员推荐伞下业绩 **/ private List getMemberPushAchieve(List pkMemberList, String memberRangeTable, Date endPayTime, Date zonpayTime) { DirectPushNewVo memberAchieveVO = DirectPushNewVo.builder() @@ -522,7 +346,8 @@ public class MemberReportServiceImpl implements MemberReportService { } /** - * @description: 查询伞下业绩金额 + * 查询伞下业绩金额 + * * @author: zhang jing * @date: 2025/2/25 15:40 * @param: [dpo] @@ -532,10 +357,9 @@ public class MemberReportServiceImpl implements MemberReportService { return memberReportMapper.querMemberAchieveAmountTeam(dpo); } - - /** - * @description: 获取直推大区业绩、小区业绩 + * 获取直推大区业绩、小区业绩 + * * @author: zhang jing * @date: 2025/2/7 16:21 * @param: [memberAchieveList, rate] @@ -559,7 +383,8 @@ public class MemberReportServiceImpl implements MemberReportService { } /** - * @description: 根据大业绩查询大小区盒数 + * 根据大业绩查询大小区盒数 + * * @author: zhang jing * @date: 2025/2/25 16:36 * @param: [memberAchieveList, rate] @@ -585,26 +410,19 @@ public class MemberReportServiceImpl implements MemberReportService { .build(); } - /** - * @description: 定时任务批量处理统计当天会员以及伞下金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 12:03 - * @param: [] - * @return: void - **/ @Override @Transactional(rollbackFor = Exception.class) public void pushAmountBoxmethod() { //查询当前日期 String date = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, (DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date()))); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); String rangeTabeName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; if (selectExistTable(rangeTabeName) == 0) { return; } //查询上一期的统计金额业绩盒数表 String beforeDate = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date); - int beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDate).getPkId(); + int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDate).getPkId(); String beforeTabeName = TableNameConstants.CU_MEMBER_AMOUNT_BOX + beforePeriod; String tabeName = TableNameConstants.CU_MEMBER_AMOUNT_BOX + period; @@ -617,12 +435,12 @@ public class MemberReportServiceImpl implements MemberReportService { memberReportMapper.createCuMemberAmountBoxTable(tabeName); } //创建表索引 - String indexName=TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX+period; + String indexName = TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX + period; try { - memberReportMapper.createPkMemberIndex(indexName,tabeName); + memberReportMapper.createPkMemberIndex(indexName, tabeName); log.info("索引创建成功！"); } catch (Exception e) { - log.info("索引创建失败: "+e.getMessage()); + log.info("索引创建失败: " + e.getMessage()); } //添加会员统计金额业绩盒数数据 memberReportMapper.innertMemberAmountBoxTable(date, date, tabeName, beforeTabeName, rangeTabeName); @@ -634,33 +452,26 @@ public class MemberReportServiceImpl implements MemberReportService { }); } //将未激活的会员盒数更新为0 - memberReportMapper.updMemberBox(tabeName,rangeTabeName); + memberReportMapper.updMemberBox(tabeName, rangeTabeName); } - /** - * @description: 定时任务7天重算直推会员金额业绩盒数 - * @author: zhang jing - * @date: 2025/2/12 16:10 - * @param: [startDateStr, endDateStr] - * @return: void - **/ @Override @Transactional(rollbackFor = Exception.class) public void repeatPushAmountBoxmethod(String startDateStr, String endDateStr) { - log.info("手动直推统计开始：{}", startDateStr+" ==== " +endDateStr); - List dateList =getDateRange(startDateStr,endDateStr); - if(CollectionUtil.isNotEmpty(dateList)){ - dateList.forEach(date->{ + log.info("手动直推统计开始：{}", startDateStr + " ==== " + endDateStr); + List dateList = getDateRange(startDateStr, endDateStr); + if (CollectionUtil.isNotEmpty(dateList)) { + dateList.forEach(date -> { //查询当前日期 - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); String rangeTabeName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; if (selectExistTable(rangeTabeName) == 0) { return; } //查询上一期的统计金额业绩盒数表 String beforeDate = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date); - int beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDate).getPkId(); + int beforePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeDate).getPkId(); String beforeTabeName = TableNameConstants.CU_MEMBER_AMOUNT_BOX + beforePeriod; String tabeName = TableNameConstants.CU_MEMBER_AMOUNT_BOX + period; @@ -676,19 +487,18 @@ public class MemberReportServiceImpl implements MemberReportService { //删除表数据重新统计 memberReportMapper.delMemberAmountBox(tabeName); //创建表索引 - String indexName=TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX+period; + String indexName = TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX + period; try { - memberReportMapper.createPkMemberIndex(indexName,tabeName); + memberReportMapper.createPkMemberIndex(indexName, tabeName); log.info("索引创建成功！"); } catch (Exception e) { - log.info("索引创建失败: "+e.getMessage()); + log.info("索引创建失败: " + e.getMessage()); } - log.info("开始批量添加数据：{}"+ "date= "+date+"tabeName= "+tabeName+"beforeTabeName= " - +beforeTabeName+"rangeTabeName= "+rangeTabeName); + log.info("开始批量添加数据：{}" + "date= " + date + "tabeName= " + tabeName + "beforeTabeName= " + + beforeTabeName + "rangeTabeName= " + rangeTabeName); //添加会员统计金额业绩盒数数据 memberReportMapper.innertMemberAmountBoxTable(date, date, tabeName, beforeTabeName, rangeTabeName); List orderList = memberReportMapper.querMemberOrder(date, date); - log.info("订单数据：{}"+ "orderList= "+orderList.size()); if (CollectionUtil.isNotEmpty(orderList)) { orderList.forEach(itm -> { //添加会员伞下业绩金额盒数数据 @@ -696,27 +506,20 @@ public class MemberReportServiceImpl implements MemberReportService { }); } //将未激活的会员盒数更新为0 - memberReportMapper.updMemberBox(tabeName,rangeTabeName); + memberReportMapper.updMemberBox(tabeName, rangeTabeName); log.info("统计完成"); }); } } - /** - * @description: 初始化会员直推金额业绩盒数统计数据 - * @author: zhang jing - * @date: 2025/2/12 17:38 - * @param: [startDateStr, endDateStr] - * @return: void - **/ @Override @Transactional(rollbackFor = Exception.class) public void washMemberAmountBox(String startDateStr, String endDateStr) { - List dateList =getDateRange(startDateStr,endDateStr); - if(CollectionUtil.isNotEmpty(dateList)){ - dateList.forEach(date->{ + List dateList = getDateRange(startDateStr, endDateStr); + if (CollectionUtil.isNotEmpty(dateList)) { + dateList.forEach(date -> { //查询当前日期 - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date).getPkId(); String rangeTabeName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; if (selectExistTable(rangeTabeName) == 0) { return; @@ -727,12 +530,12 @@ public class MemberReportServiceImpl implements MemberReportService { memberReportMapper.createCuMemberAmountBoxTable(tabeName); } //创建表索引 - String indexName=TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX+period; + String indexName = TableNameConstants.CU_MEMBER_AMOUNT_BOX_INDEX + period; try { - memberReportMapper.createPkMemberIndex(indexName,tabeName); + memberReportMapper.createPkMemberIndex(indexName, tabeName); log.info("索引创建成功！"); } catch (Exception e) { - log.info("索引创建失败: "+e.getMessage()); + log.info("索引创建失败: " + e.getMessage()); } //添加会员统计金额业绩盒数数据 memberReportMapper.washMemberAmountBox(tabeName, rangeTabeName); @@ -741,8 +544,7 @@ public class MemberReportServiceImpl implements MemberReportService { } - - public List getDateRange(String startDateStr, String endDateStr) { + public List getDateRange(String startDateStr, String endDateStr) { // 定义日期格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 将字符串转换为 LocalDate @@ -759,25 +561,18 @@ public class MemberReportServiceImpl implements MemberReportService { return dateList; } - /** - * @description: 查询会员大小区盒数 - * @author: zhang jing - * @date: 2025/2/14 13:35 - * @param: [dpbVo, pkMember] - * @return: com.hzs.report.member.vo.DirectPushBoxVo - **/ @Override - public DirectPushBoxVo sizeZoneBox(DirectPushBoxVo dpbVo,String memberCode,Long pkMember) { + public DirectPushBoxVo sizeZoneBox(DirectPushBoxVo dpbVo, String memberCode, Long pkMember) { dpbVo.setPkMember(pkMember); - DirectPushNewVo dpo= BeanUtil.copyProperties(dpbVo, DirectPushNewVo.class); + DirectPushNewVo dpo = BeanUtil.copyProperties(dpbVo, DirectPushNewVo.class); //查询伞下业绩金额盒数 List memberPushAchieveList = querMemberAchieveAmountTeam(dpo); if (CollUtil.isNotEmpty(memberPushAchieveList)) { - List boxList=new ArrayList<>(); + List boxList = new ArrayList<>(); memberPushAchieveList.forEach(item -> boxList.add(BeanUtil.copyProperties(item, DirectPushBoxVo.class))); return getMemberBigAndSmallBox(boxList); - }else{ - return dpbVo; + } else { + return dpbVo; } } @@ -788,34 +583,20 @@ public class MemberReportServiceImpl implements MemberReportService { */ private String getTableSName() { String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId(); + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId(); return TableNameConstants.CU_MEMBER_RETAIL_S + period; } - //查询会员是否激活 + @Override - public List selectMemberActiveState(DirectPushBoxVo dpbVo,List pkMemberList){ - return memberReportMapper.selectMemberActiveState(dpbVo,pkMemberList); + public List selectMemberActiveState(DirectPushBoxVo dpbVo, List pkMemberList) { + return memberReportMapper.selectMemberActiveState(dpbVo, pkMemberList); } - /** - * @description: 查询直推会员信息 - * @author: zhang jing - * @date: 2025/2/17 15:52 - * @param: [directPushNewVo] - * @return: java.util.List - **/ @Override public List querDirectPushDetails(DirectPushNewVo directPushNewVo) { return memberReportMapper.querDirectPushDetails(directPushNewVo); } - /** - * @description:创建表 - * @author: zhang jing - * @date: 2025/3/5 11:41 - * @param: [tabeName] - * @return: void - **/ @Override public void createCuMemberAmountBoxTable(String tabeName) { memberReportMapper.createCuMemberAmountBoxTable(tabeName); diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java index e9e11d3a..2d2b7548 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberServiceImpl.java @@ -9,37 +9,25 @@ import com.hzs.report.member.service.IMemberService; import com.hzs.report.member.vo.CuMemberUmbrellaBalanceVO; import com.hzs.report.member.vo.UmbrellaBelowPushVO; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.List; /** - * @description: 会员 - * @author: sui q - * @time: 2023/8/26 09:37 - * @classname: MemberServiceImpl - * @package_name: com.hzs.report.member.service.impl - * version 1.0.0 + * 会员 */ @Service public class MemberServiceImpl implements IMemberService { - @Autowired + @Resource private MemberMapper memberMapper; @DubboReference ICuMemberSettlePeriodServiceApi cuMemberSettlePeriodServiceApi; - /** - * @description: 查询伞下账户余额 - * @author: zhang jing - * @date: 2023/8/25 15:29 - * @param: [umbrellaBalanceVO] - * @return: java.util.List - **/ @Override public List selectUmbrellaLowerBalance(CuMemberUmbrellaBalanceVO umbrellaBalanceVO) { return memberMapper.selectUmbrellaLowerBalance(umbrellaBalanceVO); @@ -47,40 +35,16 @@ public class MemberServiceImpl implements IMemberService { @Override public List queryParentCuMemberAchieveExt(CuMemberUmbrellaParam cuMemberUmbrellaParam) { -// Date settleDate = cuMemberUmbrellaParam.getQueryDate() == null ? DateUtils.currentDate() : cuMemberUmbrellaParam.getQueryDate(); -// if (DateUtils.compareDateBefore(settleDate, DateUtils.currentDate())) { -// String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate); -// CuMemberSettlePeriod cuMemberSettlePeriod = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(date).getData(); -// String tableName = TableNameConstants.CU_MEMBER_SETTLE + cuMemberSettlePeriod.getPkId(); -// String tableAssName = TableNameConstants.CU_MEMBER_ASSESS + DateUtils.getYear(date); -// Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); -// return memberMapper.queryParentParentHisCuMemberAchieveExt(tableName, tableAssName, period, cuMemberUmbrellaParam); -// } else { Date settleDate = DateUtils.beforeDate(1, ChronoUnit.DAYS); Integer period = cuMemberSettlePeriodServiceApi.getCuMemberSettlePeriodByDate(DateUtils.currentMonthFirstDateStr(settleDate)).getData().getPkId(); return memberMapper.queryParentParentCuMemberAchieveExt(period, cuMemberUmbrellaParam); -// } } - /** - * @description: 统计分析-伞下直推 - * @author: zhang jing - * @date: 2023/6/13 13:54 - * @param: [memberId] - * @return: java.util.List - **/ @Override public List queryUmbrellaBelowPush(UmbrellaBelowPushVO umbrellaBelowPushVO) { return memberMapper.queryUmbrellaBelowPush(umbrellaBelowPushVO); } - /** - * @description: 查询会员订单消费业绩 - * @author: zhang jing - * @date: 2023/9/12 10:41 - * @param: [umbrellaBelowPushVO] - * @return: java.util.List - **/ @Override public List queryOrderExpend(UmbrellaBelowPushVO umbrellaBelowPushVO) { return memberMapper.queryOrderExpend(umbrellaBelowPushVO); 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 3e76e539..582a5e42 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 @@ -53,7 +53,7 @@ public class CuMemberPushAchieveVO implements Serializable { */ @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD) private Integer pkAwards; - @Excel(name = "级差奖衔") + @Excel(name = "当月奖衔") private String pkAwardsVal; /** diff --git a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml index 62fe3009..b084a1c8 100644 --- a/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml +++ b/bd-business/bd-business-report/src/main/resources/mapper/report/member/MemberMapper.xml @@ -30,7 +30,6 @@ LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code left join CU_MEMBER_ACCOUNT cmac on cmac.PK_MEMBER=cm.pk_id where cm.del_flag = 0 and cmac.del_flag = 0 - AND cm.PK_SETTLE_COUNTRY=#{pkCountry} @@ -53,20 +52,21 @@ with cm.pk_id = #{pkId} connect by cm.PK_PARENT = prior cm.pk_id order by level - -