diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java index f77b6f28..a3c4fc99 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/mapper/CuMemberAchieveMapper.java @@ -136,11 +136,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { **/ List selectABNewMonthCoun(PlaceNewAddAchieveVO pna); - /** - * @description: 根据日期查询最新期数 - **/ - Integer mostNewPeriod(PlaceNewAddAchieveVO pna); - /** * @description: 查询各个等级直推人数和业绩 **/ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java index a763fb04..b8d8e16c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/ICuMemberAchieveService.java @@ -20,9 +20,6 @@ import java.util.List; /** * 会员业绩记录 服务类 - * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberAchieveService extends IService { @@ -65,15 +62,6 @@ public interface ICuMemberAchieveService extends IService { */ CuMemberAwardsDisVO selectAwardsByPkMember(Long pkMember, Integer pkCountry); - /** - * 查询个人的奖衔信息 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return CuMemberAwardsUnderVO - */ - CuMemberAwardsUnderVO selectMemberAwards(Long pkMember, Integer pkCountry); - /** * 会员业绩进度(首页使用) * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 67f85e46..d0e87705 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.*; 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.*; import com.hzs.common.domain.member.achieve.CuMemberAchieve; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; @@ -66,9 +65,6 @@ import java.util.stream.Collectors; /** * 会员业绩记录 服务实现类 - * - * @author hzs - * @since 2022-10-26 */ @Slf4j @Service @@ -198,25 +194,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl selectNewAddAchieve(CuMemberNewAddAchieveVO cuMemberNewAddAchieveVO) { LocalDate endDate = LocalDate.now(); @@ -348,11 +309,9 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl awardsList = cuMemberAwardsUnderVO.getAwardsList(); - //获取当前会员的奖衔 - Integer pkAwards = cuMemberAwardsUnderVO.getPkAwards(); - //升序排序 - awardsList.sort(Comparator.comparing(BdAwards::getAwardsValue)); - Map awardsMap = awardsList.stream().collect(Collectors.toMap(BdAwards::getAwardsValue, o -> o)); - if (pkAwards != null) { - BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(pkAwards).getData(); - - List list = awardsList.stream().filter(a -> a.getAwardsValue() > bdAwards.getAwardsValue()).collect(Collectors.toList()); - //当奖衔最大级别时,目标值-1 - if (CollUtil.isNotEmpty(list)) { - BigDecimal targetPv = awardsMap.get(list.get(0).getAwardsValue()).getCommunityCheck(); - cuMemberAwardsUnderVO.setTargetPv(targetPv.divide(new BigDecimal("10000"))); - cuMemberAwardsUnderVO.setTarAwardsName(list.get(0).getAwardsName()); - cuMemberAwardsUnderVO.setPkTransaction(list.get(0).getPkTransaction()); - } else { - BigDecimal targetPv = new BigDecimal("-1"); - cuMemberAwardsUnderVO.setTargetPv(targetPv); - } - //中国转汇率 - if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - //根据国家查汇率 - BigDecimal rate = iCuMemberBaseService.getCurrency(pkCountry).getInExchangeRate(); - cuMemberAwardsUnderVO.setPkAwards(pkAwards); - cuMemberAwardsUnderVO.setAwardsName(bdAwards.getAwardsName()); - cuMemberAwardsUnderVO.setSumRealPv(cuMemberAwardsUnderVO.getSumRealPv().divide(new BigDecimal("10000"))); - cuMemberAwardsUnderVO.setTargetPv(getBigDecimal(cuMemberAwardsUnderVO.getTargetPv()).multiply(rate)); - cuMemberAwardsUnderVO.setSumRealPv(getBigDecimal(cuMemberAwardsUnderVO.getSumRealPv()).multiply(rate)); - //左区累计业绩 - BigDecimal aSumPv = cuMemberAwardsUnderVO.getASumPv().divide(new BigDecimal("10000")); - cuMemberAwardsUnderVO.setASumPv(getBigDecimal(aSumPv).multiply(rate)); - //右区累计业绩 - BigDecimal bSumPv = cuMemberAwardsUnderVO.getBSumPv().divide(new BigDecimal("10000")); - cuMemberAwardsUnderVO.setBSumPv(getBigDecimal(bSumPv).multiply(rate)); - //左区新增业绩 - BigDecimal aNewPv = cuMemberAwardsUnderVO.getANewPv().divide(new BigDecimal("10000")); - cuMemberAwardsUnderVO.setANewPv(getBigDecimal(aNewPv).multiply(rate)); - //右区新增业绩 - BigDecimal bNewPv = cuMemberAwardsUnderVO.getBNewPv().divide(new BigDecimal("10000")); - cuMemberAwardsUnderVO.setBNewPv(getBigDecimal(bNewPv).multiply(rate)); - } - } - - return cuMemberAwardsUnderVO; - } - - @Override public CuMemberAwardsUnderVO indexMemberAwards(Long pkMember, Integer pkCountry) { boolean hasSettle = false; @@ -677,7 +582,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl selectABDirectAchieve(PlaceNewAddAchieveVO pna) { return baseMapper.selectABDirectAchieve(pna); } /** - * @description: 查询直推业绩 - * @author: zhang jing - * @date: 2023/5/19 15:51 - * @param: [pna] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO + * 查询直推业绩 **/ private PlaceNewAddAchieveVO selectParentAchieve(PlaceNewAddAchieveVO pna) { return baseMapper.selectParentAchieve(pna); } - /** - * @description: 查询历史左右区人数 - * @author: zhang jing - * @date: 2023/5/19 11:32 - * @param: [pna] - * @return: com.hzs.member.achieve.controller.vo.PlaceNewAddAchieveVO + * 查询历史左右区人数 **/ private List selectABCoun(PlaceNewAddAchieveVO pna) { return baseMapper.selectABCoun(pna); } /** - * @description: 查询最新月份左右区人数 - * @author: zhang jing - * @date: 2023/9/10 17:27 - * @param: [pna] - * @return: java.lang.Integer + * 查询最新月份左右区人数 **/ private List selectABNewMonthCoun(PlaceNewAddAchieveVO pna) { return baseMapper.selectABNewMonthCoun(pna); } /** - * @description: 根据日期查询最新期数 - * @author: zhang jing - * @date: 2023/6/6 14:52 - * @param: [pna] - * @return: java.lang.Integer - **/ - private Integer mostNewPeriod(PlaceNewAddAchieveVO pna) { - return baseMapper.mostNewPeriod(pna); - } - - /** - * @description: 查询各个等级直推人数和业绩 - * @author: zhang jing - * @date: 2023/5/23 10:20 - * @param: [pav] - * @return: java.util.List + * 查询各个等级直推人数和业绩 **/ private List selectParentCounAchieve(ParentAchieveVO pav) { return baseMapper.selectParentCounAchieve(pav); } /** - * @description: 查询本人直推业绩 - * @author: zhang jing - * @date: 2023/5/23 19:32 - * @param: [pav] - * @return: java.util.List + * 查询本人直推业绩 **/ List selfParentCounAchieve(ParentAchieveVO pav) { return baseMapper.selfParentCounAchieve(pav); } /** - * @description: 查询前10直推业绩 - * @author: zhang jing - * @date: 2023/5/23 19:32 - * @param: [pav] - * @return: java.util.List + * 查询前10直推业绩 **/ List parentCounAchieveTop(ParentAchieveVO pav) { return baseMapper.parentCounAchieveTop(pav); } - /** - * @description: 直推业绩前十人伞下等级业绩 - * @author: zhang jing - * @date: 2023/5/31 19:57 - * @param: [pav] - * @return: java.util.List + * 直推业绩前十人伞下等级业绩 **/ List umbrellaAchieveTop(ParentAchieveVO pav) { return baseMapper.umbrellaAchieveTop(pav); @@ -945,7 +790,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - //查询左右区业绩 - PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna); - BigDecimal leftAchieve; - BigDecimal rightAchieve; + BigDecimal leftAchieve = BigDecimal.ZERO; + BigDecimal rightAchieve = BigDecimal.ZERO; - if (null != achieve) { - if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { - leftAchieve = achieve.getLeftAchieve().multiply(currency.getData().getInExchangeRate()); - rightAchieve = achieve.getRightAchieve().multiply(currency.getData().getInExchangeRate()); - } else { - leftAchieve = achieve.getLeftAchieve(); - rightAchieve = achieve.getRightAchieve(); + String achieveTableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(startDateStr); + Integer number = iCuMemberTreeService.queryExistOracleTable(achieveTableName); + if (null != number && number != 0) { + // 月度业绩表存在 + pna.setStartDate(startDateStr); + pna.setEndDate(endDateStr); + pna.setAchieveTableName(achieveTableName); + //查询左右区业绩 + PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna); + + if (null != achieve) { + if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) { + leftAchieve = achieve.getLeftAchieve().multiply(currency.getData().getInExchangeRate()); + rightAchieve = achieve.getRightAchieve().multiply(currency.getData().getInExchangeRate()); + } else { + leftAchieve = achieve.getLeftAchieve(); + rightAchieve = achieve.getRightAchieve(); + } } - } else { - leftAchieve = BigDecimal.ZERO; - rightAchieve = BigDecimal.ZERO; } if (leftAchieve.compareTo(BigDecimal.ZERO) > 0) { @@ -1173,11 +1019,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 月度业绩-左右区人数详情(最新) **/ @Override public List placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) { @@ -1214,11 +1052,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 月度业绩-左右区人数详情(历史) **/ @Override public List placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna) { @@ -1226,11 +1060,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 月度业绩-左右区业绩详情 **/ @Override public List leftRightAchieveDetails(PlaceNewAddAchieveVO pna) { @@ -1238,11 +1068,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 月度业绩-左右区血缘业绩详情 **/ @Override public List leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna) { @@ -1250,11 +1076,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 月度业绩-查询血缘业绩详情 **/ @Override public List directAchieveDetails(PlaceNewAddAchieveVO pna) { @@ -1263,11 +1085,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl + * 业绩分布-直推业绩统计(左图) **/ @Override public List parentAchieveLeft(ParentAchieveVO pa) { @@ -1359,11 +1169,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl list) { if (CollectionUtil.isNotEmpty(list)) { @@ -1405,7 +1211,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl selectPlacementDataList(PlacementDataParam param) { String startDate = param.getStartDate(); @@ -1433,10 +1238,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl(); } - BigDecimal ten = new BigDecimal(10000); + BigDecimal ten = new BigDecimal("10000"); /** * 查询会员真实业绩 diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml index 430caae8..8f9d3ff0 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberAchieveMapper.xml @@ -739,21 +739,6 @@ CONNECT BY pk_place_parent = PRIOR pk_id - - - -