From ba36ea4a81ae6ce8ec59bfdf6a5bce8c0cb1f1f5 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 21 Jul 2025 15:26:57 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=B8=8A=E6=A0=91=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/IMemberAchieveServiceApi.java | 3 - .../achieve/mapper/CuMemberAchieveMapper.java | 25 -- .../service/ICuMemberAchieveService.java | 34 +- .../impl/CuMemberAchieveServiceImpl.java | 143 ------ .../service/ICuMemberBusinessService.java | 9 +- .../member/base/service/ICuMemberService.java | 80 ++-- .../impl/CuMemberBusinessServiceImpl.java | 12 +- .../api/ApiMemberStructureController.java | 409 +++--------------- .../member/achieve/CuMemberAchieveMapper.xml | 81 ---- .../sale/component/load/RedisComponent.java | 7 - .../com/hzs/sale/order/param/OrderParam.java | 3 + .../sale/order/service/ISaOrderService.java | 10 +- .../service/impl/SaOrderServiceImpl.java | 50 --- .../base/service/IBdTransactionService.java | 3 - .../impl/BdTransactionServiceImpl.java | 11 - .../system/component/load/RedisComponent.java | 18 +- .../hzs/common/core/constant/Constants.java | 5 - .../core/constant/MemberFieldConstants.java | 29 -- .../core/constant/SaOrderFieldConstants.java | 2 - .../core/constant/TableNameConstants.java | 4 - .../com/hzs/common/core/utils/CommonUtil.java | 7 - .../member/achieve/CuMemberAchieve.java | 3 - .../domain/system/base/BdTransaction.java | 6 - 23 files changed, 131 insertions(+), 823 deletions(-) diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java index aa48d6ec..954bf679 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/achieve/IMemberAchieveServiceApi.java @@ -14,9 +14,6 @@ public interface IMemberAchieveServiceApi { * @param cuMember 推荐会员主键 公司 会员名称 手机号 * @param isFirst 是否首单 * @param isFirstAchieve 是否首购业绩 - * @return: CuMemberAchieve - * @Author: sui q - * @Date: 2022/10/26 15:04 */ R queryCuMemberAchieveByPkMember(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve); 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 a3c4fc99..46c52353 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 @@ -16,9 +16,6 @@ import java.util.List; /** * 会员业绩记录 Mapper 接口 - * - * @author hzs - * @since 2022-10-26 */ public interface CuMemberAchieveMapper extends BaseMapper { @@ -47,22 +44,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ CuMemberAwardsUnderVO selectAwardsByPkMember(CuMemberAwardsUnderVO memberAwardsUnderVO); - /** - * 根据用户ID查询结余大小信息 - * - * @param memberAwardsUnderVO 奖衔VO - * @return CuMemberAwardsUnderVO - */ - CuMemberAwardsUnderVO selectBalanceByPkMember(CuMemberAwardsUnderVO memberAwardsUnderVO); - - /** - * 查询本月小区新增业绩 - * - * @param memberAwardsUnderVO 入参 - * @return CuMemberAwardsUnderVO - */ - CuMemberAwardsUnderVO selectMemberSmallAchieve(CuMemberAwardsUnderVO memberAwardsUnderVO); - /** * 根据用户ID查询奖衔伞下 * @@ -71,7 +52,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ List selectUnderMemberAwards(CuMemberAwardsUnderVO memberAwardsUnderVO); - /** * 月度新增业绩对比 * @@ -120,7 +100,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { **/ List directAchieveDetails(PlaceNewAddAchieveVO pna); - /** * @description: 查询直推业绩 **/ @@ -156,7 +135,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { **/ List umbrellaAchieveTop(ParentAchieveVO pav); - /** * 查询安置数据 * @@ -173,7 +151,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ List selectAchieveByPkMember(PlacementDataParam param); - /** * 查询推荐数据 * @@ -190,7 +167,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ List selectRecommendDataListByPkMember(PlacementDataParam param); - /** * 查询体系总和 * @@ -207,7 +183,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ RecommendDataDetailVO selectRecommendMarketValue(PlacementDataParam param); - /** * 查询安置图表 * 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 b8d8e16c..1f146734 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 @@ -32,17 +32,17 @@ public interface ICuMemberAchieveService extends IService { CuMemberAchieve queryCuMemberAchieveByPkMember(Long pkMember, Integer pkCountry); /* - * description: 业绩分布-安置图 + * 业绩分布-安置图 **/ CuMemberDisVO queryCuMemberAchieveDis(MemberAchieveDisParam memberAchieveDisParam); /* - * @description: 点击架构树显示会员的业绩情况 + * 点击架构树显示会员的业绩情况 **/ CuMemberDisVO queryCuMemberDis(MemberAchieveDisParam memberAchieveDisParam); /* - * description: 查询会员伞下血缘业绩 + * 查询会员伞下血缘业绩 **/ BigDecimal queryCuMemberUnderBloodAchieveByPkMember(MemberAchieveDisParam memberAchieveDisParam); @@ -91,7 +91,7 @@ public interface ICuMemberAchieveService extends IService { LocalDate getStartDateByType(Integer dayType, LocalDate localDate); /** - * @description: 业绩分布-新增业绩统计 + * 业绩分布-新增业绩统计 **/ PlaceNewAddAchieveVO placeNewAddAchieveStat(PlaceNewAddAchieveVO pna); @@ -105,38 +105,38 @@ public interface ICuMemberAchieveService extends IService { Date getDateFromYearAndMonth(String year, String month); /** - * @description: 月度业绩-左右区人数详情(最新) + * 月度业绩-左右区人数详情(最新) **/ List placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna); /** - * @description: 月度业绩-左右区人数详情(历史) + * 月度业绩-左右区人数详情(历史) **/ List placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna); /** - * @description:月度业绩-左右区业绩详情 + * 月度业绩-左右区业绩详情 **/ List leftRightAchieveDetails(PlaceNewAddAchieveVO pna); /** - * @description:月度业绩-左右区血缘业绩详情 + * 月度业绩-左右区血缘业绩详情 **/ List leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna); /** - * @description:月度业绩-查询血缘业绩详情 + * 月度业绩-查询血缘业绩详情 **/ List directAchieveDetails(PlaceNewAddAchieveVO pna); /** - * @description: 业绩分布-直推业绩（右图） + * 业绩分布-直推业绩（右图） **/ ParentAchieveVO parentAchieveRight(ParentAchieveVO pa); /** - * @description: 业绩分布-直推业绩（左图） + * 业绩分布-直推业绩（左图） **/ List parentAchieveLeft(ParentAchieveVO pa); @@ -185,7 +185,6 @@ public interface ICuMemberAchieveService extends IService { */ PlacementImageDataVO selectPlaceImage(PlacementDataParam param); - /** * 查询推荐体第图表 * @@ -194,7 +193,6 @@ public interface ICuMemberAchieveService extends IService { */ List selectRecommendVertexImage(PlacementDataParam param); - /** * 查询推荐团队图表 * @@ -218,14 +216,4 @@ public interface ICuMemberAchieveService extends IService { **/ List queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); - /** - * 根据实时小区业绩获取奖衔 - * - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @param yesterdayFlag 查询昨日业绩标记（true=查询，false=不查询） - * @return Integer - */ - CuMemberAwardsUnderVO getPkAwardBySmallAchieve(Long pkMember, Integer pkCountry, boolean yesterdayFlag); - } 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 53ca4905..a529bede 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 @@ -312,12 +312,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl awardsList = iAwardsServiceApi.queryAwards(pkCountry).getData(); - cuMemberAwardsUnderVO.setAwardsList(awardsList); - //获取当前会员的奖衔 - cuMemberAwardsUnderVO.setPkAwards(getMemberAwards(awardsList, cuMemberAwardsUnderVO.getSumRealPv())); - return cuMemberAwardsUnderVO; - } - - /** - * 获取会员奖衔 - * - * @param awardsList 奖衔列表 - * @param sumRealPv 小区业绩 - * @return Integer - */ - - private Integer getMemberAwards(List awardsList, BigDecimal sumRealPv) { - for (BdAwards awards : awardsList) { - BigDecimal communityCheck = awards.getCommunityCheck(); - BigDecimal communityCheckEnd = awards.getCommunityCheckEnd(); - if (sumRealPv.compareTo(communityCheck) >= 0 && null != communityCheckEnd && communityCheckEnd.compareTo(sumRealPv) > 0) { - return awards.getPkId(); - } - } - return null; - } - @Override public CuMemberAwardsDisVO selectAwardsByPkMember(Long pkMember, Integer pkCountry) { BigDecimal rate = null; @@ -817,10 +712,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl placeNewAddAchieveDetails(PlaceNewAddAchieveVO pna) { return baseMapper.placeNewAddAchieveDetails(pna); } - /** - * 月度业绩-左右区人数详情(历史) - **/ @Override public List placeNewAddAchieveHistoryDetails(PlaceNewAddAchieveVO pna) { return baseMapper.placeNewAddAchieveHistoryDetails(pna); } - /** - * 月度业绩-左右区业绩详情 - **/ @Override public List leftRightAchieveDetails(PlaceNewAddAchieveVO pna) { return baseMapper.leftRightAchieveDetails(pna); } - /** - * 月度业绩-左右区血缘业绩详情 - **/ @Override public List leftRightDirectAchieveDetails(PlaceNewAddAchieveVO pna) { return baseMapper.leftRightDirectAchieveDetails(pna); } - /** - * 月度业绩-查询血缘业绩详情 - **/ @Override public List directAchieveDetails(PlaceNewAddAchieveVO pna) { return baseMapper.directAchieveDetails(pna); } - /** * 业绩分布-直推业绩（右图） **/ @@ -1199,7 +1071,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl(); } - /** - * 查询会员真实业绩 - */ @Override public RealPerformanceVo queryRealPerformance(Long pkMember, Integer pkCountry, Integer month) { R currencyDto = iCurrencyServiceApi.getCurrency(pkCountry); @@ -1428,7 +1294,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl currencyDto = iCurrencyServiceApi.getCurrency(pkCountry); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java index ab75377d..c1d56600 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java @@ -167,9 +167,14 @@ public interface ICuMemberBusinessService { */ Boolean updateMemberLevel(CuMember cuMember, SaOrder saOrder, Integer pkOldLevel); - /* + /** * 查询会员的安置位置 - **/ + * + * @param cuMember + * @param isFirst 是否首单 + * @param isFirstAchieve 是否校验首购业绩 + * @return + */ CuMember queryCuMemberPlaceDept(CuMember cuMember, Boolean isFirst, Boolean isFirstAchieve); /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 56fd5f4f..60e8874e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -37,7 +37,7 @@ public interface ICuMemberService extends IService { Boolean saveMember(CuMember cuMember); /* - * @description: 查询网体是否存在推荐人 + * 查询网体是否存在推荐人 **/ Integer queryCuMemberByPkMember(Long pkReference); @@ -65,7 +65,7 @@ public interface ICuMemberService extends IService { List getMemberInfoByCondition(CuMember cuMember); /* - * @description: 根据条件查询会员信息，查询单表 + * 根据条件查询会员信息，查询单表 **/ List queryMemberByCondition(CuMember cuMember); @@ -86,12 +86,12 @@ public interface ICuMemberService extends IService { CuMember getMember(Long pkId); /* - * @description: 查询会员 + * 查询会员 **/ CuMember queryMember(String memberCode); /* - * @description: 查询会员 + * 查询会员 **/ CuMember queryMember(Long pkMember); @@ -194,14 +194,14 @@ public interface ICuMemberService extends IService { List queryCuMemberByCondition(CuMemberVO memberParam); /* - * @description: 查询会员信息，根据条件 + * 查询会员信息，根据条件 **/ List queryCuMemberByMemberList(List cuMemberVOList, CuMemberVO memberParam); List queryCuMemberByMemberListExcel(CuMemberVO memberParam); /** - * @description: 查询真实信息 + * 查询真实信息 **/ List realCuMemberByCondition(CuMemberVO memberParam); @@ -262,22 +262,22 @@ public interface ICuMemberService extends IService { CuMember createEmptyOrderMember(CuMemberExt member); /** - * @description: 特殊业务-修改会员编号列表 + * 特殊业务-修改会员编号列表 **/ List puCodeList(UpdateCodeVO updateCodeVO); /** - * @description: 查询会员有效期休止期 + * 查询会员有效期休止期 **/ List getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO); /** - * @description: 零元撤单签呈列表 + * 零元撤单签呈列表 **/ List zeroByBusinessList(AnalysisBusinessAppealParam analysisBusinessAppealParam); /** - * @description: 查询会员变更前信息 + * 查询会员变更前信息 **/ UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO); @@ -296,47 +296,47 @@ public interface ICuMemberService extends IService { String updateParent(ParentParam parentParam); /** - * @description: 批量修改会员编号 + * 批量修改会员编号 **/ UpdateCodeVO updateCode(UpdateCodeVO updateCodeVO); /** - * @description: 修改会员续约发起签呈 + * 修改会员续约发起签呈 **/ UpdateExpireStopVO upExpireStop(UpdateExpireStopVO upESVO); /** - * @description: 修改会员续约-审核通过驳回 + * 修改会员续约-审核通过驳回 **/ boolean upExpireStopProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 发起签呈-修改会员编号 + * 发起签呈-修改会员编号 **/ UpdateCodeVO petition(UpdateCodeVO updateCodeVO); /** - * @description: 审核通过根据业务单号，业务类型批量修改业务数据 + * 审核通过根据业务单号，业务类型批量修改业务数据 **/ boolean updateCodeByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 政策币签呈审核 + * 政策币签呈审核 **/ boolean upPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description:删除政策币业务审核 + * 删除政策币业务审核 **/ boolean delPolicyCurrencyProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 审核驳回 根据业务单号，业务类型批量修改业务数据 + * 审核驳回 根据业务单号，业务类型批量修改业务数据 **/ boolean updateCodeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 真实奖衔控制-通过或驳回 + * 真实奖衔控制-通过或驳回 **/ boolean awardsControlPetition(ApprovalBusinessResultDTO approvalBusinessResultDTO); @@ -367,47 +367,47 @@ public interface ICuMemberService extends IService { Integer batchUpdateMemberByBusinessType(HandleBusinessVO handleBusinessVO); /** - * @description: 招商列表 + * 招商列表 **/ List selectBiddingList(MarketNewsParam marketNewsParam); /** - * @description: + * **/ List upsettleCountryList(UpdateSettleCountryVO upseCountryVO); /** - * @description:查询修改政策币列表 + * 查询修改政策币列表 **/ List upPolicyCurrencyList(UpPolicyCurrencyVO upVO); /** - * @description: 特殊业务-修改结算国 + * 特殊业务-修改结算国 **/ UpdateSettleCountryVO updateSettleCountry(UpdateSettleCountryVO upseCountryVO); /** - * @description: 特殊业务-修改政策币 + * 特殊业务-修改政策币 **/ UpPolicyCurrencyVO upPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 特殊业务-删除政策币业务 + * 特殊业务-删除政策币业务 **/ UpPolicyCurrencyVO delPolicyCurrency(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 发起签呈-修改结算国 + * 发起签呈-修改结算国 **/ UpdateSettleCountryVO petition(UpdateSettleCountryVO upseCountryVO); /** - * @description: 发起签呈-修改政策币发起签呈 + * 发起签呈-修改政策币发起签呈 **/ UpPolicyCurrencyVO petition(UpPolicyCurrencyVO policyCurrencyVO); /** - * @description: 零元撤单审核-审核通过、驳回 + * 零元撤单审核-审核通过、驳回 **/ boolean zeroByBusinessNo(ApprovalBusinessResultDTO approvalBusinessResultDTO); @@ -423,37 +423,37 @@ public interface ICuMemberService extends IService { List> systemTjSetListTree(List memberSettleExtList, CuMemberSettleExt memberSettleExt, String settleTableName, Boolean isMemberSecord); /** - * @description: 特殊业务-修改结算国-审核通过 + * 特殊业务-修改结算国-审核通过 **/ boolean updateSettleCountryAdopt(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 特殊业务-修改结算国-审核驳回 + * 特殊业务-修改结算国-审核驳回 **/ boolean updateSettleCountryReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 校验会员是否有充值审核 + * 校验会员是否有充值审核 **/ Integer checkCecharge(Long pkMember); /** - * @description: 校验会员是否有提现审核 + * 校验会员是否有提现审核 **/ Integer checkWithdraw(Long pkMember); /** - * @description: 校验会员所有账户是否有余额 + * 校验会员所有账户是否有余额 **/ Integer checkAccount(Long pkMember); /** - * @description: 查询会员是否存在未完成基础业务办理 + * 查询会员是否存在未完成基础业务办理 **/ Integer checkmsLogCount(Long pkMember, Integer editType); /** - * @description: 查询会员是否存在未完成注水业绩业务 + * 查询会员是否存在未完成注水业绩业务 **/ Integer checkMemberAchieveCount(Long pkMember); @@ -484,12 +484,12 @@ public interface ICuMemberService extends IService { List> systemAzSetListTreeFive(List list, CuMemberSettleExt memberSettleExt); /** - * @description: 获取等级的翻译KEY值 + * 获取等级的翻译KEY值 **/ Integer getGradeTranslateValue(Integer pkId); /** - * @description: 获取奖衔的翻译KEY值 + * 获取奖衔的翻译KEY值 **/ Integer getAwardsTranslateValue(Integer pkCountry, Integer pkId); @@ -715,7 +715,7 @@ public interface ICuMemberService extends IService { void updateParentByBusinessNoReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); /* - * @description: 查询会员左右区人数 + * 查询会员左右区人数 **/ List queryMemberLeftRightCount(Long pkMember); @@ -768,7 +768,7 @@ public interface ICuMemberService extends IService { List selectPlaceErrorCode(); /* - * @description: 查询伞下会员 + * 查询伞下会员 **/ Boolean queryCuMemberUnderUmbrella(Long pkMember); @@ -853,7 +853,7 @@ public interface ICuMemberService extends IService { List getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam); /** - * @description: 查询表是否存在 + * 查询表是否存在 **/ Integer selectExistTable(String tableName); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 0cd201f9..f5c86296 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -1261,8 +1261,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { /** * 获得左右区 * - * @param isFirst 是否收单 - * @param isFirstAchieve 受否判断首购业绩 + * @param isFirst 是否首单 + * @param isFirstAchieve 是否判断首购业绩 * @param cuMemberAchieve 业绩 */ private Integer getPlaceDept(Boolean isFirst, Boolean isFirstAchieve, CuMemberAchieve cuMemberAchieve, Long pkParent) { @@ -1270,14 +1270,14 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { if (!isFirst) { if (cuMemberAchieve != null) { if (isFirstAchieve) { - // 分享专区，快速注册判断首购业绩，比较左右区 放入小区 + // 快速注册判断首购业绩，比较左右区放入小区 if (ComputeUtil.compareGreaterThan(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv())) { placeDept = EPlaceDept.RIGHT_DEPT.getValue(); } } else { - // 嗨粉判断复购业绩 放入小区 - if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getRepASumPv(), cuMemberAchieve.getRepBSumPv()))) { - if (ComputeUtil.compareValue(cuMemberAchieve.getRepASumPv(), cuMemberAchieve.getRepBSumPv())) { + // TODO 188判断左右区结余小区 + if (ComputeUtil.compareValue(ComputeUtil.computeAdd(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv()))) { + if (ComputeUtil.compareValue(cuMemberAchieve.getASumPv(), cuMemberAchieve.getBSumPv())) { placeDept = EPlaceDept.RIGHT_DEPT.getValue(); } } else { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java index 3584c3f7..d5499423 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java @@ -1,7 +1,6 @@ package com.hzs.member.structure.controller.api; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.tree.Tree; @@ -15,25 +14,19 @@ import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MemberConstants; import com.hzs.common.core.constant.MemberFrameworkConstants; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.ECategory; import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.EPlaceDept; import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.config.BdBonusExpand; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; import com.hzs.member.achieve.service.ICuMemberTreeService; import com.hzs.member.base.service.ICuMemberService; @@ -60,7 +53,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @RestController @RequestMapping("/api/member-structure") @@ -83,168 +75,46 @@ public class ApiMemberStructureController extends BaseController { @DubboReference ISystemConfigServiceApi systemConfigServiceApi; - /** - * 安置架构网体 - */ -// @GetMapping("/az-framework") - public AjaxResult azFramework(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { - if (level == null) { - level = 7; - } - // 体系 - UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); - List vertexIdList = userAuthorityDTO.getVertexIdList(); - Date date = DateUtils.currentDate(); - if (DateUtils.getCurrentHour() < 2) { - date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); - } - String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); - Long pkMember; - - if (StringUtils.isNotBlank(memberCode)) { - CuMember member = iCuMemberService.getMember(memberCode); - if (member == null) { - return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); - } - - // 查询编号是否在登录用户伞下 - List memberList = iCuMemberService.queryPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); - if (CollectionUtil.isNotEmpty(memberList)) { - pkMember = member.getPkId(); - } else { - // 如果查询编号不存在伞下 则直接查询订单为当前登录人的 - pkMember = SecurityUtils.getUserId(); - } - } else { - CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode()); - pkMember = member.getPkId(); - } - - Integer period = null; - Date settleDate = null; - if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); - period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); - } else { - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); - } - } - - // 查询当天 (秒结) - if (settleDate != null && - DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { - // 会员结算秒结表 - String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; - // 查询所有用户表数据 id - // 查询秒结 表 如果 秒结表 没有则去 历史表 - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber != null && tableNumber == 1) { - List cuMemberSettleExts; - // 查询今日会员表是否有值 - Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); - if (treeMemberCount > 0) { - //表格存在 - cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); - } else { - DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - } - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); - } - // 查询顶点 - CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); - if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { - memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); - } - memberSettleExt.setLevel(0); - - // 添加自身 - cuMemberSettleExts.add(memberSettleExt); - List cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); - List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); - // 安置架构 无点位 追加空点位 - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - Map allCountryData = allCountryMap.getData(); - List> trees = setTreeList(build, level, allCountryData); - return AjaxResult.success(trees); - } - } else { - // 查询 历史 - String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - - if (tableNumber != null && tableNumber == 1) { - // 表示表格存在 - // 查询顶点 - CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); - if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { - memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); - } - memberSettleExt.setLevel(0); - //查询下级 - List list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); - // 无法查询到自身 所有单独查询自身并且添加 - list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); - List> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExtList, memberSettleExt); - // 安置架构 无点位 追加空点位 - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - Map allCountryData = allCountryMap.getData(); - List> trees = setTreeList(build, level, allCountryData); - return AjaxResult.success(trees); - } - } - return AjaxResult.success(); - } - /** * @param build * @return */ public List> setTreeList(List> build, Integer numberOfPlies, Map allCountryData) { - Integer pkCountry = SecurityUtils.getPkCountry(); - String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); - String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); +// Integer pkCountry = SecurityUtils.getPkCountry(); +// String nationalFlag1 = allCountryData.get(pkCountry).getNationalFlag1(); +// String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); for (Tree stringTree : build) { Integer level = (Integer) stringTree.get("level"); if (level < (numberOfPlies - 1)) { if (stringTree.getChildren() != null) { if (stringTree.getChildren().size() == 0) { Tree emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); - emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); +// emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("level", level + 1); - emptyNode1.putExtra("memberCode", ""); - emptyNode1.setName("-"); +// emptyNode1.putExtra("memberCode", ""); +// emptyNode1.setName("-"); emptyNode1.setParentId(stringTree.getId()); - emptyNode1.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode1.setId(RandomUtil.randomNumbers(3)); - emptyNode1.putExtra("settleCountryUrl", nationalFlag1); - emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode1.putExtra("countryUrl", nationalFlag1); - emptyNode1.putExtra("countryUrl2", nationalFlag2); +// emptyNode1.putExtra("avatarUrl", MemberFrameworkConstants.xuni); +// emptyNode1.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode1.putExtra("countryUrl", nationalFlag1); +// emptyNode1.putExtra("countryUrl2", nationalFlag2); stringTree.getChildren().add(emptyNode1); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); Tree emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); - emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); +// emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("level", level + 1); - emptyNode2.putExtra("memberCode", ""); - emptyNode2.setName("-"); +// emptyNode2.putExtra("memberCode", ""); +// emptyNode2.setName("-"); emptyNode2.setParentId(stringTree.getId()); emptyNode2.setId(RandomUtil.randomNumbers(3)); - emptyNode2.putExtra("settleCountryUrl", nationalFlag1); - emptyNode2.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode2.putExtra("countryUrl", nationalFlag1); - emptyNode2.putExtra("countryUrl2", nationalFlag2); - emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); +// emptyNode2.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode2.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode2.putExtra("countryUrl", nationalFlag1); +// emptyNode2.putExtra("countryUrl2", nationalFlag2); +// emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); stringTree.getChildren().add(emptyNode2); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); } else if (stringTree.getChildren().size() == 1) { @@ -252,31 +122,31 @@ public class ApiMemberStructureController extends BaseController { Integer pd = (Integer) cli.get(0).get("placeDept"); Tree emptyNode = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); if (pd.equals(EPlaceDept.LEFT_DEPT.getValue())) { - emptyNode.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); +// emptyNode.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode.putExtra("level", level + 1); - emptyNode.putExtra("memberCode", ""); - emptyNode.setName("-"); - emptyNode.putExtra("settleCountryUrl", nationalFlag1); - emptyNode.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode.putExtra("countryUrl", nationalFlag1); - emptyNode.putExtra("countryUrl2", nationalFlag2); +// emptyNode.putExtra("memberCode", ""); +// emptyNode.setName("-"); +// emptyNode.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode.putExtra("countryUrl", nationalFlag1); +// emptyNode.putExtra("countryUrl2", nationalFlag2); +// emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode.setParentId(stringTree.getId()); emptyNode.setId(RandomUtil.randomNumbers(3)); - emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); stringTree.getChildren().add(emptyNode); setTreeList(stringTree.getChildren(), numberOfPlies, allCountryData); } else { - emptyNode.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); +// emptyNode.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode.putExtra("level", level + 1); - emptyNode.putExtra("memberCode", ""); - emptyNode.setName("-"); +// emptyNode.putExtra("memberCode", ""); +// emptyNode.setName("-"); emptyNode.setParentId(stringTree.getId()); emptyNode.setId(RandomUtil.randomNumbers(3)); - emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); - emptyNode.putExtra("settleCountryUrl", nationalFlag1); - emptyNode.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode.putExtra("countryUrl", nationalFlag1); - emptyNode.putExtra("countryUrl2", nationalFlag2); +// emptyNode.putExtra("avatarUrl", MemberFrameworkConstants.xuni); +// emptyNode.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode.putExtra("countryUrl", nationalFlag1); +// emptyNode.putExtra("countryUrl2", nationalFlag2); stringTree.getChildren().add(emptyNode); List> strTree = stringTree.getChildren(); List> sortChildren = new ArrayList<>(); @@ -303,29 +173,29 @@ public class ApiMemberStructureController extends BaseController { // 等于空 List> children = new ArrayList<>(); Tree emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); - emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); +// emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("level", level + 1); - emptyNode1.putExtra("memberCode", ""); - emptyNode1.setName("-"); - emptyNode1.putExtra("avatarUrl", MemberFrameworkConstants.xuni); - emptyNode1.putExtra("settleCountryUrl", nationalFlag1); - emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode1.putExtra("countryUrl", nationalFlag1); - emptyNode1.putExtra("countryUrl2", nationalFlag2); +// emptyNode1.putExtra("memberCode", ""); +// emptyNode1.setName("-"); +// emptyNode1.putExtra("avatarUrl", MemberFrameworkConstants.xuni); +// emptyNode1.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode1.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode1.putExtra("countryUrl", nationalFlag1); +// emptyNode1.putExtra("countryUrl2", nationalFlag2); emptyNode1.setParentId(stringTree.getId()); emptyNode1.setId(RandomUtil.randomNumbers(3)); children.add(emptyNode1); Tree emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); - emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); +// emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("level", level + 1); - emptyNode2.putExtra("memberCode", ""); - emptyNode2.setName("-"); - emptyNode2.putExtra("settleCountryUrl", nationalFlag1); - emptyNode2.putExtra("settleCountryUrl2", nationalFlag2); - emptyNode2.putExtra("countryUrl", nationalFlag1); - emptyNode2.putExtra("countryUrl2", nationalFlag2); - emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); +// emptyNode2.putExtra("memberCode", ""); +// emptyNode2.setName("-"); +// emptyNode2.putExtra("settleCountryUrl", nationalFlag1); +// emptyNode2.putExtra("settleCountryUrl2", nationalFlag2); +// emptyNode2.putExtra("countryUrl", nationalFlag1); +// emptyNode2.putExtra("countryUrl2", nationalFlag2); +// emptyNode2.putExtra("avatarUrl", MemberFrameworkConstants.xuni); emptyNode2.setParentId(stringTree.getId()); emptyNode2.setId(RandomUtil.randomNumbers(3)); children.add(emptyNode2); @@ -338,161 +208,6 @@ public class ApiMemberStructureController extends BaseController { return build; } - private Integer defaultLevel = 5; - - /** - * 推荐架构网体 - */ -// @GetMapping("/tj-framework") - public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { - Date date = DateUtils.currentDate(); - if (DateUtils.getCurrentHour() < 2) { - date = DateUtils.beforeDate(2, ChronoUnit.DAYS, date); - } - String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); - - // 体系 - UserAuthorityDTO userAuthorityDTO = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData(); - List vertexIdList = userAuthorityDTO.getVertexIdList(); - Long pkMember; - if (StringUtils.isNotBlank(memberCode)) { - CuMember member = iCuMemberService.getMember(memberCode); - if (member == null) { - return AjaxResult.error("会员编号不存在"); - } - // 查询编号是否在登录用户伞下 - if (!memberCode.equals(SecurityUtils.getMemberCode())) { - Long placeCount = iCuMemberService.checkPlaceSponsorUnderUmbrella(SecurityUtils.getUserId(), memberCode); - if (placeCount == 0) { - // 如果查询编号不存在伞下 则直接查询订单为当前登录人的 - pkMember = SecurityUtils.getUserId(); - } else { - pkMember = member.getPkId(); - } - } else { - pkMember = SecurityUtils.getUserId(); - } - } else { - CuMember member = iCuMemberService.getMember(SecurityUtils.getMemberCode()); - pkMember = member.getPkId(); - } - - Integer period = null; - Date settleDate = null; - if (memberSettlePeriodId != null) { - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); - period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); - } else { - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); - } - } - - // 查询当天 (秒结) - if (settleDate != null && - DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { - // 查询所有用户表数据 id - // 会员结算秒结表 - String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - if (tableNumber != null && tableNumber == 1) { - //表格存在 - if (level == null) { - level = defaultLevel; - } - List cuMemberSettleExts; - // 查询今日会员表是否有值 - Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); - if (treeMemberCount > 0) { - //表格存在 - cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); - } else { - DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - } - settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); - } - // 查询顶点 - CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); - if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { - memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); - } - memberSettleExt.setLevel(0); - // 添加自身 - cuMemberSettleExts.add(memberSettleExt); - List cuMemberSettleExtList = cuMemberSettleExts.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); - List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); - // 安置架构 无点位 追加空点位 - return AjaxResult.success(build); - } else { - // 查询 历史 - // 查询表格是否存在 - if (level == null) { - level = defaultLevel; - } - if (tableNumber == null) { - settleTableName = null; - } - // 查询顶点 - CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); - if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { - memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); - } - memberSettleExt.setLevel(0); - //查询下级 - List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); - // 无法查询到自身 所有单独查询自身并且添加 - list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); - List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, true); - // 安置架构 无点位 追加空点位 - R> allCountryMap = iCountryServiceApi.getAllCountryMap(); - Map allCountryData = allCountryMap.getData(); - return AjaxResult.success(setTreeList(build, level, allCountryData)); - } - } else { - if (level == null) { - level = defaultLevel; - } - DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - } - // 查询 历史 - String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; - Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); - - if (tableNumber == null) { - // 表示表格存在 - settleTableName = null; - } - // 查询顶点 - CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); - - if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { - memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); - } - memberSettleExt.setLevel(0); - //查询下级 - List list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); - // 无法查询到自身 所有单独查询自身并且添加 - list.add(memberSettleExt); - List cuMemberSettleExtList = list.stream().peek(a -> a.setMemberName(CommonUtil.getMemberName(a.getPkVertex(), a.getMemberName(), a.getNickName()))).collect(Collectors.toList()); - List> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExtList, memberSettleExt, settleTableName, false); - // 安置架构 无点位 追加空点位 - return AjaxResult.success(build); - } - } - /** * 查询最近一月所有期数 * @@ -574,16 +289,14 @@ public class ApiMemberStructureController extends BaseController { time = beforeLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); Long pkMember = SecurityUtils.getUserId(); Integer period = null; - Date settleDate = null; CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); - settleDate = csPeriod.getSettleDate(); } // 查询当天 (秒结) // if (settleDate != null // && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { - if(1 == 2) { + if (1 == 2) { // 会员结算秒结表 String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; // 查询所有用户表数据 id @@ -664,7 +377,7 @@ public class ApiMemberStructureController extends BaseController { result = setTreeList(build, level, allCountryData); } } - BdBonusExpand bdBonusExpand = systemConfigServiceApi.getBdBonusExpand().getData(); + BdBonusExpand bdBonusExpand = systemConfigServiceApi.getBdBonusExpand().getData(); assert result != null; String leftFirstSurplusStr = result.get(0).get("leftFirstSurplus").toString(); String rightFirstSurplusStr = result.get(0).get("rightFirstSurplus").toString(); @@ -675,33 +388,33 @@ public class ApiMemberStructureController extends BaseController { result.get(0).putExtra("leftFirstSurplusAll", formatBigDecimal(leftFirstSurplus)); result.get(0).putExtra("rightFirstSurplusAll", formatBigDecimal(rightFirstSurplus)); log.info("result : {}", JSONUtil.toJsonStr(result)); - if(leftFirstSurplus.compareTo(rightFirstSurplus) >= 0){ + if (leftFirstSurplus.compareTo(rightFirstSurplus) >= 0) { // 左大右小 - if(leftFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0){ + if (leftFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0) { result.get(0).putExtra("leftFirstSurplus", bdBonusExpand.getExpandBig().toString()); } - if(rightFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0){ + if (rightFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0) { result.get(0).putExtra("rightFirstSurplus", bdBonusExpand.getExpandSmall().toString()); } - }else{ + } else { // 左小右大 - if(leftFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0){ + if (leftFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0) { result.get(0).putExtra("leftFirstSurplus", bdBonusExpand.getExpandSmall().toString()); } - if(rightFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0){ + if (rightFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0) { result.get(0).putExtra("rightFirstSurplus", bdBonusExpand.getExpandBig().toString()); } } JSONObject data = new JSONObject(); data.put("tree", result); - data.put("config", bdBonusExpand); - return AjaxResult.success(data); } private static final BigDecimal FIVE_MILLION = BigDecimal.valueOf(5_000_000); // 500万的固定值 + /** * 格式化BigDecimal数值为指定规则的字符串 + * * @param input 输入的BigDecimal数值（需非null） * @return 格式化后的字符串（小于500万返回四舍五入两位小数，否则返回"500万+"） */ 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 8f9d3ff0..5013350d 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 @@ -123,7 +123,6 @@ order by s.settle_date - - - - - - - -