diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java index 3da9a7a0..2602fe09 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java @@ -16,11 +16,13 @@ import com.hzs.member.account.service.ICuMemberBaseService; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; import com.hzs.member.base.service.ICuMemberService; import com.hzs.retail.member.mapper.CuMemberRetailRangeMapper; +import com.hzs.retail.member.param.MarketDynamicsQueryDateParam; import com.hzs.retail.member.service.ICuMemberRetailAchieveService; import com.hzs.retail.member.utils.DataStatisticsUtil; import com.hzs.retail.member.vo.CuMemberRetailAchieveVO; import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO; import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO; +import com.hzs.retail.member.vo.MarketDynamicsDetailVO; import com.hzs.system.config.IGradeServiceApi; import com.hzs.system.config.dto.GradeDTO; import lombok.extern.slf4j.Slf4j; @@ -306,11 +308,17 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl memberSelfAchieveList = new ArrayList<>(); //会员业绩 -// CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build(); -// CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO); -// if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) { -// orderAchieveVO.setPkMember(pkMember); -// memberSelfAchieveList.add(orderAchieveVO); -// } + CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build(); + CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO); + if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) { + orderAchieveVO.setPkMember(pkMember); + memberSelfAchieveList.add(orderAchieveVO); + } //查询伞下业绩 if (CollUtil.isNotEmpty(pkMemberList)) { List memberPushAchieveList = getMemberPushSumAchieve(pkMemberList, memberRetailTable, memberSecondTable, systemType); @@ -577,6 +585,24 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl getMarketDynamics(MarketDynamicsQueryDateParam param) { + DataStatisticsUtil.setQueryDateParam(param); + param.setCurrentDayTableName(getDayTableName()); + param.setCurrentMonthTableName(getDayTableName(param.getNowDate())); + param.setCurrentDayTableName(getDayTableName(param.getLastMonthDate())); + log.info("MarketDynamicsQueryDateParam : {}", JSONUtil.toJsonStr(param)); + return Collections.emptyList(); + } + + private String getDayTableName(String localDate) { + int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId(); + if(ObjectUtil.isEmpty(period)){ + return null; + } + return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; + } + /** * 查询会员是否激活 *