From 7748af02ae01ecbba8b73ddb068558caeeac3fbd Mon Sep 17 00:00:00 2001 From: jiangchao <281119120@qq.com> Date: Tue, 1 Apr 2025 14:33:10 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B4=E4=BD=93=E8=B0=83=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/perk/IMemberPerkServiceApi.java | 21 - .../com/hzs/sale/wares/IWaresServiceApi.java | 14 - .../hzs/system/config/IAccountServiceApi.java | 2 - .../com/hzs/third/email/IEmailServiceApi.java | 3 +- .../achieve/mapper/CuMemberTreeMapper.java | 87 +- .../impl/CuMemberMonthAchieveServiceImpl.java | 76 +- .../service/impl/CuMemberTreeServiceImpl.java | 20 +- .../provider/MemberSettleBonusProvider.java | 18 +- .../bonus/service/ICuMemberBonusService.java | 90 +- .../service/impl/BonusSettleServiceImpl.java | 46 +- .../impl/CuMemberBonusServiceImpl.java | 7 +- .../achieve/CuMemberMonthAchieveMapper.xml | 112 +- .../member/achieve/CuMemberTreeMapper.xml | 1933 +++++++++++------ .../mapper/CuMemberPerkDetailMapper.java | 34 - .../CuMemberPerkDetailMemberMapper.java | 16 - .../mapper/CuMemberPerkDetailOrderMapper.java | 21 - .../member/mapper/CuMemberPerkMapper.java | 45 - .../provider/MemberPerkServiceProvider.java | 53 - .../service/ICuMemberPerkBusinessService.java | 11 - .../ICuMemberPerkDetailMemberService.java | 16 - .../ICuMemberPerkDetailOrderService.java | 19 - .../service/ICuMemberPerkDetailService.java | 31 - .../service/ICuMemberPerkProductService.java | 10 - .../member/service/ICuMemberPerkService.java | 41 - .../impl/CuMemberPerkBusinessServiceImpl.java | 276 --- .../CuMemberPerkDetailMemberServiceImpl.java | 10 - .../CuMemberPerkDetailOrderServiceImpl.java | 10 - .../impl/CuMemberPerkDetailServiceImpl.java | 19 - .../impl/CuMemberPerkProductServiceImpl.java | 17 - .../service/impl/CuMemberPerkServiceImpl.java | 22 - .../member/CuMemberPerkDetailMapper.xml | 84 - .../member/CuMemberPerkDetailMemberMapper.xml | 26 - .../member/CuMemberPerkDetailOrderMapper.xml | 29 - .../report/member/CuMemberPerkMapper.xml | 155 -- .../member/CuMemberPerkProductMapper.xml | 7 - .../wares/mapper/BdWaresDetailMapper.java | 11 - .../wares/provider/WaresServiceProvider.java | 11 - .../wares/service/IBdWaresDetailService.java | 10 - .../impl/BdWaresDetailServiceImpl.java | 5 - .../mapper/sale/wares/BdWaresDetailMapper.xml | 40 - .../mapper/sale/wares/BdWaresMapper.xml | 2 +- .../third/email/provider/EmailProvider.java | 18 +- .../com/hzs/third/job/BonusSettleJob.java | 6 - .../java/com/hzs/third/job/MemberJob.java | 6 +- .../java/com/hzs/third/job/ReportJob.java | 40 - .../main/java/com/hzs/third/job/WaresJob.java | 30 +- .../job/controller/JobTestController.java | 23 +- 47 files changed, 1477 insertions(+), 2106 deletions(-) delete mode 100644 hzs-api/hzs-api-report/src/main/java/com/hzs/report/perk/IMemberPerkServiceApi.java delete mode 100644 hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/provider/MemberPerkServiceProvider.java delete mode 100644 hzs-third/src/main/java/com/hzs/third/job/ReportJob.java diff --git a/hzs-api/hzs-api-report/src/main/java/com/hzs/report/perk/IMemberPerkServiceApi.java b/hzs-api/hzs-api-report/src/main/java/com/hzs/report/perk/IMemberPerkServiceApi.java deleted file mode 100644 index 3c444eb9..00000000 --- a/hzs-api/hzs-api-report/src/main/java/com/hzs/report/perk/IMemberPerkServiceApi.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hzs.report.perk; - -import com.hzs.common.core.domain.R; - -/** - * @Description: 会员补贴dubbo服务接口 - * @Author: jiang chao - * @Time: 2024/4/22 16:38 - * @Classname: MemberPerkServiceApi - * @PackageName: com.hzs.report.stat - */ -public interface IMemberPerkServiceApi { - - /** - * 会员补贴处理 - * - * @return - */ - R memberPerkHandle(); - -} diff --git a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java b/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java index 12c6f4fe..16947098 100644 --- a/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java +++ b/hzs-api/hzs-api-sale/src/main/java/com/hzs/sale/wares/IWaresServiceApi.java @@ -1,13 +1,8 @@ package com.hzs.sale.wares; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.sale.ext.BdWaresDetailExt; -import com.hzs.sale.wares.dto.WaresDTO; -import com.hzs.sale.wares.dto.WaresPreSaleDTO; import java.util.Date; -import java.util.List; -import java.util.Map; /** * @Description: 商品对外提供接口 @@ -49,13 +44,4 @@ public interface IWaresServiceApi { */ void updateByAutoStartAndAutoEnd(Date currentTime); - /** - * 根据条件查询商品信息 - * - * @param specialArea 专区 - * @return: List - * @Author: sui q - * @Date: 2022/9/16 11:13 - */ - R> queryWaresDetailBySkuCodeList(Integer specialArea, List skuCodeList); } diff --git a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java b/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java index 6924e3c0..75656001 100644 --- a/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java +++ b/hzs-api/hzs-api-system/src/main/java/com/hzs/system/config/IAccountServiceApi.java @@ -103,7 +103,6 @@ public interface IAccountServiceApi { */ R queryPostageAccount(Integer pkCountry); - /** * @description: 会员端账户查询 * @author: zhang jing @@ -113,5 +112,4 @@ public interface IAccountServiceApi { **/ R> memberAccountByType(Integer pkCountry); - } diff --git a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java b/hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java index 41b480a3..f5f74bb0 100644 --- a/hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java +++ b/hzs-api/hzs-api-third/src/main/java/com/hzs/third/email/IEmailServiceApi.java @@ -23,7 +23,6 @@ public interface IEmailServiceApi { * @param eMailType 邮件类型 * @return */ - R sendMail(List recipientList, String title, String content, EMailType eMailType); + R sendMail(List recipientList, String title, String content, EMailType eMailType); - R sendMessage(); } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java index 34e25763..45a5423c 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java @@ -12,9 +12,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员网体历史记录 Mapper 接口 - *

* * @author hzs * @since 2022-10-31 @@ -157,7 +155,8 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param: null null **/ void mergeCuMemberTreeBySettleDate(@Param("targetTableName") String targetTableName, - @Param("sourceTableName") String sourceTableName, @Param("period") Integer period); + @Param("sourceTableName") String sourceTableName, @Param("period") Integer period); + /** * 迁移月表数据，先删除 * @@ -274,6 +273,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @Date: 2022/11/4 17:41 */ List queryCuMemberSettleEnoughAwardAchieve(String settleTableName); + /* * @description: 回退会员奖衔 * @author: sui q @@ -313,7 +313,8 @@ public interface CuMemberTreeMapper extends BaseMapper { /** * 根据订单，查询出网体中记录的会员数据及推荐人 - * @param settleTableName 结算表 + * + * @param settleTableName 结算表 * @param serviceMemberSet 会员编号 * @return: List * @Author: sui q @@ -333,15 +334,15 @@ public interface CuMemberTreeMapper extends BaseMapper { * @Date: 2022/11/4 18:21 */ Integer queryCuMemberSettlePlaceUnderUmbrella(@Param("settleTableName") String settleTableName, - @Param("awardsValue") Integer awardsValue, - @Param("placeDept") Integer placeDept, - @Param("pkMember") Long pkMember); + @Param("awardsValue") Integer awardsValue, + @Param("placeDept") Integer placeDept, + @Param("pkMember") Long pkMember); /** * 查询会员结算表，查询出结算表中会员血缘关系满足等级 * - * @param settleTableName 结算表 - * @param pkMember 会员 + * @param settleTableName 结算表 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2022/11/4 18:21 @@ -385,7 +386,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @Date: 2022/11/15 13:43 */ List batchQuerySpecialCuMemberSettleParent(@Param("settleTableName") String settleTableName, - @Param("pkMemberList") List pkMemberList); + @Param("pkMemberList") List pkMemberList); /* @@ -406,7 +407,8 @@ public interface CuMemberTreeMapper extends BaseMapper { * @Date: 2022/11/15 13:43 */ List batchQueryCuMemberSettleParentForSpecial(@Param("settleTableName") String settleTableName, - @Param("pkMemberList") List pkMemberList); + @Param("pkMemberList") List pkMemberList); + /** * 更新会员网体奖衔数据，更新月表、结算表 * @@ -480,8 +482,8 @@ public interface CuMemberTreeMapper extends BaseMapper { /** * 根据会员编号查询会员伞上安置人秒结数据 * - * @param secondTableName 秒接 - * @param pkMember 会员 + * @param secondTableName 秒接 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2023/2/2 21:01 @@ -491,8 +493,8 @@ public interface CuMemberTreeMapper extends BaseMapper { /** * 根据会员编号查询会员伞上安置人秒结数据 * - * @param secondTableName 秒接 - * @param pkMember 会员 + * @param secondTableName 秒接 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2023/2/2 21:01 @@ -530,7 +532,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param pkMember * @return */ - List queryCuMemberTreePlaceParentTable(@Param("tableName") String tableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList,@Param("level") Integer level); + List queryCuMemberTreePlaceParentTable(@Param("tableName") String tableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList, @Param("level") Integer level); /** * 根据pkmember查询 @@ -548,7 +550,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param pkMember * @return */ - List queryCuMemberTreeParentTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("level") Integer level); + List queryCuMemberTreeParentTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("level") Integer level); /** * 查询直推人数 @@ -566,7 +568,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param pkMember * @return */ - List queryCuMemberTreePlaceParentHistoryTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList,@Param("level") Integer level); + List queryCuMemberTreePlaceParentHistoryTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList, @Param("level") Integer level); /** * 查询每一期汇总 @@ -574,7 +576,7 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param settleTableName * @return */ - CensusSummaryVo queryCuMemberTreeParentSumTable(@Param("tableName") String settleTableName,@Param("censusSummaryParam") CensusSummaryParam censusSummaryParam); + CensusSummaryVo queryCuMemberTreeParentSumTable(@Param("tableName") String settleTableName, @Param("censusSummaryParam") CensusSummaryParam censusSummaryParam); /* * description: 查询历史网体的最末安置人，左右区一起查出来 @@ -592,100 +594,123 @@ public interface CuMemberTreeMapper extends BaseMapper { * @param: pkMember 会员 **/ List queryCuMemberTree(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("pkPlaceParent") Long pkPlaceParent); + /** * 查询秒结表会员信息 + * * @param pkMember * @param settleTableName * @return */ - List selectByTreeMemberList(@Param("pkMember") Long pkMember,@Param("tableName") String settleTableName,@Param("level") Integer level); + List selectByTreeMemberList(@Param("pkMember") Long pkMember, @Param("tableName") String settleTableName, @Param("level") Integer level); + /** * 查询会员真实业绩 + * * @param pkMember * @return */ - CuMemberSettleExt getCuMemberRealPerformanceByMemberId(@Param("pkMember") Long pkMember,@Param("tableName") String tableName); + CuMemberSettleExt getCuMemberRealPerformanceByMemberId(@Param("pkMember") Long pkMember, @Param("tableName") String tableName); + /** * 查询安置左右区人数 + * * @param memberId 会员id * @param placeDept * @return */ - Long queryPlaceParentPeopleNumber(@Param("memberId") Long memberId,@Param("placeDept") Integer placeDept); + Long queryPlaceParentPeopleNumber(@Param("memberId") Long memberId, @Param("placeDept") Integer placeDept); + /** * 查询推荐大小区人数 + * * @param memberId * @param placeDept * @return */ - Long queryParentPeopleNumber(@Param("memberId") Long memberId,@Param("placeDept") Integer placeDept); + Long queryParentPeopleNumber(@Param("memberId") Long memberId, @Param("placeDept") Integer placeDept); + /** * 查询秒结表是否有值 + * * @param settleTableName * @return */ - Long selectByselectByTreeMemberCount(@Param("tableName") String settleTableName,@Param("pkMember") Long pkMember); + Long selectByselectByTreeMemberCount(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember); + /** * 查询伞下安置新增业绩 + * * @param settleTableName * @param pkMember * @return */ - List brollyBelowResettle(@Param("tableName") String settleTableName,@Param("pkMember") Long pkMember); + List brollyBelowResettle(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember); + /** * 根据pkmember查询 关联parent + * * @param settleTableName * @param pkMember * @return */ - CuMemberSettleExt queryCuMemberTreeByPlacePkMemberTable(@Param("tableName") String settleTableName,@Param("pkMember") Long pkMember); + CuMemberSettleExt queryCuMemberTreeByPlacePkMemberTable(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember); /** * 查询会员直推人数 + * * @param memberIds * @return */ List queryByMemberParentCount(@Param("memberIds") List memberIds); + /** * 查询会员直推业绩 + * * @param settleTableName * @param memberIds * @return */ - List queryByMemberParentSumPv(@Param("tableName") String settleTableName,@Param("memberIds") List memberIds); + List queryByMemberParentSumPv(@Param("tableName") String settleTableName, @Param("memberIds") List memberIds); + /** * 查询历史安置架构 + * * @param settleTableName * @param pkMember * @param memberIdList * @param level * @return */ - List queryCuMemberTreePlaceParentHistoryFramework(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList,@Param("level") Integer level); + List queryCuMemberTreePlaceParentHistoryFramework(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("memberIdList") List memberIdList, @Param("level") Integer level); /** * 查询历史推荐上下架 + * * @param settleTableName * @param pkMember * @param level * @return */ - List queryCuMemberTreeParentHistoryFramework(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("level") Integer level); + List queryCuMemberTreeParentHistoryFramework(@Param("tableName") String settleTableName, @Param("pkMember") Long pkMember, @Param("level") Integer level); /** * 查询历史会员直推人数 + * * @param memberIds * @param settleTableName * @return */ - List queryByMemberParentAndMemberSettleCount(@Param("memberIds") List memberIds,@Param("settleTableName") String settleTableName); + List queryByMemberParentAndMemberSettleCount(@Param("memberIds") List memberIds, @Param("settleTableName") String settleTableName); + /** * 查询会员历史直推业绩 + * * @param settleTableName * @param memberIds * @return */ - List queryByMemberParentSettleSumPv(@Param("tableName") String settleTableName,@Param("memberIds") List memberIds); + List queryByMemberParentSettleSumPv(@Param("tableName") String settleTableName, @Param("memberIds") List memberIds); /* * @description: 每月初初始化奖衔为会员 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java index ae90c861..4a789200 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberMonthAchieveServiceImpl.java @@ -77,44 +77,44 @@ public class CuMemberMonthAchieveServiceImpl extends ServiceImpl cuHonorWallList = cuHonorWallService.queryCuHonorWall(); - Map honorWallMap = new HashMap<>(); - cuHonorWallList.forEach(cuHonorWall -> { - String key = cuHonorWall.getPkCountry().toString() + cuHonorWall.getType() + cuHonorWall.getValue(); - honorWallMap.put(key, cuHonorWall); - }); - List cuMemberHonorWallList = new ArrayList<>(); - // 上月期间，作为结束期间 - String beforeFirstMonthDate = DateUtils.beforeMonthFirstDateStr(settleDate); - CuMemberSettlePeriod beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeFirstMonthDate); - // 月徽章 - grantHonorWall(beforePeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_MONTH.getValue(), HonorWallType.ANTIFADING_MONTH.getValue(), honorWallMap, cuMemberHonorWallList); - // 再发季度徽章 - if (month == 1 || month == 4 || month == 7 || month == 10) { - // 3个月期间，作为开始期间 - String quarterFirstMonthDate = DateUtils.beforeMonthFirstDateStr(3, settleDate); - CuMemberSettlePeriod quarterPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(quarterFirstMonthDate); - grantHonorWall(quarterPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); - if (month == 1) { - // 再发年度徽章 - // 3个月期间，作为开始期间 - String yearFirstMonthDate = DateUtils.beforeMonthFirstDateStr(12, settleDate); - CuMemberSettlePeriod yearPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yearFirstMonthDate); - if (yearPeriod != null) { - grantHonorWall(yearPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, - HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); - } - } - } - if (cuMemberHonorWallList.size() > 0) { - cuMemberHonorWallService.saveBatch(cuMemberHonorWallList); - } - } +// // 每月7号发放徽章,发放上个月的 +// if (day == 7) { +// // 查询徽章 +// List cuHonorWallList = cuHonorWallService.queryCuHonorWall(); +// Map honorWallMap = new HashMap<>(); +// cuHonorWallList.forEach(cuHonorWall -> { +// String key = cuHonorWall.getPkCountry().toString() + cuHonorWall.getType() + cuHonorWall.getValue(); +// honorWallMap.put(key, cuHonorWall); +// }); +// List cuMemberHonorWallList = new ArrayList<>(); +// // 上月期间，作为结束期间 +// String beforeFirstMonthDate = DateUtils.beforeMonthFirstDateStr(settleDate); +// CuMemberSettlePeriod beforePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(beforeFirstMonthDate); +// // 月徽章 +// grantHonorWall(beforePeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, +// HonorWallType.RECOMMEND_MONTH.getValue(), HonorWallType.ANTIFADING_MONTH.getValue(), honorWallMap, cuMemberHonorWallList); +// // 再发季度徽章 +// if (month == 1 || month == 4 || month == 7 || month == 10) { +// // 3个月期间，作为开始期间 +// String quarterFirstMonthDate = DateUtils.beforeMonthFirstDateStr(3, settleDate); +// CuMemberSettlePeriod quarterPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(quarterFirstMonthDate); +// grantHonorWall(quarterPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, +// HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); +// if (month == 1) { +// // 再发年度徽章 +// // 3个月期间，作为开始期间 +// String yearFirstMonthDate = DateUtils.beforeMonthFirstDateStr(12, settleDate); +// CuMemberSettlePeriod yearPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yearFirstMonthDate); +// if (yearPeriod != null) { +// grantHonorWall(yearPeriod.getPkId(), cuMemberSettlePeriod.getPkId(), settleMonth, +// HonorWallType.RECOMMEND_QUARTER.getValue(), HonorWallType.ANTIFADING_QUARTER.getValue(), honorWallMap, cuMemberHonorWallList); +// } +// } +// } +// if (cuMemberHonorWallList.size() > 0) { +// cuMemberHonorWallService.saveBatch(cuMemberHonorWallList); +// } +// } } @Override diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index 5c922623..9bd015bf 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -505,11 +505,11 @@ public class CuMemberTreeServiceImpl extends ServiceImpl queryCuMemberTreeParentTable(String settleTableName, Long pkMember, Integer level) { - Long b = System.currentTimeMillis(); + long b = System.currentTimeMillis(); System.out.println("开始时间：" + b); List memberSettleExtList = baseMapper.queryCuMemberTreeParentTable(settleTableName, pkMember, level); System.out.println("结束时间：" + (System.currentTimeMillis() - b)); - List ids = memberSettleExtList.stream().map(a -> a.getPkMember()).collect(Collectors.toList()); + List ids = memberSettleExtList.stream().map(CuMemberTree::getPkMember).collect(Collectors.toList()); // 查询会员直推人数 List memberParentCountParamList = new ArrayList<>(); if (ids.size() > 0) { @@ -519,14 +519,10 @@ public class CuMemberTreeServiceImpl extends ServiceImpl memberParentCountMap = memberParentCountParamList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberCount)); // 查询直推人数 - memberSettleExtList.stream().map(a -> { - a.setDirectPushNumber(memberParentCountMap.getOrDefault(a.getPkMember(), 0L)); - return a; - }).collect(Collectors.toList()); + memberSettleExtList.stream().peek(a -> a.setDirectPushNumber(memberParentCountMap.getOrDefault(a.getPkMember(), 0L))).collect(Collectors.toList()); //查询直推业绩 if (StringUtils.isNotBlank(settleTableName) && ids.size() > 0) { List memberParentCountParamPvList = new ArrayList<>(); @@ -539,14 +535,8 @@ public class CuMemberTreeServiceImpl extends ServiceImpl memberParentPvMap = memberParentCountParamPvList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberSumPv)); // 查询直推业绩 - memberSettleExtList.stream().map(a -> { - a.setHistoryPerformancePv(memberParentPvMap.getOrDefault(a.getPkMember(), BigDecimal.ZERO)); - return a; - }).collect(Collectors.toList()); - + memberSettleExtList.stream().peek(a -> a.setHistoryPerformancePv(memberParentPvMap.getOrDefault(a.getPkMember(), BigDecimal.ZERO))).collect(Collectors.toList()); } - - return memberSettleExtList; } @@ -714,7 +704,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl memberIds = Arrays.asList(cuMemberSettleExt.getPkMember()); + List memberIds = Collections.singletonList(cuMemberSettleExt.getPkMember()); // 查询会员直推人数 List memberParentCountParamList = baseMapper.queryByMemberParentCount(memberIds); Map memberParentCountMap = memberParentCountParamList.stream().collect(Collectors.toMap(MemberParentCountParam::getPkMember, MemberParentCountParam::getParentMemberCount)); diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java index 1036cd62..4579d934 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/provider/MemberSettleBonusProvider.java @@ -8,7 +8,6 @@ import com.hzs.bonus.bonus.service.ICuMemberBonusService; import com.hzs.bonus.settle.IMemberSettleBonusApi; import com.hzs.common.core.domain.R; import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; @@ -31,16 +30,12 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { @Autowired private ICuMemberMonthAchieveService cuMemberMonthAchieveService; - @Autowired private IBonusSettleService bonusSettleService; - @Autowired private ICuMemberBonusService cuMemberBonusService; - @Autowired private IBonusGrantService bonusGrantService; - @Autowired private ICuMemberAchieveService cuMemberAchieveService; @@ -48,7 +43,7 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { public R calculateCumberBonusBySecond(String orderCode) { try { bonusSettleService.calculateCumberBonusBySecond(orderCode); - }catch (Exception e){ + } catch (Exception e) { return R.fail(); } return R.ok(); @@ -59,7 +54,7 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { try { new BonusCalculateBonus(settleDate).start(); return R.ok(); - }catch (Exception e){ + } catch (Exception e) { return R.fail(); } } @@ -69,10 +64,11 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { cuMemberBonusService.backupsSettleBonusEveryday(); } - class BonusCalculateBonus extends Thread{ + class BonusCalculateBonus extends Thread { private final Date settleDate; - public BonusCalculateBonus(Date settleDate){ + + public BonusCalculateBonus(Date settleDate) { this.settleDate = settleDate; } @@ -86,8 +82,8 @@ public class MemberSettleBonusProvider implements IMemberSettleBonusApi { // 奖金结算 try { cuMemberBonusService.autoCalculateBonus(settleDate, settleEndDate); - }catch (Exception e){ - log.info("11111111", e); + } catch (Exception e) { + log.error("奖金结算异常,结算时间：{}", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, settleDate), e); } } } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java index 3732fac0..d021b284 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java @@ -7,7 +7,6 @@ import com.hzs.common.domain.member.bonus.CuMemberBonus; import com.hzs.common.domain.member.ext.CuMemberBonusExt; import com.hzs.bonus.bonus.param.BonusParam; import com.hzs.bonus.bonus.vo.MemberBonusVO; -import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; @@ -15,9 +14,7 @@ import java.util.Map; import java.util.Set; /** - *

* 会员奖金-会员奖金汇总表 服务类 - *

* * @author hzs * @since 2022-11-11 @@ -26,6 +23,7 @@ public interface ICuMemberBonusService extends IService { /** * 批量获取cuMemberBonus主键 + * * @param rowNum 数量 * @return: List * @Author: sui q @@ -35,6 +33,7 @@ public interface ICuMemberBonusService extends IService { /** * 根据查询条件查询每日奖金汇总 + * * @param bonusParam 查询条件 * @return: List * @Author: sui q @@ -44,15 +43,17 @@ public interface ICuMemberBonusService extends IService { /** * 根据查询条件查询会员奖金 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 11:27 - */ + * @return: List + * @Author: sui q + * @Date: 2023/1/13 11:27 + */ List queryMemberBonusVoByCondition(BonusParam bonusParam); /** * 根据查询条件查询会员秒接奖金 + * * @param bonusParam 查询条件 * @return: List * @Author: sui q @@ -62,6 +63,7 @@ public interface ICuMemberBonusService extends IService { /** * 根据查询条件查询会员奖金 + * * @param bonusParam 查询条件 * @return: List * @Author: sui q @@ -71,6 +73,7 @@ public interface ICuMemberBonusService extends IService { /** * 根据查询条件查询会员奖金 + * * @param bonusParam 查询条件 * @return: List * @Author: sui q @@ -89,20 +92,22 @@ public interface ICuMemberBonusService extends IService { /** * 根据条件查询查询每天奖金汇总 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/3/6 9:26 - */ + * @return: List + * @Author: sui q + * @Date: 2023/3/6 9:26 + */ List queryBonusTotalVoByConditionForServer(BonusParam bonusParam); /** * 根据查询条件查询会员明细奖金 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/13 17:27 - */ + * @return: List + * @Author: sui q + * @Date: 2023/1/13 17:27 + */ TableDataInfo queryMemberBonusDetailVoByCondition(BonusParam bonusParam); /* @@ -115,15 +120,17 @@ public interface ICuMemberBonusService extends IService { /** * 后台根据查询条件查询会员奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/23 14:41 - */ + * @return: List + * @Author: sui q + * @Date: 2023/1/23 14:41 + */ TableDataInfo queryMemberBonusDetailSerVoByCondition(BonusParam bonusParam); /** * 删除会员奖金汇总表 + * * @param period 结算期间 * @return: void * @Author: sui q @@ -133,6 +140,7 @@ public interface ICuMemberBonusService extends IService { /** * 批量插入会员奖金主表 + * * @param cuMemberBonusList 会员奖金 * @return: void * @Author: sui q @@ -142,6 +150,7 @@ public interface ICuMemberBonusService extends IService { /** * 批量插入会员奖金主表 + * * @param cuMemberBonusList 会员奖金 * @return: void * @Author: sui q @@ -159,34 +168,37 @@ public interface ICuMemberBonusService extends IService { /** * 根据国家、期间查询存在首购奖金的会员 - * @param period 期间 + * + * @param period 期间 * @param pkCountryList 国家 - * @return: List - * @Author: sui q - * @Date: 2023/3/14 9:56 - */ + * @return: List + * @Author: sui q + * @Date: 2023/3/14 9:56 + */ List queryExistsPurchaseBonusMember(Integer period, List pkCountryList); /** * 更新奖金状态 - * @param grantStatus 发放状态 + * + * @param grantStatus 发放状态 * @param oldGrantStatus 原来的发放状态 - * @param startPeriod 期间 - * @return: Boolean - * @Author: sui q - * @Date: 2023/3/20 17:21 - */ + * @param startPeriod 期间 + * @return: Boolean + * @Author: sui q + * @Date: 2023/3/20 17:21 + */ Boolean updateCuMemberBonusStatus(Integer pkCountry, Integer grantStatus, Integer oldGrantStatus, Integer startPeriod, Integer endPeriod); /** * 根据发放状态查询某一期的奖金 + * * @param grantStatus 发放状态 * @param startPeriod 期间 - * @param endPeriod 期间 - * @return: List - * @Author: sui q - * @Date: 2023/3/21 9:44 - */ + * @param endPeriod 期间 + * @return: List + * @Author: sui q + * @Date: 2023/3/21 9:44 + */ List queryCuMemberBonusByCondition(Integer pkCountry, Integer grantStatus, Integer startPeriod, Integer endPeriod); /* @@ -206,14 +218,6 @@ public interface ICuMemberBonusService extends IService { **/ void backupsSettleBonusEveryday(); - /* - * @description: 结算极差奖金 - * @author: sui q - * @date: 2024/10/15 10:12 - * @param: null null - **/ - void autoCalculateRangeBonus(Date settleDate); - /* * @description: 查询会员奖金根据期间 * @author: sui q diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 88c1bd79..74f8aeb5 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -58,7 +58,6 @@ import com.hzs.system.config.IRangeServiceApi; import com.hzs.system.config.dto.BonusConfigDTO; import com.hzs.system.config.dto.GradeDTO; import com.hzs.system.config.dto.RangeDTO; -import com.hzs.third.email.IEmailServiceApi; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -80,12 +79,20 @@ import java.util.*; @Slf4j public class BonusSettleServiceImpl implements IBonusSettleService { + @DubboReference + ISystemConfigServiceApi systemConfigServiceApi; @DubboReference IGradeServiceApi gradeServiceApi; @DubboReference + IAwardsServiceApi awardsServiceApi; + @DubboReference + IRangeServiceApi rangeServiceApi; + @DubboReference IMemberServiceApi memberServiceApi; @DubboReference - IEmailServiceApi emailServiceApi; + IBonusItemsServiceApi bonusItemsServiceApi; + @DubboReference + IAcPickServiceApi acPickServiceApi; private ICuMemberTreeService cuMemberTreeService; @@ -154,21 +161,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { @Autowired private BonusSettleStoreHandle bonusSettleStoreHandle; - @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; - - @DubboReference - private IRangeServiceApi rangeServiceApi; - - @DubboReference - private IAwardsServiceApi awardsServiceApi; - - @DubboReference - private IBonusItemsServiceApi bonusItemsServiceApi; - - @DubboReference - private IAcPickServiceApi acPickServiceApi; - private ICuMemberBonusService cuMemberBonusService; private ICuMemberBonusPushService cuMemberBonusPushService; @@ -648,7 +640,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { } } catch (Exception e) { e.printStackTrace(); - emailServiceApi.sendMessage(); throw new RuntimeException(e); } } @@ -1438,25 +1429,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { } } - /** - * @param settleDateStr 结算日期 - * @Desccription: 计算云代的奖金 - * @return: Map 需要更新的 - * @Author: sui q - * @Date: 2022/11/10 17:40 - */ - private void calculateRetailShareBonus(String settleDateStr, BonusConfigDTO bonusConfigDTO, - Integer period, BonusRecordDetailVO bonusRecordDetailVO, Map cuMemberBonusMap) { -// List cuMemberBonusDetailList = bonusSettleFirstPurchaseHandle.calculateShareBonus(settleDateStr, bonusConfigDTO, period, cuMemberBonusMap, cuAwardsControlMap); -// if (CollectionUtil.isNotEmpty(cuMemberBonusDetailList)) { -// if (bonusRecordDetailVO.getCuMemberBonusDetailList() != null) { -// bonusRecordDetailVO.getCuMemberBonusDetailList().addAll(cuMemberBonusDetailList); -// } else { -// bonusRecordDetailVO.setCuMemberBonusDetailList(cuMemberBonusDetailList); -// } -// } - } - /** * @param settleDateStr 结算日期 * @param bonusConfigDTO 各个国家奖金参数 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 7baab6aa..f1b123a9 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -90,7 +90,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl queryMemberBonusByPeriod(Integer period) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -716,4 +710,5 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusMap.put(cuMemberBonus.getPkMember(), cuMemberBonus)); return cuMemberBonusMap; } + } diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml index 556afc54..c6f9382c 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberMonthAchieveMapper.xml @@ -4,61 +4,81 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + merge into CU_MEMBER_MONTH_ACHIEVE a - using( - select pk_member,#{period} period,RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY,REPURCHASE_ACHIEVE,pk_country from( - select pk_member,pk_country,sum(REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT) RECOMMEND_MONEY,sum(REGISTER_NEW_PV+UPGRADE_NEW_PV) RECOMMEND_ACHIEVE, - sum(REPURCHASE_NEW_AMOUNT+HI_FUN_NEW_AMOUNT+MALL_NEW_AMOUNT) REPURCHASE_MONEY,sum(REPURCHASE_PV+HI_FUN_NEW_PV+MALL_NEW_PV) REPURCHASE_ACHIEVE from ${tableName} - where REGISTER_NEW_AMOUNT+UPGRADE_NEW_AMOUNT>0 or REPURCHASE_NEW_AMOUNT+HI_FUN_NEW_AMOUNT+MALL_NEW_AMOUNT>0 - group by pk_member,pk_country) + using ( + select pk_member, #{period} period, RECOMMEND_MONEY, RECOMMEND_ACHIEVE, REPURCHASE_MONEY, REPURCHASE_ACHIEVE, pk_country + from ( + select pk_member, + pk_country, + sum(REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT) RECOMMEND_MONEY, + sum(REGISTER_NEW_PV + UPGRADE_NEW_PV) RECOMMEND_ACHIEVE, + sum(REPURCHASE_NEW_AMOUNT + HI_FUN_NEW_AMOUNT + MALL_NEW_AMOUNT) REPURCHASE_MONEY, + sum(REPURCHASE_PV + HI_FUN_NEW_PV + MALL_NEW_PV) REPURCHASE_ACHIEVE + from ${tableName} + where REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT > 0 + or REPURCHASE_NEW_AMOUNT + HI_FUN_NEW_AMOUNT + MALL_NEW_AMOUNT > 0 + group by pk_member, pk_country) ) b - on (a.pk_member=b.pk_member and a.period=b.period) + on (a.pk_member = b.pk_member and a.period = b.period) when matched then - update set a.RECOMMEND_MONEY = b.RECOMMEND_MONEY, a.RECOMMEND_ACHIEVE=b.RECOMMEND_ACHIEVE, - a.REPURCHASE_MONEY=b.REPURCHASE_MONEY,a.REPURCHASE_ACHIEVE=b.REPURCHASE_ACHIEVE + update set a.RECOMMEND_MONEY = b.RECOMMEND_MONEY, a.RECOMMEND_ACHIEVE = b.RECOMMEND_ACHIEVE, + a.REPURCHASE_MONEY = b.REPURCHASE_MONEY,a.REPURCHASE_ACHIEVE = b.REPURCHASE_ACHIEVE WHEN NOT MATCHED THEN - insert(PK_ID, PK_MEMBER, PERIOD, SETTLE_MONTH, RECOMMEND_MONEY,RECOMMEND_ACHIEVE,REPURCHASE_MONEY, - REPURCHASE_ACHIEVE,PK_COUNTRY,PK_CREATOR) + insert (PK_ID, PK_MEMBER, PERIOD, SETTLE_MONTH, RECOMMEND_MONEY, RECOMMEND_ACHIEVE, REPURCHASE_MONEY, + REPURCHASE_ACHIEVE, PK_COUNTRY, PK_CREATOR) values (CU_MEMBER_MONTH_ACHIEVE_SEQ.NEXTVAL, - b.pk_member,b.period,#{month},b.RECOMMEND_MONEY,b.RECOMMEND_ACHIEVE,b.REPURCHASE_MONEY, - b.REPURCHASE_ACHIEVE,b.PK_COUNTRY,1) + b.pk_member, b.period, #{month}, b.RECOMMEND_MONEY, b.RECOMMEND_ACHIEVE, b.REPURCHASE_MONEY, + b.REPURCHASE_ACHIEVE, b.PK_COUNTRY, 1) + diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml index 2578cc87..bea7e8d8 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml @@ -1,111 +1,112 @@ +> - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - period NUMBER(6) default 0 not null, + period + NUMBER(6) default 0 not null, pk_member NUMBER(20) not null, pk_parent NUMBER(20) not null, pk_place_parent NUMBER(20), @@ -139,13 +140,14 @@ - , - , - + , + , + - pk_rate NUMBER(6) , + pk_rate + NUMBER(6) , a_balance NUMBER(17,6) default 0 not null, b_balance NUMBER(17,6) default 0 not null, a_sum_amount NUMBER(17,6) default 0 not null, @@ -214,7 +216,8 @@ - net_first_achieve NUMBER(17,6) default 0 not null, + net_first_achieve + NUMBER(17,6) default 0 not null, net_repurchase_achieve NUMBER(17,6) default 0 not null, r_a_balance NUMBER(17,6) default 0 not null, r_b_balance NUMBER(17,6) default 0 not null, @@ -235,28 +238,42 @@ - CREATE OR REPLACE TRIGGER ${tableName}_TRIG - BEFORE INSERT OR UPDATE ON ${tableName} + CREATE + OR REPLACE TRIGGER + ${tableName} + _ + TRIG + BEFORE + INSERT + OR + UPDATE ON ${tableName} FOR EACH ROW - DECLARE - v_newVal NUMBER(12) := 0; - v_incval NUMBER(12) := 0; + DECLARE + v_newVal NUMBER(12) := 0; + v_incval + NUMBER(12) := 0; BEGIN - IF INSERTING AND :new.pk_id IS NULL THEN - SELECT - ${tableNameSeq}.NEXTVAL + IF + INSERTING AND :new.pk_id IS NULL THEN + SELECT ${tableNameSeq}.NEXTVAL INTO v_newVal FROM DUAL; - IF v_newVal = 1 THEN - SELECT NVL(max(pk_id), 0) INTO v_newVal FROM ${tableName}; - v_newVal := v_newVal + 1; + IF + v_newVal = 1 THEN + SELECT NVL(max(pk_id), 0) + INTO v_newVal + FROM ${tableName}; + v_newVal + := v_newVal + 1; LOOP - EXIT WHEN v_incval >= v_newVal; - SELECT ${tableNameSeq}.nextval INTO v_incval + EXIT WHEN v_incval >= v_newVal; + SELECT ${tableNameSeq}.nextval + INTO v_incval FROM dual; END LOOP; END IF; - :new.pk_id := v_newVal; + :new + .pk_id := v_newVal; END IF; END; @@ -276,49 +293,104 @@ - insert into ${settleTableName}(pk_member,pk_parent,pk_place_parent,place_dept,member_code,member_name, - customer_type,phone,pk_grade,pk_awards,account_status,pay_status,register_authority,category, - purchase_type,purchase_status,share_status,income_status,pk_team_code,is_maker_space, - pk_center_code,pk_vertex,pk_settle_country,is_real_name,pk_country,pk_rate, - store_level,is_maker_gift,expire_status) - select cm.pk_id,pk_parent,pk_place_parent,place_dept,member_code,member_name, - customer_type,phone,pk_settle_grade,pk_awards,account_status,pay_status,register_authority,category, - (case when purchase_status = 0 then 1 else 0 end) purchase_type, - purchase_status,share_status,income_status,pk_team_code,is_maker_space,pk_center_code, - pk_vertex,pk_settle_country,is_real_name,cm.pk_country,nvl(bc.pk_id,-1) pk_rate, - nvl(b.store_level,0) store_level,cm.is_maker_gift,cm.expire_status from cu_member cm - left join ( - select pk_country,max(pk_id) pk_id from bd_currency - where del_flag=0 and pk_country=1 and enable_state=0 and effective_date <=sysdate - group by pk_country) bc - on cm.pk_settle_country = bc.pk_country - left join( - select pk_member,store_level from cu_maker_space - where del_flag=0 and approve_status=5 - and apply_status=5 and store_type=1 + insert into ${settleTableName}(pk_member, pk_parent, pk_place_parent, place_dept, member_code, member_name, + customer_type, phone, pk_grade, pk_awards, account_status, pay_status, register_authority, category, + purchase_type, purchase_status, share_status, income_status, pk_team_code, is_maker_space, + pk_center_code, pk_vertex, pk_settle_country, is_real_name, pk_country, pk_rate, + store_level, is_maker_gift, expire_status) + select cm.pk_id, + pk_parent, + pk_place_parent, + place_dept, + member_code, + member_name, + customer_type, + phone, + pk_settle_grade, + pk_awards, + account_status, + pay_status, + register_authority, + category, + (case when purchase_status = 0 then 1 else 0 end) purchase_type, + purchase_status, + share_status, + income_status, + pk_team_code, + is_maker_space, + pk_center_code, + pk_vertex, + pk_settle_country, + is_real_name, + cm.pk_country, + nvl(bc.pk_id, -1) pk_rate, + nvl(b.store_level, 0) store_level, + cm.is_maker_gift, + cm.expire_status + from cu_member cm + left join ( + select pk_country, max(pk_id) pk_id + from bd_currency + where del_flag = 0 + and pk_country = 1 + and enable_state = 0 + and effective_date <= sysdate + group by pk_country) bc + on cm.pk_settle_country = bc.pk_country + left join( + select pk_member, store_level + from cu_maker_space + where del_flag = 0 + and approve_status = 5 + and apply_status = 5 + and store_type = 1 ) b - on cm.pk_id=b.pk_member - where cm.del_flag=0 and cm.system_type=0 + on cm.pk_id = b.pk_member + where cm.del_flag = 0 + and cm.system_type = 0 - insert into ${targetTableName}(period,pk_member,pk_parent,pk_place_parent,place_dept,member_code, - member_name,customer_type,phone,pk_grade,pk_awards,account_status,pay_status, - register_authority,category,purchase_type,purchase_status, - share_status,income_status,pk_team_code,pk_center_code,pk_vertex, - pk_settle_country,is_real_name,is_bus_license,is_maker_space,pk_country) - select #{period} period,pk_member,pk_parent,pk_place_parent,place_dept,member_code, - member_name,customer_type,phone,pk_grade,pk_awards,account_status,pay_status, - register_authority,category,purchase_type,purchase_status, - share_status,income_status,pk_team_code,pk_center_code,pk_vertex, - pk_settle_country,is_real_name,is_bus_license,is_maker_space,pk_country from ${sourceTableName} + insert into ${targetTableName}(period, pk_member, pk_parent, pk_place_parent, place_dept, member_code, + member_name, customer_type, phone, pk_grade, pk_awards, account_status, pay_status, + register_authority, category, purchase_type, purchase_status, + share_status, income_status, pk_team_code, pk_center_code, pk_vertex, + pk_settle_country, is_real_name, is_bus_license, is_maker_space, pk_country) + select #{period} period, + pk_member, + pk_parent, + pk_place_parent, + place_dept, + member_code, + member_name, + customer_type, + phone, + pk_grade, + pk_awards, + account_status, + pay_status, + register_authority, + category, + purchase_type, + purchase_status, + share_status, + income_status, + pk_team_code, + pk_center_code, + pk_vertex, + pk_settle_country, + is_real_name, + is_bus_license, + is_maker_space, + pk_country + from ${sourceTableName} create table ${tableName} ( - pk_id NUMBER(20) primary key, - + pk_id NUMBER(20) primary key, + ) @@ -332,27 +404,65 @@ create table ${tableName} ( - pk_member NUMBER(20) not null, - pk_country number(4) default 1 not null, - expire_status number(1) default 1, - + pk_member NUMBER(20) not null, + pk_country number(4) default 1 not null, + expire_status number(1) default 1, + ) - create index ${tableName}_parent on ${tableName}(pk_parent) + create + index + ${tableName} + _ + parent + on + ${tableName} + ( + pk_parent + ) - create index ${tableName}_place on ${tableName}(pk_place_parent,place_dept) + create + index + ${tableName} + _ + place + on + ${tableName} + ( + pk_place_parent, + place_dept + ) - create unique index ${tableName}_PK_M on ${tableName}(PK_MEMBER,period) + create + unique index + ${tableName} + _ + PK_M + on + ${tableName} + ( + PK_MEMBER, + period + ) - create unique index ${tableName}_PK_M on ${tableName}(PK_MEMBER) + create + unique index + ${tableName} + _ + PK_M + on + ${tableName} + ( + PK_MEMBER + ) @@ -365,77 +475,174 @@ merge into ${updateTableName} a - using( - select pk_member,max(new_level) pk_awards from cu_member_awards - where period = #{period} and del_flag=0 - group by pk_member) b - on (a.pk_member = b.pk_member) - when matched then - update set - a.pk_awards = b.pk_awards + using ( + select pk_member, max(new_level) pk_awards + from cu_member_awards + where period = #{period} + and del_flag = 0 + group by pk_member) b + on (a.pk_member = b.pk_member) + when matched then + update set + a.pk_awards = b.pk_awards - insert into ${settleTableName}(pk_member,PK_PARENT,PK_PLACE_PARENT,PLACE_DEPT,MEMBER_CODE,member_name, - CUSTOMER_TYPE,PHONE,PK_GRADE,PK_AWARDS,ACCOUNT_STATUS,PAY_STATUS,REGISTER_AUTHORITY, - CATEGORY,PURCHASE_TYPE,PURCHASE_STATUS,SHARE_STATUS,INCOME_STATUS,PK_TEAM_CODE,PK_CENTER_CODE, - PK_VERTEX,PK_SETTLE_COUNTRY,IS_REAL_NAME,IS_BUS_LICENSE,IS_MAKER_SPACE,PK_COUNTRY,PK_RATE, - a_balance,b_balance,A_SUM_AMOUNT,B_SUM_AMOUNT,A_SUM_PV,B_SUM_PV, - A_NEW_AMOUNT,B_NEW_AMOUNT,A_NEW_PV,B_NEW_PV,A_SUM_REAL_AMOUNT,B_SUM_REAL_AMOUNT,A_SUM_REAL_PV,B_SUM_REAL_PV, - REP_A_BALANCE,REP_B_BALANCE,REP_A_NEW_AMOUNT,REP_B_NEW_AMOUNT,REP_A_NEW_PV,REP_B_NEW_PV,REP_A_SUM_AMOUNT, - REP_B_SUM_AMOUNT,REP_A_SUM_PV,REP_B_SUM_PV,REGISTER_AMOUNT,REGISTER_PV,REGISTER_NEW_AMOUNT,REGISTER_NEW_PV, - UPGRADE_AMOUNT,UPGRADE_PV,UPGRADE_NEW_AMOUNT,UPGRADE_NEW_PV,REPURCHASE_AMOUNT,REPURCHASE_PV, - REPURCHASE_NEW_AMOUNT,REPURCHASE_NEW_PV,HI_FUN_AMOUNT,HI_FUN_PV,HI_FUN_NEW_AMOUNT,HI_FUN_NEW_PV, - MALL_AMOUNT,MALL_PV,MALL_NEW_AMOUNT,MALL_NEW_PV,REGISTER_BLO_NEW_PV,UPGRADE_BLO_NEW_PV,REPURCHASE_BLO_NEW_PV, - HI_FUN_BLO_NEW_PV,MALL_BLO_NEW_PV,MIN_ACHIEVE,ROUND,SECOND) - select ca.pk_member,ca.PK_PARENT,ca.PK_PLACE_PARENT,ca.PLACE_DEPT,ca.MEMBER_CODE,ca.member_name, - ca.CUSTOMER_TYPE,ca.PHONE,PK_GRADE,PK_AWARDS,ACCOUNT_STATUS,PAY_STATUS,REGISTER_AUTHORITY, - CATEGORY,PURCHASE_TYPE,PURCHASE_STATUS,SHARE_STATUS,INCOME_STATUS,PK_TEAM_CODE,PK_CENTER_CODE, - PK_VERTEX,ca.PK_SETTLE_COUNTRY,IS_REAL_NAME,IS_BUS_LICENSE,IS_MAKER_SPACE,ca.PK_COUNTRY,PK_RATE, - a_balance,b_balance,A_SUM_AMOUNT,B_SUM_AMOUNT,A_SUM_PV,B_SUM_PV, - A_NEW_AMOUNT,B_NEW_AMOUNT,A_NEW_PV,B_NEW_PV,A_SUM_REAL_AMOUNT,B_SUM_REAL_AMOUNT,A_SUM_REAL_PV,B_SUM_REAL_PV, - REP_A_BALANCE,REP_B_BALANCE,REP_A_NEW_AMOUNT,REP_B_NEW_AMOUNT,REP_A_NEW_PV,REP_B_NEW_PV,REP_A_SUM_AMOUNT, - REP_B_SUM_AMOUNT,REP_A_SUM_PV,REP_B_SUM_PV,REGISTER_AMOUNT,REGISTER_PV,REGISTER_NEW_AMOUNT,REGISTER_NEW_PV, - UPGRADE_AMOUNT,UPGRADE_PV,UPGRADE_NEW_AMOUNT,UPGRADE_NEW_PV,REPURCHASE_AMOUNT,REPURCHASE_PV, - REPURCHASE_NEW_AMOUNT,REPURCHASE_NEW_PV,HI_FUN_AMOUNT,HI_FUN_PV,HI_FUN_NEW_AMOUNT,HI_FUN_NEW_PV, - MALL_AMOUNT,MALL_PV,MALL_NEW_AMOUNT,MALL_NEW_PV,REGISTER_BLO_NEW_PV,UPGRADE_BLO_NEW_PV,REPURCHASE_BLO_NEW_PV, - HI_FUN_BLO_NEW_PV,MALL_BLO_NEW_PV,0 MIN_ACHIEVE,0 ROUND,1 SECOND from ${achieveTableName} ct - inner join ${treeTableName} ca - on ca.pk_member=ct.pk_member and ca.period=ct.period - where ca.period=#{period} + insert into ${settleTableName}(pk_member, PK_PARENT, PK_PLACE_PARENT, PLACE_DEPT, MEMBER_CODE, member_name, + CUSTOMER_TYPE, PHONE, PK_GRADE, PK_AWARDS, ACCOUNT_STATUS, PAY_STATUS, REGISTER_AUTHORITY, + CATEGORY, PURCHASE_TYPE, PURCHASE_STATUS, SHARE_STATUS, INCOME_STATUS, PK_TEAM_CODE, PK_CENTER_CODE, + PK_VERTEX, PK_SETTLE_COUNTRY, IS_REAL_NAME, IS_BUS_LICENSE, IS_MAKER_SPACE, PK_COUNTRY, PK_RATE, + a_balance, b_balance, A_SUM_AMOUNT, B_SUM_AMOUNT, A_SUM_PV, B_SUM_PV, + A_NEW_AMOUNT, B_NEW_AMOUNT, A_NEW_PV, B_NEW_PV, A_SUM_REAL_AMOUNT, B_SUM_REAL_AMOUNT, A_SUM_REAL_PV, B_SUM_REAL_PV, + REP_A_BALANCE, REP_B_BALANCE, REP_A_NEW_AMOUNT, REP_B_NEW_AMOUNT, REP_A_NEW_PV, REP_B_NEW_PV, REP_A_SUM_AMOUNT, + REP_B_SUM_AMOUNT, REP_A_SUM_PV, REP_B_SUM_PV, REGISTER_AMOUNT, REGISTER_PV, REGISTER_NEW_AMOUNT, REGISTER_NEW_PV, + UPGRADE_AMOUNT, UPGRADE_PV, UPGRADE_NEW_AMOUNT, UPGRADE_NEW_PV, REPURCHASE_AMOUNT, REPURCHASE_PV, + REPURCHASE_NEW_AMOUNT, REPURCHASE_NEW_PV, HI_FUN_AMOUNT, HI_FUN_PV, HI_FUN_NEW_AMOUNT, HI_FUN_NEW_PV, + MALL_AMOUNT, MALL_PV, MALL_NEW_AMOUNT, MALL_NEW_PV, REGISTER_BLO_NEW_PV, UPGRADE_BLO_NEW_PV, REPURCHASE_BLO_NEW_PV, + HI_FUN_BLO_NEW_PV, MALL_BLO_NEW_PV, MIN_ACHIEVE, ROUND, SECOND) + select ca.pk_member, + ca.PK_PARENT, + ca.PK_PLACE_PARENT, + ca.PLACE_DEPT, + ca.MEMBER_CODE, + ca.member_name, + ca.CUSTOMER_TYPE, + ca.PHONE, + PK_GRADE, + PK_AWARDS, + ACCOUNT_STATUS, + PAY_STATUS, + REGISTER_AUTHORITY, + CATEGORY, + PURCHASE_TYPE, + PURCHASE_STATUS, + SHARE_STATUS, + INCOME_STATUS, + PK_TEAM_CODE, + PK_CENTER_CODE, + PK_VERTEX, + ca.PK_SETTLE_COUNTRY, + IS_REAL_NAME, + IS_BUS_LICENSE, + IS_MAKER_SPACE, + ca.PK_COUNTRY, + PK_RATE, + a_balance, + b_balance, + A_SUM_AMOUNT, + B_SUM_AMOUNT, + A_SUM_PV, + B_SUM_PV, + A_NEW_AMOUNT, + B_NEW_AMOUNT, + A_NEW_PV, + B_NEW_PV, + A_SUM_REAL_AMOUNT, + B_SUM_REAL_AMOUNT, + A_SUM_REAL_PV, + B_SUM_REAL_PV, + REP_A_BALANCE, + REP_B_BALANCE, + REP_A_NEW_AMOUNT, + REP_B_NEW_AMOUNT, + REP_A_NEW_PV, + REP_B_NEW_PV, + REP_A_SUM_AMOUNT, + REP_B_SUM_AMOUNT, + REP_A_SUM_PV, + REP_B_SUM_PV, + REGISTER_AMOUNT, + REGISTER_PV, + REGISTER_NEW_AMOUNT, + REGISTER_NEW_PV, + UPGRADE_AMOUNT, + UPGRADE_PV, + UPGRADE_NEW_AMOUNT, + UPGRADE_NEW_PV, + REPURCHASE_AMOUNT, + REPURCHASE_PV, + REPURCHASE_NEW_AMOUNT, + REPURCHASE_NEW_PV, + HI_FUN_AMOUNT, + HI_FUN_PV, + HI_FUN_NEW_AMOUNT, + HI_FUN_NEW_PV, + MALL_AMOUNT, + MALL_PV, + MALL_NEW_AMOUNT, + MALL_NEW_PV, + REGISTER_BLO_NEW_PV, + UPGRADE_BLO_NEW_PV, + REPURCHASE_BLO_NEW_PV, + HI_FUN_BLO_NEW_PV, + MALL_BLO_NEW_PV, + 0 MIN_ACHIEVE, + 0 ROUND, + 1 SECOND + from ${achieveTableName} ct + inner join ${treeTableName} ca + on ca.pk_member = ct.pk_member and ca.period = ct.period + where ca.period = #{period} - insert into ${settleTableName}(pk_member,pk_parent,member_code,member_name, - customer_type,phone,pk_grade,pk_awards,pk_range_awards,pk_benefit_awards,account_status,pay_status,register_authority,category, - purchase_status,income_status,pk_team_code, - pk_center_code,pk_vertex,pk_settle_country,is_real_name,pk_country,pk_rate,assess_status,month_member,range_store_status,pay_time) - select cm.pk_id,pk_parent,member_code,member_name, - customer_type,phone,pk_settle_grade,cm.pk_awards,pk_range_awards,pk_benefit_awards,account_status,pay_status,register_authority,category, - purchase_status,income_status,pk_team_code,pk_center_code, - pk_vertex,pk_settle_country,is_real_name,cm.pk_country,nvl(bc.pk_id,-1) pk_rate, - (case when nvl(ca.assess_status,2)=1 then 0 else nvl(ca.assess_status,2) end) assess_status, - (case when pay_time>#{firstDate,jdbcType=DATE} then 0 else 1 end) month_member,nvl(cs.status,0) range_store_status,cm.pay_time from cu_member cm - left join ( - select pk_country,max(pk_id) pk_id from bd_currency - where del_flag=0 and pk_country=1 and enable_state=0 and effective_date <=sysdate + insert into ${settleTableName}(pk_member, pk_parent, member_code, member_name, + customer_type, phone, pk_grade, pk_awards, pk_range_awards, pk_benefit_awards, account_status, pay_status, register_authority, category, + purchase_status, income_status, pk_team_code, + pk_center_code, pk_vertex, pk_settle_country, is_real_name, pk_country, pk_rate, assess_status, month_member, range_store_status, pay_time) + select cm.pk_id, + pk_parent, + member_code, + member_name, + customer_type, + phone, + pk_settle_grade, + cm.pk_awards, + pk_range_awards, + pk_benefit_awards, + account_status, + pay_status, + register_authority, + category, + purchase_status, + income_status, + pk_team_code, + pk_center_code, + pk_vertex, + pk_settle_country, + is_real_name, + cm.pk_country, + nvl(bc.pk_id, -1) pk_rate, + (case when nvl(ca.assess_status, 2) = 1 then 0 else nvl(ca.assess_status, 2) end) assess_status, + (case when pay_time > #{firstDate,jdbcType=DATE} then 0 else 1 end) month_member, + nvl(cs.status, 0) range_store_status, + cm.pay_time + from cu_member cm + left join ( + select pk_country, max(pk_id) pk_id + from bd_currency + where del_flag = 0 + and pk_country = 1 + and enable_state = 0 + and effective_date <= sysdate group by pk_country) bc - on cm.pk_settle_country = bc.pk_country - left join cu_range_store cs - on cs.pk_member=cm.pk_id and cs.del_flag=0 - left join cu_member_assess${year} ca - on ca.pk_member=cm.pk_id and ca.period=#{period} and ca.assess_type=0 - where cm.del_flag=0 and cm.system_type=1 + on cm.pk_settle_country = bc.pk_country + left join cu_range_store cs + on cs.pk_member = cm.pk_id and cs.del_flag = 0 + left join cu_member_assess${year} ca + on ca.pk_member = cm.pk_id and ca.period = #{period} and ca.assess_type = 0 + where cm.del_flag = 0 + and cm.system_type = 1 merge into ${updateTableName} a - using(select pk_member,pk_awards from tmp_cu_member_awards) b - on (a.pk_member = b.pk_member) - when matched then - update set - a.pk_awards = b.pk_awards - where period >= #{period} + using (select pk_member, pk_awards + from tmp_cu_member_awards) b + on (a.pk_member = b.pk_member) + when matched then + update set + a.pk_awards = b.pk_awards where period >= #{period} @@ -443,25 +650,33 @@ merge into ${settleTableName} a - using ( - select pk_member,max(purchase_type) purchase_type from( - select pk_id pk_member,2 purchase_type from cu_member where del_flag =0 - and category =0 and pay_status = 1 - and pay_time >= #{startDate, jdbcType=DATE} and pay_time < #{endDate, jdbcType=DATE} - union - select pk_member,3 purchase_type from cu_member_awards - where del_flag=0 and purchase_status= 0 and - creation_time >= #{startDate, jdbcType=DATE} and creation_time < #{endDate, jdbcType=DATE}) - group by pk_member - ) b - on (a.pk_member = b.pk_member) - when matched then - update set a.purchase_status=0,a.purchase_type=b.purchase_type + using ( + select pk_member, max(purchase_type) purchase_type + from ( + select pk_id pk_member, 2 purchase_type + from cu_member + where del_flag = 0 + and category = 0 + and pay_status = 1 + and pay_time >= #{startDate, jdbcType=DATE} + and pay_time < #{endDate, jdbcType=DATE} + union + select pk_member, 3 purchase_type + from cu_member_awards + where del_flag = 0 + and purchase_status = 0 + and creation_time >= #{startDate, jdbcType=DATE} + and creation_time < #{endDate, jdbcType=DATE}) + group by pk_member + ) b + on (a.pk_member = b.pk_member) + when matched then + update set a.purchase_status = 0,a.purchase_type = b.purchase_type merge into ${settleTableName} a using( - select * from ( + select * from ( select #{item.pkMember} pk_member,#{item.aBalance} a_balance, #{item.bBalance} b_balance, #{item.aNewAmount} a_new_amount,#{item.bNewAmount} b_new_amount,#{item.aNewPv} a_new_pv,#{item.bNewPv} b_new_pv, @@ -567,48 +782,48 @@ nvl(yt.REP_B_SUM_AMOUNT,0) REP_B_SUM_AMOUNT,nvl(yt.REP_A_SUM_PV,0) REP_A_SUM_PV, nvl(yt.REP_B_SUM_PV,0) REP_B_SUM_PV, nvl(ST.ROUND,0) ROUND,nvl(nvl(ST.SECOND,yt.second),1) SECOND,nvl(ST.MIN_ACHIEVE,0) MIN_ACHIEVE,b.expire_status from - (select t.pk_id,t.pk_settle_country,t.expire_status from cu_member t - where t.del_flag = 0 start with t.pk_id = #{pkMember} - connect by t.pk_id = prior - - t.pk_place_parent - t.pk_parent - - - union - select pk_id,t.pk_settle_country,t.expire_status from cu_member t - where t.del_flag= 0 and pk_id in - - #{item} - - - ) b - left join ${secondTableName} st - on b.pk_id = st.pk_member - left join ${settleTableName} yt - on b.pk_id=yt.pk_member + (select t.pk_id,t.pk_settle_country,t.expire_status from cu_member t + where t.del_flag = 0 start with t.pk_id = #{pkMember} + connect by t.pk_id = prior + + t.pk_place_parent + t.pk_parent + + + union + select pk_id,t.pk_settle_country,t.expire_status from cu_member t + where t.del_flag= 0 and pk_id in + + #{item} + + + ) b + left join ${secondTableName} st + on b.pk_id = st.pk_member + left join ${settleTableName} yt + on b.pk_id=yt.pk_member ) b on (a.pk_member = b.pk_id) when matched then - update set a.a_sum_amount=b.a_sum_amount,a.b_sum_amount=b.b_sum_amount, - a.a_sum_pv=b.a_sum_pv,a.b_sum_pv=b.b_sum_pv, - a.a_sum_real_amount=b.a_sum_real_amount, - a.b_sum_real_amount=b.b_sum_real_amount, - a.a_sum_real_pv=b.a_sum_real_pv, - a.b_sum_real_pv=b.b_sum_real_pv, - a.rep_a_sum_amount=b.rep_a_sum_amount,a.rep_b_sum_amount=b.rep_b_sum_amount, - a.rep_a_sum_pv=b.rep_a_sum_pv,a.rep_b_sum_pv=b.rep_b_sum_pv + update set a.a_sum_amount=b.a_sum_amount,a.b_sum_amount=b.b_sum_amount, + a.a_sum_pv=b.a_sum_pv,a.b_sum_pv=b.b_sum_pv, + a.a_sum_real_amount=b.a_sum_real_amount, + a.b_sum_real_amount=b.b_sum_real_amount, + a.a_sum_real_pv=b.a_sum_real_pv, + a.b_sum_real_pv=b.b_sum_real_pv, + a.rep_a_sum_amount=b.rep_a_sum_amount,a.rep_b_sum_amount=b.rep_b_sum_amount, + a.rep_a_sum_pv=b.rep_a_sum_pv,a.rep_b_sum_pv=b.rep_b_sum_pv when not matched then insert (pk_member,pk_country,a_balance,b_balance,a_sum_amount,b_sum_amount,a_sum_pv,b_sum_pv, - a_new_amount,b_new_amount,a_new_pv,b_new_pv,a_sum_real_amount,b_sum_real_amount, - a_sum_real_pv,b_sum_real_pv,rep_a_balance,rep_b_balance,rep_a_new_amount, - rep_b_new_amount,rep_a_new_pv,rep_b_new_pv,rep_a_sum_amount,rep_b_sum_amount, - rep_a_sum_pv,rep_b_sum_pv,round,second,min_achieve,expire_status) - values(b.pk_id,b.pk_country,b.a_balance,b.b_balance,b.a_sum_amount, b.b_sum_amount,b.a_sum_pv,b.b_sum_pv, - b.a_new_amount,b.b_new_amount,b.a_new_pv,b.b_new_pv,b.a_sum_real_amount,b.b_sum_real_amount, - b.a_sum_real_pv,b.b_sum_real_pv,b.rep_a_balance,b.rep_b_balance,b.rep_a_new_amount, - b.rep_b_new_amount,b.rep_a_new_pv,b.rep_b_new_pv,b.rep_a_sum_amount,b.rep_b_sum_amount, - b.rep_a_sum_pv,b.rep_b_sum_pv,b.round,b.second,b.min_achieve,b.expire_status) + a_new_amount,b_new_amount,a_new_pv,b_new_pv,a_sum_real_amount,b_sum_real_amount, + a_sum_real_pv,b_sum_real_pv,rep_a_balance,rep_b_balance,rep_a_new_amount, + rep_b_new_amount,rep_a_new_pv,rep_b_new_pv,rep_a_sum_amount,rep_b_sum_amount, + rep_a_sum_pv,rep_b_sum_pv,round,second,min_achieve,expire_status) + values(b.pk_id,b.pk_country,b.a_balance,b.b_balance,b.a_sum_amount, b.b_sum_amount,b.a_sum_pv,b.b_sum_pv, + b.a_new_amount,b.b_new_amount,b.a_new_pv,b.b_new_pv,b.a_sum_real_amount,b.b_sum_real_amount, + b.a_sum_real_pv,b.b_sum_real_pv,b.rep_a_balance,b.rep_b_balance,b.rep_a_new_amount, + b.rep_b_new_amount,b.rep_a_new_pv,b.rep_b_new_pv,b.rep_a_sum_amount,b.rep_b_sum_amount, + b.rep_a_sum_pv,b.rep_b_sum_pv,b.round,b.second,b.min_achieve,b.expire_status) drop table ${tableName} @@ -634,61 +849,91 @@ merge into ${targetTableName} a - using( - select #{period} period,pk_member,pk_parent,pk_place_parent,place_dept,member_code, - member_name,customer_type,phone,pk_grade,pk_awards,account_status,pay_status, - register_authority,category,purchase_type,purchase_status, - share_status,income_status,pk_team_code,pk_center_code,pk_vertex, - pk_settle_country,is_real_name,is_bus_license,is_maker_space,pk_country from ${sourceTableName} + using ( + select #{period} period, + pk_member, + pk_parent, + pk_place_parent, + place_dept, + member_code, + member_name, + customer_type, + phone, + pk_grade, + pk_awards, + account_status, + pay_status, + register_authority, + category, + purchase_type, + purchase_status, + share_status, + income_status, + pk_team_code, + pk_center_code, + pk_vertex, + pk_settle_country, + is_real_name, + is_bus_license, + is_maker_space, + pk_country + from ${sourceTableName} ) b - on (a.pk_member=b.pk_member and a.period=b.period) - WHEN MATCHED THEN - update set a.pk_parent = b.pk_parent,a.pk_place_parent = b.pk_place_parent,a.place_dept = b.place_dept, - a.member_code = b.member_code,a.member_name = b.member_name,a.customer_type = b.customer_type,a.phone = b.phone, - a.pk_grade = b.pk_grade,a.pk_awards = b.pk_awards,a.account_status = b.account_status,a.pay_status = b.pay_status, - a.register_authority = b.register_authority,a.category = b.category,a.purchase_type = b.purchase_type, - a.purchase_status = b.purchase_status,a.share_status = b.share_status,a.income_status = b.income_status, - a.pk_team_code = b.pk_team_code,a.pk_center_code = b.pk_center_code,a.pk_vertex = b.pk_vertex, - a.pk_settle_country = b.pk_settle_country,a.is_real_name = b.is_real_name, - a.is_bus_license = b.is_bus_license,a.is_maker_space = b.is_maker_space,a.pk_country = b.pk_country - WHEN NOT MATCHED THEN - insert (period,pk_member,pk_parent,pk_place_parent,place_dept,member_code, - member_name,customer_type,phone,pk_grade,pk_awards,account_status,pay_status, - register_authority,category,purchase_type,purchase_status, - share_status,income_status,pk_team_code,pk_center_code,pk_vertex, - pk_settle_country,is_real_name,is_bus_license,is_maker_space,pk_country) - values(b.period,b.pk_member,b.pk_parent,b.pk_place_parent,b.place_dept,b.member_code, - b.member_name,b.customer_type,b.phone,b.pk_grade,b.pk_awards,b.account_status,b.pay_status, - b.register_authority,b.category,b.purchase_type,b.purchase_status, - b.share_status,b.income_status,b.pk_team_code,b.pk_center_code,b.pk_vertex, - b.pk_settle_country,b.is_real_name,b.is_bus_license,b.is_maker_space,b.pk_country) + on (a.pk_member = b.pk_member and a.period = b.period) + WHEN MATCHED THEN + update set a.pk_parent = b.pk_parent,a.pk_place_parent = b.pk_place_parent,a.place_dept = b.place_dept, + a.member_code = b.member_code,a.member_name = b.member_name,a.customer_type = b.customer_type,a.phone = b.phone, + a.pk_grade = b.pk_grade,a.pk_awards = b.pk_awards,a.account_status = b.account_status,a.pay_status = b.pay_status, + a.register_authority = b.register_authority,a.category = b.category,a.purchase_type = b.purchase_type, + a.purchase_status = b.purchase_status,a.share_status = b.share_status,a.income_status = b.income_status, + a.pk_team_code = b.pk_team_code,a.pk_center_code = b.pk_center_code,a.pk_vertex = b.pk_vertex, + a.pk_settle_country = b.pk_settle_country,a.is_real_name = b.is_real_name, + a.is_bus_license = b.is_bus_license,a.is_maker_space = b.is_maker_space,a.pk_country = b.pk_country + WHEN NOT MATCHED THEN + insert (period, pk_member, pk_parent, pk_place_parent, place_dept, member_code, + member_name, customer_type, phone, pk_grade, pk_awards, account_status, pay_status, + register_authority, category, purchase_type, purchase_status, + share_status, income_status, pk_team_code, pk_center_code, pk_vertex, + pk_settle_country, is_real_name, is_bus_license, is_maker_space, pk_country) + values (b.period, b.pk_member, b.pk_parent, b.pk_place_parent, b.place_dept, b.member_code, + b.member_name, b.customer_type, b.phone, b.pk_grade, b.pk_awards, b.account_status, b.pay_status, + b.register_authority, b.category, b.purchase_type, b.purchase_status, + b.share_status, b.income_status, b.pk_team_code, b.pk_center_code, b.pk_vertex, + b.pk_settle_country, b.is_real_name, b.is_bus_license, b.is_maker_space, b.pk_country) + merge into ${settleTableName} a - using (select pk_member,max(old_level) old_level from cu_member_awards + using (select pk_member, max(old_level) old_level + from cu_member_awards where period = #{period} - group by pk_member ) b + group by pk_member) b on (a.pk_member = b.pk_member) when matched then update set a.pk_awards = b.old_level + merge into ${rangeTableName} a using ( - select pk_member,old_level,ba.pk_awards from( - select pk_member,max(old_level) old_level from cu_member_awards - where period = #{period} and up_type = 1 - group by pk_member) ca - inner join bd_range_awards ba - on ca.old_level=ba.pk_id - where ba.del_flag=0 + select pk_member, old_level, ba.pk_awards + from ( + select pk_member, max(old_level) old_level + from cu_member_awards + where period = #{period} + and up_type = 1 + group by pk_member) ca + inner join bd_range_awards ba + on ca.old_level = ba.pk_id + where ba.del_flag = 0 ) b on (a.pk_member = b.pk_member) when matched then update set - a.pk_awards = b.pk_awards,a.pk_range_awards=b.old_level + a.pk_awards = b.pk_awards,a.pk_range_awards = b.old_level + merge into ${settleTableName} a using( @@ -703,190 +948,220 @@ update set a.a_balance = b.a_balance, a.b_balance=b.b_balance, a.min_achieve=b.min_achieve,a.round = b.round,a.second=b.second + merge into cu_member a using ( - select ca.pk_member,max(ca.pk_awards) pk_awards from cu_member_settle_awards ca - inner join cu_member cm - on cm.pk_id=ca.pk_member - where cm.system_type= 0 and period between #{startPeriod} and #{period} + select ca.pk_member, max(ca.pk_awards) pk_awards + from cu_member_settle_awards ca + inner join cu_member cm + on cm.pk_id = ca.pk_member + where cm.system_type = 0 + and period between #{startPeriod} and #{period} group by ca.pk_member ) b - on (a.pk_id=b.pk_member) + on (a.pk_id = b.pk_member) when matched then - update set a.pk_awards=b.pk_awards + update set a.pk_awards = b.pk_awards merge into ${settleTableName} a using ( - select pk_member,max(pk_awards) pk_awards from cu_member_settle_awards + select pk_member, max(pk_awards) pk_awards + from cu_member_settle_awards where period between #{startPeriod} and #{period} group by pk_member ) b - on (a.pk_member=b.pk_member) + on (a.pk_member = b.pk_member) when matched then - update set a.pk_awards=b.pk_awards + update set a.pk_awards = b.pk_awards merge into cu_member a using ( - select pk_member,max(pk_awards) pk_awards from cu_member_settle_awards + select pk_member, max(pk_awards) pk_awards + from cu_member_settle_awards group by pk_member ) b - on (a.pk_id=b.pk_member) + on (a.pk_id = b.pk_member) when matched then - update set a.pk_max_awards=b.pk_awards + update set a.pk_max_awards = b.pk_awards + merge into cu_member a - using( - select ct.pk_id,ba.pk_id pk_awards from cu_member ct - inner join bd_awards ba - on ct.pk_settle_country = ba.pk_country - where ba.awards_value=0 and ba.del_flag=0 and ct.system_type=0) b - on (a.pk_id=b.pk_id) - when matched then - update set a.pk_awards=b.pk_awards,a.pk_max_awards=b.pk_awards + using ( + select ct.pk_id, ba.pk_id pk_awards + from cu_member ct + inner join bd_awards ba + on ct.pk_settle_country = ba.pk_country + where ba.awards_value = 0 + and ba.del_flag = 0 + and ct.system_type = 0) b + on (a.pk_id = b.pk_id) + when matched then + update set a.pk_awards = b.pk_awards,a.pk_max_awards = b.pk_awards - merge into ${settleTableName} a - using( - select ct.pk_member,ba.pk_id pk_awards from ${settleTableName} ct - inner join bd_awards ba - on ct.pk_settle_country = ba.pk_country - where ba.awards_value=0 and ba.del_flag=0) b - on (a.pk_member=b.pk_member) - when matched then - update set a.pk_awards=b.pk_awards + merge into ${settleTableName} a + using ( + select ct.pk_member, ba.pk_id pk_awards + from ${settleTableName} ct + inner join bd_awards ba + on ct.pk_settle_country = ba.pk_country + where ba.awards_value = 0 + and ba.del_flag = 0) b + on (a.pk_member = b.pk_member) + when matched then + update set a.pk_awards = b.pk_awards + create table ${tableName} ( - pk_member NUMBER(20) not null, - pk_parent NUMBER(20) not null, - member_code VARCHAR2(30) not null, - member_name VARCHAR2(100) not null, - customer_type NUMBER(2) not null, - phone VARCHAR2(40) not null, - pk_grade NUMBER(4) not null, - pk_awards NUMBER(4) not null, - pk_range_awards number(4) default 1 not null, - pk_benefit_awards number(6) default 1 not null, - account_status number(1) default 0 not null, - pay_status NUMBER(2) default 0 not null, - pay_time DATE, - register_authority number(2) default 0 not null, - category number(2) default 0 not null, - purchase_status number(2) default 0 not null, - income_status number(2) default 0 not null, - pk_team_code number(20), - pk_center_code number(20), - pk_vertex number(20), - pk_settle_country number(4) not null, - is_real_name NUMBER(1) default 1 not null, - pk_country number(4) default 1 not null, - pk_rate NUMBER(6) , - consume_status number(2) default 1 not null, - consume_pv number(17,6) default 0 not null, - month_pv number(17,6) default 0 not null, - new_pv number(17,6) default 0 not null, - new_team_pv number(17,6) default 0 not null, - dept_new_team_pv number(17,6) default 0 not null, - effective_num number(8) default 0 not null, - ev_effective_num number(8) default 0 not null, - provide_state number(1) default 1 not null, - buy_effective_num number(8) default 0 not null, - first_agent number(4) default 0 not null, - second_agent number(4) default 0 not null, - recommend_num number(8) default 0 not null, - team_num number(8) default 0 not null, - team_consume_amount number(17,6) default 0 not null, - team_consume_pv number(17,6) default 0 not null, - team_month_amount number(17,6) default 0 not null, - team_month_pv number(17,6) default 0 not null, + pk_member NUMBER(20) not null, + pk_parent NUMBER(20) not null, + member_code VARCHAR2(30) not null, + member_name VARCHAR2(100) not null, + customer_type NUMBER(2) not null, + phone VARCHAR2(40) not null, + pk_grade NUMBER(4) not null, + pk_awards NUMBER(4) not null, + pk_range_awards number(4) default 1 not null, + pk_benefit_awards number(6) default 1 not null, + account_status number(1) default 0 not null, + pay_status NUMBER(2) default 0 not null, + pay_time DATE, + register_authority number(2) default 0 not null, + category number(2) default 0 not null, + purchase_status number(2) default 0 not null, + income_status number(2) default 0 not null, + pk_team_code number(20), + pk_center_code number(20), + pk_vertex number(20), + pk_settle_country number(4) not null, + is_real_name NUMBER(1) default 1 not null, + pk_country number(4) default 1 not null, + pk_rate NUMBER(6), + consume_status number(2) default 1 not null, + consume_pv number(17,6) default 0 not null, + month_pv number(17,6) default 0 not null, + new_pv number(17,6) default 0 not null, + new_team_pv number(17,6) default 0 not null, + dept_new_team_pv number(17,6) default 0 not null, + effective_num number(8) default 0 not null, + ev_effective_num number(8) default 0 not null, + provide_state number(1) default 1 not null, + buy_effective_num number(8) default 0 not null, + first_agent number(4) default 0 not null, + second_agent number(4) default 0 not null, + recommend_num number(8) default 0 not null, + team_num number(8) default 0 not null, + team_consume_amount number(17,6) default 0 not null, + team_consume_pv number(17,6) default 0 not null, + team_month_amount number(17,6) default 0 not null, + team_month_pv number(17,6) default 0 not null, dept_team_consume_amount number(17,6) default 0 not null, - dept_team_consume_pv number(17,6) default 0 not null, - dept_team_month_amount number(17,6) default 0 not null, - dept_team_month_pv number(17,6) default 0 not null, - small_area_pv number(17,6) default 0 not null, - assess_status number(2) default 3 not null, - month_member number(1) default 1 not null, - range_store_status number(1) default 0 not null + dept_team_consume_pv number(17,6) default 0 not null, + dept_team_month_amount number(17,6) default 0 not null, + dept_team_month_pv number(17,6) default 0 not null, + small_area_pv number(17,6) default 0 not null, + assess_status number(2) default 3 not null, + month_member number(1) default 1 not null, + range_store_status number(1) default 0 not null ) + create table ${tableName} ( pk_member NUMBER(20) not null, pk_parent NUMBER(20) not null, - pk_range_awards number(4) default 1 not null, + pk_range_awards number(4) default 1 not null, buy_effective_num number(8) default 0 not null, - first_agent number(4) default 0 not null, - second_agent number(4) default 0 not null, - new_pv number(17,6) default 0 not null, + first_agent number(4) default 0 not null, + second_agent number(4) default 0 not null, + new_pv number(17,6) default 0 not null, new_effective_num number(8) default 0 not null, - new_team_pv number(17,6) default 0 not null, - dept_new_team_pv number(17,6) default 0 not null, - assess_status number(2) default 3 not null, - consume_status number(2) default 1 not null, - month_member number(1) default 1 not null + new_team_pv number(17,6) default 0 not null, + dept_new_team_pv number(17,6) default 0 not null, + assess_status number(2) default 3 not null, + consume_status number(2) default 1 not null, + month_member number(1) default 1 not null ) + merge into ${rangeTableName} a - using( - select ct.pk_member,ba.pk_id pk_awards from ${rangeTableName} ct - inner join bd_awards ba - on ct.pk_settle_country = ba.pk_country - where ba.awards_value=0 and ba.del_flag=0) b - on (a.pk_member=b.pk_member) + using ( + select ct.pk_member, ba.pk_id pk_awards + from ${rangeTableName} ct + inner join bd_awards ba + on ct.pk_settle_country = ba.pk_country + where ba.awards_value = 0 + and ba.del_flag = 0) b + on (a.pk_member = b.pk_member) when matched then - update set a.pk_benefit_awards=b.pk_awards + update set a.pk_benefit_awards = b.pk_awards + merge into ${rangeTableName} a using ( - select pk_member,max(pk_awards) pk_awards from cu_member_settle_awards + select pk_member, max(pk_awards) pk_awards + from cu_member_settle_awards where period between #{startPeriod} and #{period} group by pk_member ) b - on (a.pk_member=b.pk_member) + on (a.pk_member = b.pk_member) when matched then - update set a.pk_benefit_awards=b.pk_awards + update set a.pk_benefit_awards = b.pk_awards + merge into cu_member a - using( - select ct.pk_id,ba.pk_id pk_awards from cu_member ct - inner join bd_awards ba - on ct.pk_settle_country = ba.pk_country - where ba.awards_value=0 and ba.del_flag=0 and ct.system_type=1) b - on (a.pk_id=b.pk_id) + using ( + select ct.pk_id, ba.pk_id pk_awards + from cu_member ct + inner join bd_awards ba + on ct.pk_settle_country = ba.pk_country + where ba.awards_value = 0 + and ba.del_flag = 0 + and ct.system_type = 1) b + on (a.pk_id = b.pk_id) when matched then - update set a.pk_benefit_awards=b.pk_awards,a.pk_max_awards=b.pk_awards + update set a.pk_benefit_awards = b.pk_awards,a.pk_max_awards = b.pk_awards + merge into cu_member a using ( - select ca.pk_member,max(ca.pk_awards) pk_awards from cu_member_settle_awards ca - inner join cu_member cm - on cm.pk_id=ca.pk_member - where cm.system_type= 1 and period between #{startPeriod} and #{period} + select ca.pk_member, max(ca.pk_awards) pk_awards + from cu_member_settle_awards ca + inner join cu_member cm + on cm.pk_id = ca.pk_member + where cm.system_type = 1 + and period between #{startPeriod} and #{period} group by ca.pk_member ) b - on (a.pk_id=b.pk_member) + on (a.pk_id = b.pk_member) when matched then - update set a.pk_benefit_awards=b.pk_awards + update set a.pk_benefit_awards = b.pk_awards + - delete from ${targetTableName} where period=#{period} + delete + from ${targetTableName} + where period = #{period} + truncate table ${tableName} + @@ -931,59 +1224,65 @@ from (select pk_member, pk_parent, pk_place_parent, place_dept from ${settleTableName} start with pk_place_parent = #{pkMember} and place_dept=#{placeDept} connect by pk_place_parent = prior pk_member) a - inner join (select cw.pk_member, cw.new_level pk_awards - from cu_member_awards cw - inner join(select pk_member, max(pk_id) pk_id - from cu_member_awards - where del_flag = 0 - and UP_TYPE in (1, 3) - group by pk_member) ca - on cw.pk_id = ca.pk_id) b - on a.pk_member = b.pk_member )a + inner join (select cw.pk_member, cw.new_level pk_awards + from cu_member_awards cw + inner join(select pk_member, max(pk_id) pk_id + from cu_member_awards + where del_flag = 0 + and UP_TYPE in (1, 3) + group by pk_member) ca + on cw.pk_id = ca.pk_id) b + on a.pk_member = b.pk_member) a inner join bd_awards ba - on a.pk_awards = ba.pk_id + on a.pk_awards = ba.pk_id where ba.awards_value >= (select awards_value from bd_awards where pk_id = #{awardsValue}) @@ -1134,9 +1587,9 @@ select - t.PK_RATE,t.A_BALANCE,t.B_BALANCE,t.A_SUM_AMOUNT,t.B_SUM_AMOUNT,t.A_SUM_PV,t.B_SUM_PV,t.A_NEW_AMOUNT, - t.B_NEW_AMOUNT,t.A_NEW_PV,t.B_NEW_PV,t.A_SUM_REAL_AMOUNT,t.B_SUM_REAL_AMOUNT,t.A_SUM_REAL_PV,t.B_SUM_REAL_PV, - t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, - t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, - t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, - t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, + t.PK_RATE,t.A_BALANCE,t.B_BALANCE,t.A_SUM_AMOUNT,t.B_SUM_AMOUNT,t.A_SUM_PV,t.B_SUM_PV,t.A_NEW_AMOUNT, + t.B_NEW_AMOUNT,t.A_NEW_PV,t.B_NEW_PV,t.A_SUM_REAL_AMOUNT,t.B_SUM_REAL_AMOUNT,t.A_SUM_REAL_PV,t.B_SUM_REAL_PV, + t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, + t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, + t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, + t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, - cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, - (select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0) directPushNumber + cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode, + (select count(cr.pk_id) from CU_MEMBER cr where cr.pk_parent = cm.pk_id and cr.del_flag = 0) directPushNumber from CU_MEMBER cm - left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT + left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT - left join ${tableName} t on cm.PK_ID = t.PK_MEMBER + left join ${tableName} t on cm.PK_ID = t.PK_MEMBER where cm.PK_ID = #{pkMember} - and cm.DEL_FLAG = 0 + and cm.DEL_FLAG = 0 - select - t.PK_RATE, - t.A_BALANCE, - t.B_BALANCE, - t.A_SUM_AMOUNT, - t.B_SUM_AMOUNT, - t.A_SUM_PV, - t.B_SUM_PV, - t.A_NEW_AMOUNT, - t.B_NEW_AMOUNT, - t.A_NEW_PV, - t.B_NEW_PV, - t.A_SUM_REAL_AMOUNT, - t.B_SUM_REAL_AMOUNT, - t.A_SUM_REAL_PV, - t.B_SUM_REAL_PV, - t.REP_A_BALANCE, - t.REP_B_BALANCE, - t.REP_A_NEW_AMOUNT, - t.REP_B_NEW_AMOUNT, - t.REP_A_NEW_PV, - t.REP_B_NEW_PV, - t.REP_A_SUM_AMOUNT, - t.REP_B_SUM_AMOUNT, - t.REP_A_SUM_PV, - t.REP_B_SUM_PV, - t.REGISTER_AMOUNT, - t.REGISTER_PV, - t.REGISTER_NEW_PV, - t.UPGRADE_AMOUNT, - t.UPGRADE_PV, - t.UPGRADE_NEW_PV, - t.REPURCHASE_AMOUNT, - t.REPURCHASE_PV, - t.REPURCHASE_NEW_PV, - t.HI_FUN_AMOUNT, - t.HI_FUN_PV, - t.HI_FUN_NEW_PV, - t.MALL_AMOUNT, - t.MALL_PV, - t.MALL_NEW_PV, - t.MIN_ACHIEVE, - t.ROUND, - t.SECOND, + t.PK_RATE, + t.A_BALANCE, + t.B_BALANCE, + t.A_SUM_AMOUNT, + t.B_SUM_AMOUNT, + t.A_SUM_PV, + t.B_SUM_PV, + t.A_NEW_AMOUNT, + t.B_NEW_AMOUNT, + t.A_NEW_PV, + t.B_NEW_PV, + t.A_SUM_REAL_AMOUNT, + t.B_SUM_REAL_AMOUNT, + t.A_SUM_REAL_PV, + t.B_SUM_REAL_PV, + t.REP_A_BALANCE, + t.REP_B_BALANCE, + t.REP_A_NEW_AMOUNT, + t.REP_B_NEW_AMOUNT, + t.REP_A_NEW_PV, + t.REP_B_NEW_PV, + t.REP_A_SUM_AMOUNT, + t.REP_B_SUM_AMOUNT, + t.REP_A_SUM_PV, + t.REP_B_SUM_PV, + t.REGISTER_AMOUNT, + t.REGISTER_PV, + t.REGISTER_NEW_PV, + t.UPGRADE_AMOUNT, + t.UPGRADE_PV, + t.UPGRADE_NEW_PV, + t.REPURCHASE_AMOUNT, + t.REPURCHASE_PV, + t.REPURCHASE_NEW_PV, + t.HI_FUN_AMOUNT, + t.HI_FUN_PV, + t.HI_FUN_NEW_PV, + t.MALL_AMOUNT, + t.MALL_PV, + t.MALL_NEW_PV, + t.MIN_ACHIEVE, + t.ROUND, + t.SECOND, - cm.*, cme.MEMBER_CODE parentMemberCode from ( select + cm.*, cme.MEMBER_CODE parentMemberCode from ( select level,cm.PK_ID, cm.PK_COUNTRY, cm.PK_PLACE_PARENT, @@ -1228,28 +1681,30 @@ cm.PLACE_DEPT, cm.MEMBER_NAME, cm.MEMBER_CODE, - cm.PK_ID PK_MEMBER, + cm.PK_ID PK_MEMBER, cm.PK_SETTLE_COUNTRY from CU_MEMBER cm - where 1 = 1 + where 1 = 1 - and level < #{level} + and level < #{level} and cm.del_flag = 0 start with cm.PK_PARENT = #{pkMember} connect by cm.PK_PARENT = prior cm.pk_id - order by cm.Place_Dept ASC ) cm + order by cm.Place_Dept ASC ) cm left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT - left join ${tableName} t - on cm.PK_ID = t.PK_MEMBER + left join ${tableName} t + on cm.PK_ID = t.PK_MEMBER - + select count(PK_MEMBER) + from ${tableName} t + left join CU_MEMBER cm on cm.pk_id = t.PK_MEMBER + where cm.PK_PARENT = #{pkMember} - select - nvl(sum(REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT),0) firstBuyAmount , - nvl(sum(UPGRADE_NEW_AMOUNT),0) upgradeAmount, - nvl(sum(REPURCHASE_NEW_AMOUNT),0) repurchaseAmount, - nvl(sum(HI_FUN_NEW_AMOUNT),0) fansAmount, - nvl(sum(REGISTER_NEW_PV+UPGRADE_NEW_PV),0) firstBuyAmountPv, - nvl(sum(UPGRADE_NEW_PV),0) upgradePv, - nvl(sum(REPURCHASE_NEW_PV),0) repurchasePv, - nvl(sum(HI_FUN_NEW_PV),0) hiFunAmountPv - from ${tableName} t + nvl(sum(REGISTER_NEW_AMOUNT + UPGRADE_NEW_AMOUNT),0) firstBuyAmount , + nvl(sum(UPGRADE_NEW_AMOUNT),0) upgradeAmount, + nvl(sum(REPURCHASE_NEW_AMOUNT),0) repurchaseAmount, + nvl(sum(HI_FUN_NEW_AMOUNT),0) fansAmount, + nvl(sum(REGISTER_NEW_PV+UPGRADE_NEW_PV),0) firstBuyAmountPv, + nvl(sum(UPGRADE_NEW_PV),0) upgradePv, + nvl(sum(REPURCHASE_NEW_PV),0) repurchasePv, + nvl(sum(HI_FUN_NEW_PV),0) hiFunAmountPv + from ${tableName} t left join cu_member cm on cm.pk_id = t.PK_MEMBER and cm.PK_VERTEX in @@ -1306,43 +1761,52 @@ - + select cu.place_dept, + cu.pk_member, + cu.member_code, + cu.member_name, + cu.phone, + cu.category, + cu.pk_grade, + bg.grade_value from ( - select t.place_dept, t.pk_member,t.member_name,t.member_code, t.phone,t.category,t.pk_grade - from ${tableName} t - where t.place_dept = 2 - start with t.pk_member = (select u.pk_member - from ${tableName} u - where u.pk_place_parent=#{pkMember} - and place_dept = 2) - connect by prior - t.pk_member = (select u.pk_place_parent - from ${tableName} u - where u.pk_member = t.pk_member - and u.place_dept = 2) - order by level desc) n - where rownum = 1)cu - left join bd_grade bg - on cu.pk_grade = bg.pk_id + select * + from (select t.place_dept, t.pk_member, t.member_name, t.member_code, t.phone, t.category, t.pk_grade + from ${tableName} t + where t.place_dept = 1 + start + with t.pk_member = (select u.pk_member + from ${tableName} u + where u.pk_place_parent=#{pkMember} + and place_dept = 1) + connect by prior + t.pk_member = (select u.pk_place_parent + from ${tableName} u + where u.pk_member = t.pk_member + and u.place_dept = 1) + order by level desc) n + where rownum = 1 + union + select * + from ( + select t.place_dept, t.pk_member, t.member_name, t.member_code, t.phone, t.category, t.pk_grade + from ${tableName} t + where t.place_dept = 2 + start + with t.pk_member = (select u.pk_member + from ${tableName} u + where u.pk_place_parent=#{pkMember} + and place_dept = 2) + connect by prior + t.pk_member = (select u.pk_place_parent + from ${tableName} u + where u.pk_member = t.pk_member + and u.place_dept = 2) + order by level desc) n + where rownum = 1) cu + left join bd_grade bg + on cu.pk_grade = bg.pk_id - select t.* - from ${tableName} t + from ${tableName} t where t.PK_MEMBER = #{pkMember} - select count(t.PK_ID) from CU_MEMBER t - where t.PLACE_DEPT = #{placeDept} - start with t.PK_PLACE_PARENT = #{memberId} + where t.PLACE_DEPT = #{placeDept} start + with t.PK_PLACE_PARENT = #{memberId} connect by t.PK_PLACE_PARENT = prior t.PK_ID order by level - select count(t.PK_ID) from CU_MEMBER t - where t.PLACE_DEPT = #{placeDept} - start with t.PK_PARENT = #{memberId} + where t.PLACE_DEPT = #{placeDept} start + with t.PK_PARENT = #{memberId} connect by t.PK_PARENT = prior t.PK_ID order by level @@ -1425,16 +1937,18 @@ - + select t.*, cm.PK_PLACE_PARENT, cm.PK_PARENT, level, cm.PLACE_DEPT from ${tableName} t - left join CU_MEMBER cm on cm.PK_ID = t.PK_MEMBER - where - cm.DEL_FLAG = 0 - start with cm.PK_PLACE_PARENT = #{pkMember} + left join CU_MEMBER cm on cm.PK_ID = t.PK_MEMBER + where cm.DEL_FLAG = 0 + start + with cm.PK_PLACE_PARENT = #{pkMember} connect by cm.PK_PLACE_PARENT = prior t.pk_member order by cm.PLACE_DEPT ASC @@ -1452,17 +1966,17 @@ cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode from CU_MEMBER cm - left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT + left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT - left join ${tableName} t on cm.PK_ID = t.PK_MEMBER + left join ${tableName} t on cm.PK_ID = t.PK_MEMBER where cm.PK_ID = #{pkMember} - and cm.DEL_FLAG = 0 + and cm.DEL_FLAG = 0 - + select count(cr.pk_id) parentMemberCount,cr.PK_PARENT pkMember from CU_MEMBER cr where cr.PK_PARENT in + @@ -1480,7 +1994,7 @@ select - t.PK_RATE,t.A_BALANCE,t.B_BALANCE,t.A_SUM_AMOUNT,t.B_SUM_AMOUNT,t.A_SUM_PV,t.B_SUM_PV,t.A_NEW_AMOUNT, - t.B_NEW_AMOUNT,t.A_NEW_PV,t.B_NEW_PV,t.A_SUM_REAL_AMOUNT,t.B_SUM_REAL_AMOUNT,t.A_SUM_REAL_PV,t.B_SUM_REAL_PV, - t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, - t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, - t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, - t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, + t.PK_RATE,t.A_BALANCE,t.B_BALANCE,t.A_SUM_AMOUNT,t.B_SUM_AMOUNT,t.A_SUM_PV,t.B_SUM_PV,t.A_NEW_AMOUNT, + t.B_NEW_AMOUNT,t.A_NEW_PV,t.B_NEW_PV,t.A_SUM_REAL_AMOUNT,t.B_SUM_REAL_AMOUNT,t.A_SUM_REAL_PV,t.B_SUM_REAL_PV, + t.REP_A_BALANCE,t.REP_B_BALANCE,t.REP_A_NEW_AMOUNT,t.REP_B_NEW_AMOUNT,t.REP_A_NEW_PV,t.REP_B_NEW_PV,t.REP_A_SUM_AMOUNT, + t.REP_B_SUM_AMOUNT,t.REP_A_SUM_PV,t.REP_B_SUM_PV,t.REGISTER_AMOUNT,t.REGISTER_PV,t.REGISTER_NEW_PV,t.UPGRADE_AMOUNT,t.UPGRADE_PV, + t.UPGRADE_NEW_PV,t.REPURCHASE_AMOUNT,t.REPURCHASE_PV,t.REPURCHASE_NEW_PV,t.HI_FUN_AMOUNT,t.HI_FUN_PV,t.HI_FUN_NEW_PV,t.MALL_AMOUNT, + t.MALL_PV ,t.MALL_NEW_PV,t.MIN_ACHIEVE,t.ROUND,t.SECOND, level,cm.PK_AWARDS,cm.PK_PLACE_PARENT,cm.PK_PARENT ,cm.PLACE_DEPT ,cm.MEMBER_NAME, cm.MEMBER_CODE,cm.PK_ID PK_MEMBER,cm.PK_COUNTRY,cm.PK_SETTLE_COUNTRY,cme.MEMBER_CODE parentMemberCode from ${tableName} t - left join CU_MEMBER cm on cm.PK_ID = t.PK_MEMBER - left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT + left join CU_MEMBER cm on cm.PK_ID = t.PK_MEMBER + left join CU_MEMBER cme on cme.PK_ID = cm.PK_PLACE_PARENT where level < #{level} and cm.PK_ID in @@ -1511,9 +2025,9 @@ order by cm.Place_Dept ASC - select - cm.*, cme.MEMBER_CODE parentMemberCode from ( select + cm.*, cme.MEMBER_CODE parentMemberCode from ( select level,cm.PK_ID, cm.PK_COUNTRY, cm.PK_PLACE_PARENT, @@ -1521,8 +2035,8 @@ cm.PLACE_DEPT, cm.MEMBER_NAME, cm.MEMBER_CODE, - cm.PK_ID PK_MEMBER, - cm.PK_SETTLE_COUNTRY, t.PK_RATE, + cm.PK_ID PK_MEMBER, + cm.PK_SETTLE_COUNTRY, t.PK_RATE, t.A_BALANCE, t.B_BALANCE, t.A_SUM_AMOUNT, @@ -1568,21 +2082,21 @@ from ${tableName} t left join CU_MEMBER cm on cm.PK_ID = t.PK_MEMBER - where 1 = 1 + where 1 = 1 - and level < #{level} + and level < #{level} and cm.del_flag = 0 start with cm.PK_PARENT = #{pkMember} connect by cm.PK_PARENT = prior cm.pk_id - order by cm.Place_Dept ASC ) cm + order by cm.Place_Dept ASC ) cm left join CU_MEMBER cme on cme.PK_ID = cm.PK_PARENT - + select count(cr.PK_MEMBER) parentMemberCount,cr.PK_PARENT pkMember from cu_member_settle981 cr where cr.PK_PARENT in + @@ -1599,7 +2113,7 @@ diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMapper.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMapper.java index 53284aa9..a6d11b1c 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMapper.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMapper.java @@ -1,12 +1,7 @@ package com.hzs.report.member.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.CuMemberPerkDetail; -import com.hzs.common.domain.report.member.ext.CuMemberPerkDetailExt; -import org.apache.ibatis.annotations.Param; - -import java.util.Collection; /** * 会员补贴明细 Mapper 接口 @@ -16,33 +11,4 @@ import java.util.Collection; */ public interface CuMemberPerkDetailMapper extends BaseMapper { - /** - * 删除补贴明细（物理） - * - * @param pkMemberPerk 会员补贴配置ID - * @param calculateDate 计算日期 - * @return - */ - int clearDetail(@Param("pkMemberPerk") Long pkMemberPerk, @Param("calculateDate") String calculateDate); - - /** - * 查询血缘上第一个补贴配置（统计条件全部相同，必须去重的） - * - * @param queryMemberPerk 会员配置 - * @param calculateDateStr 查询日期 - * @param period 查询期数 - * @return - */ - CuMemberPerkDetail queryFirstParentPerk(@Param("queryMemberPerk") CuMemberPerk queryMemberPerk, - @Param("calculateDateStr") String calculateDateStr, - @Param("period") Integer period); - - /** - * 批量更新去重数据 - * - * @param detailList 补贴明细数据列表 - * @return - */ - int updateDistinctDataBatch(@Param("detailList") Collection detailList); - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMemberMapper.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMemberMapper.java index c6292719..bd4b6d90 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMemberMapper.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailMemberMapper.java @@ -15,22 +15,6 @@ import java.util.List; */ public interface CuMemberPerkDetailMemberMapper extends BaseMapper { - /** - * 删除补贴明细会员（物理） - * - * @param perkDetailMemberList 补贴明细会员列表 - * @return - */ - int clearMember(@Param("perkDetailMemberList") List perkDetailMemberList); - - /** - * 批量插入补贴明细会员 - * - * @param perkDetailMemberList 补贴明细会员列表 - * @return - */ - int insertBatch(@Param("perkDetailMemberList") List perkDetailMemberList); - /** * 查询明细会员列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailOrderMapper.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailOrderMapper.java index 39c2dbe1..dfb276da 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailOrderMapper.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkDetailOrderMapper.java @@ -15,27 +15,6 @@ import java.util.List; */ public interface CuMemberPerkDetailOrderMapper extends BaseMapper { - /** - * 删除补贴订单明细（物理） - * - * @param pkMemberPerk 会员补贴配置ID - * @param calculateDate 计算日期 - * @return - */ - int clearOrder(@Param("pkMemberPerk") Long pkMemberPerk, @Param("calculateDate") String calculateDate); - - /** - * 批量插入补贴明细订单 - * - * @param pkMemberPerk 补贴配置ID - * @param pkMemberPerkDetail 补贴配置明细ID - * @param orderList 订单列表 - * @return - */ - int insertBatch(@Param("pkMemberPerk") Long pkMemberPerk, - @Param("pkMemberPerkDetail") Long pkMemberPerkDetail, - @Param("orderList") List orderList); - /** * 查询明细订单列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkMapper.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkMapper.java index b5456bb1..bbef723f 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkMapper.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/mapper/CuMemberPerkMapper.java @@ -1,14 +1,11 @@ package com.hzs.report.member.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.ext.CuMemberPerkExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.report.member.param.MemberPerkQueryParam; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** @@ -19,48 +16,6 @@ import java.util.List; */ public interface CuMemberPerkMapper extends BaseMapper { - /** - * 查询需要处理的补贴配置数据 - * - * @param nowDate 当前时间 - * @param pkCountry 所属国家 （可为空，默认为中国） - * @return - */ - List queryHandleData(@Param("nowDate") Date nowDate, @Param("pkCountry") Integer pkCountry); - - /** - * 查询时间范围时间ID - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - List queryPeriodIdByDate(@Param("startDate") Date startDate, @Param("endDate") Date endDate); - - /** - * 查询需要统计的订单数据 - * - * @param pkMember 会员ID - * @param queryDate 查询日期 - * @param period 查询期数 - * @param notProductList 不包含产品ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryOrderData(@Param("pkMember") Long pkMember, - @Param("queryDate") Date queryDate, - @Param("period") Integer period, - @Param("notProductList") List notProductList, - @Param("pkCountry") Integer pkCountry); - - /** - * 更新会员补贴数据 - * - * @param pkId 补贴配置ID - * @return - */ - int updateMemberPerkData(@Param("pkId") Long pkId); - /** * 补贴配置列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/provider/MemberPerkServiceProvider.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/provider/MemberPerkServiceProvider.java deleted file mode 100644 index c34e439d..00000000 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/provider/MemberPerkServiceProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hzs.report.member.provider; - -import cn.hutool.core.collection.CollectionUtil; -import com.hzs.common.core.domain.R; -import com.hzs.common.domain.report.member.CuMemberPerk; -import com.hzs.report.member.service.ICuMemberPerkBusinessService; -import com.hzs.report.member.service.ICuMemberPerkService; -import com.hzs.report.perk.IMemberPerkServiceApi; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Date; -import java.util.List; - -/** - * @Description: 会员补贴dubbo服务 - * @Author: jiang chao - * @Time: 2024/4/22 16:41 - * @Classname: MemberPerkServiceProvider - * @PackageName: com.hzs.report.member.provider - */ -@Slf4j -@DubboService -public class MemberPerkServiceProvider implements IMemberPerkServiceApi { - - @Autowired - private ICuMemberPerkService iCuMemberPerkService; - @Autowired - private ICuMemberPerkBusinessService iCuMemberPerkBusinessService; - - @Override - public R memberPerkHandle() { - try { - String str = null; - - // 需要处理数据的补贴配置 - List memberPerkList = iCuMemberPerkService.queryHandleData(new Date(), null); - if (CollectionUtil.isNotEmpty(memberPerkList)) { - str = iCuMemberPerkBusinessService.memberPerkHandle(memberPerkList); - } - - if (null == str) { - return R.ok(); - } - return R.fail(str); - } catch (Exception e) { - log.error("会员补贴处理异常：{}", e.getMessage(), e); - return R.fail(e.getMessage()); - } - } - -} diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkBusinessService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkBusinessService.java index a4f7c15d..bae2718b 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkBusinessService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkBusinessService.java @@ -1,9 +1,5 @@ package com.hzs.report.member.service; -import com.hzs.common.domain.report.member.CuMemberPerk; - -import java.util.List; - /** * @Description: 会员补贴配置业务处理服务 * @Author: jiang chao @@ -13,12 +9,5 @@ import java.util.List; */ public interface ICuMemberPerkBusinessService { - /** - * 会员补贴处理 - * - * @param memberPerkList 会员补贴数据 - * @return - */ - String memberPerkHandle(List memberPerkList); } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailMemberService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailMemberService.java index 31aaa2eb..09c8cac7 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailMemberService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailMemberService.java @@ -14,22 +14,6 @@ import java.util.List; */ public interface ICuMemberPerkDetailMemberService extends IService { - /** - * 删除补贴明细会员（物理） - * - * @param perkDetailMemberList 补贴明细会员 - * @return - */ - int clearMember(List perkDetailMemberList); - - /** - * 批量插入补贴明细会员 - * - * @param perkDetailMemberList 补贴明细会员列表 - * @return - */ - int insertBatch(List perkDetailMemberList); - /** * 查询明细会员列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailOrderService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailOrderService.java index c00b96a2..650b2289 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailOrderService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailOrderService.java @@ -14,25 +14,6 @@ import java.util.List; */ public interface ICuMemberPerkDetailOrderService extends IService { - /** - * 删除补贴订单明细（物理） - * - * @param pkMemberPerk 会员补贴配置ID - * @param calculateDate 计算日期 - * @return - */ - int clearOrder(Long pkMemberPerk, String calculateDate); - - /** - * 批量插入补贴订单明细 - * - * @param pkMemberPerk 补贴配置ID - * @param pkMemberPerkDetail 补贴配置明细ID - * @param orderList 订单列表 - * @return - */ - int insertBatch(Long pkMemberPerk, Long pkMemberPerkDetail, List orderList); - /** * 查询明细订单列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailService.java index 4e0a2c8c..6bcd9c83 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkDetailService.java @@ -1,11 +1,7 @@ package com.hzs.report.member.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.CuMemberPerkDetail; -import com.hzs.common.domain.report.member.ext.CuMemberPerkDetailExt; - -import java.util.Collection; /** * 会员补贴明细 服务类 @@ -15,31 +11,4 @@ import java.util.Collection; */ public interface ICuMemberPerkDetailService extends IService { - /** - * 删除补贴明细（物理） - * - * @param pkMemberPerk 会员补贴配置ID - * @param calculateDate 计算日期 - * @return - */ - int clearDetail(Long pkMemberPerk, String calculateDate); - - /** - * 查询血缘上第一个补贴配置（统计条件全部相同，必须去重的） - * - * @param queryMemberPerk 会员配置 - * @param calculateDateStr 查询日期 - * @param period 查询期数 - * @return - */ - CuMemberPerkDetail queryFirstParentPerk(CuMemberPerk queryMemberPerk, String calculateDateStr, Integer period); - - /** - * 批量更新去重数据 - * - * @param detailList 补贴明细数据列表 - * @return - */ - int updateDistinctDataBatch(Collection detailList); - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkProductService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkProductService.java index 10678f7e..361bf51d 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkProductService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkProductService.java @@ -3,8 +3,6 @@ package com.hzs.report.member.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.report.member.CuMemberPerkProduct; -import java.util.List; - /** * 会员补贴产品配置 服务类 * @@ -13,12 +11,4 @@ import java.util.List; */ public interface ICuMemberPerkProductService extends IService { - /** - * 查询补贴产品 - * - * @param type 参与考核（0=是，1=否） - * @return - */ - List queryPerkProductList(Integer type); - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkService.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkService.java index d7fc65e3..f7386fb4 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkService.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/ICuMemberPerkService.java @@ -1,13 +1,10 @@ package com.hzs.report.member.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.ext.CuMemberPerkExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.report.member.param.MemberPerkQueryParam; -import java.util.Date; import java.util.List; /** @@ -18,44 +15,6 @@ import java.util.List; */ public interface ICuMemberPerkService extends IService { - /** - * 查询需要处理的补贴配置数据 - * - * @param nowDate 当前时间 - * @param pkCountry 所属国家 （可为空，默认为中国） - * @return - */ - List queryHandleData(Date nowDate, Integer pkCountry); - - /** - * 查询时间范围时间ID - * - * @param startDate 开始时间 - * @param endDate 结束时间 - * @return - */ - List queryPeriodIdByDate(Date startDate, Date endDate); - - /** - * 查询需要统计的订单数据 - * - * @param pkMember 会员ID - * @param queryDate 查询日期 - * @param period 查询期数 - * @param notProductList 不包含产品ID列表 - * @param pkCountry 所属国家 - * @return - */ - List queryOrderData(Long pkMember, Date queryDate, Integer period, List notProductList, Integer pkCountry); - - /** - * 更新会员补贴数据 - * - * @param pkId 补贴配置ID - * @return - */ - int updateMemberPerkData(Long pkId); - /** * 补贴配置列表 * diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkBusinessServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkBusinessServiceImpl.java index 1b121fe3..bb7545bc 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkBusinessServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkBusinessServiceImpl.java @@ -1,31 +1,8 @@ package com.hzs.report.member.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.enums.EAccount; -import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.account.CuMemberTrade; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; -import com.hzs.common.domain.report.member.CuMemberPerk; -import com.hzs.common.domain.report.member.CuMemberPerkDetail; -import com.hzs.common.domain.report.member.CuMemberPerkDetailMember; -import com.hzs.common.domain.report.member.ext.CuMemberPerkDetailExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; -import com.hzs.common.domain.system.config.BdAccount; import com.hzs.report.member.service.*; -import com.hzs.system.config.IAccountServiceApi; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; /** * @Description: 会员补贴配置业务处理服务 @@ -38,257 +15,4 @@ import java.util.*; @Service public class CuMemberPerkBusinessServiceImpl implements ICuMemberPerkBusinessService { - @Autowired - private ICuMemberPerkService iCuMemberPerkService; - @Autowired - private ICuMemberPerkDetailService iCuMemberPerkDetailService; - @Autowired - private ICuMemberPerkDetailOrderService iCuMemberPerkDetailOrderService; - @Autowired - private ICuMemberPerkDetailMemberService iCuMemberPerkDetailMemberService; - @Autowired - private ICuMemberPerkProductService iCuMemberPerkProductService; - - @DubboReference - IAccountServiceApi iAccountServiceApi; - - @Transactional(rollbackFor = Exception.class) - @Override - public String memberPerkHandle(List memberPerkList) { - if (CollectionUtil.isNotEmpty(memberPerkList)) { - // 当前时间 - Date nowDate = new Date(); - // 创建人 - Long pkCreator = MagicNumberConstants.PK_ADMIN; - // 所属国家（默认中国） - Integer pkCountry = CountryConstants.CHINA_COUNTRY; - - // 开始时间（7天前0点） - Date startDate = DateUtils.getStartTime(DateUtils.addDays(nowDate, -7)); - // 结束时间（今天0点） - Date endDate = DateUtils.getStartTime(nowDate); - - // 拉取奖金期间（需要跑数据的7天） - List periodList = iCuMemberPerkService.queryPeriodIdByDate(startDate, endDate); - - // 国家下所有币种 - Map accountMap = iAccountServiceApi.getAccountMapByCountry(pkCountry).getData(); - // 政策币ID - Integer pkPolicy = accountMap.get(EAccount.POLICY.getValue()).getPkId(); - // 复购券ID - Integer pkRepurchase = accountMap.get(EAccount.REPURCHASE.getValue()).getPkId(); - - // 查询需要排除的产品（2024.04.23 沟通暂时先全去舱） - List notProductList = iCuMemberPerkProductService.queryPerkProductList(EYesNo.NO.getIntValue()); - // 记录重算的补贴每天明细map（key：补贴配置ID + 日期 ，value：补贴明细数据） - Map perkDetailMap = new HashMap<>(); - - // 遍历补贴配置（计算累计的金额、业绩） - for (CuMemberPerk cuMemberPerk : memberPerkList) { - // 补贴配置ID - Long pkMemberPerk = cuMemberPerk.getPkId(); - - // 遍历更新期数 - for (CuMemberSettlePeriod settlePeriod : periodList) { - // 查询数据时间 - Date calculateDate = settlePeriod.getSettleDate(); - // 查询数据时间字符串 - String calculateDateStr = DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, calculateDate); - - if (cuMemberPerk.getCalculateStartDate().compareTo(calculateDate) <= 0 - && cuMemberPerk.getCalculateEndDate().compareTo(calculateDate) >= 0) { - // 本次循环处理时间在本条补贴配置的执行时间之内，则需要重新计算数据 - - // 查询会员血缘伞下订单相关数据 - List orderList = iCuMemberPerkService.queryOrderData(cuMemberPerk.getPkMember(), calculateDate, settlePeriod.getPkId(), notProductList, pkCountry); - if (CollectionUtil.isNotEmpty(orderList)) { - // 有当天的订单需要处理 - // 首购金额 - BigDecimal firstAmount = BigDecimal.ZERO; - // 首购业绩 - BigDecimal firstAchieve = BigDecimal.ZERO; - // 复购金额 - BigDecimal repurchaseAmount = BigDecimal.ZERO; - // 复购业绩 - BigDecimal repurchaseAchieve = BigDecimal.ZERO; - // 使用政策币 - BigDecimal policyAmount = null; - // 使用复购券 - BigDecimal repurchaseCouponAmount = null; - - for (SaOrderExt saOrderExt : orderList) { - switch (EOrderType.getEnumByValue(saOrderExt.getOrderType())) { - case REGISTER_ORDER: - case UPGRADE_ORDER: - case SPECIAL_REGISTER_ORDER: - case SPECIAL_UPGRADE_ORDER: - // 首购（注册、升级、特殊注册、特殊升级、虚拟订单) - firstAmount = firstAmount.add(saOrderExt.getOrderAmount()); - firstAchieve = firstAchieve.add(saOrderExt.getOrderAchieve()); - break; - case REPURCHASE_ORDER: - case WELFARE_ORDER: - case SPECIAL_REPURCHASE_ORDER: - } - - // 订单支付流水 - List tradeList = saOrderExt.getTradeList(); - for (CuMemberTrade cuMemberTrade : tradeList) { - if (cuMemberTrade.getPkAccount().equals(pkPolicy)) { - // 政策币 - if (null == policyAmount) { - policyAmount = cuMemberTrade.getTradeAmount().abs(); - } - } else if (cuMemberTrade.getPkAccount().equals(pkRepurchase)) { - // 复购券 - if (null == repurchaseCouponAmount) { - repurchaseCouponAmount = cuMemberTrade.getTradeAmount().abs(); - } - } - if (null != policyAmount && null != repurchaseCouponAmount) { - break; - } - } - } - - // 会员补贴明细 - CuMemberPerkDetail cuMemberPerkDetail = new CuMemberPerkDetail(); - cuMemberPerkDetail.setPolicyAmount(policyAmount); - cuMemberPerkDetail.setRepurchaseCouponAmount(repurchaseCouponAmount); - cuMemberPerkDetail.setFirstAmount(firstAmount); - cuMemberPerkDetail.setFirstAchieve(firstAchieve); - cuMemberPerkDetail.setRepurchaseAmount(repurchaseAmount); - cuMemberPerkDetail.setRepurchaseAchieve(repurchaseAchieve); - cuMemberPerkDetail.setDistinctFirstAmount(BigDecimal.ZERO); - cuMemberPerkDetail.setDistinctFirstAchieve(BigDecimal.ZERO); - cuMemberPerkDetail.setDistinctRepurchaseAmount(BigDecimal.ZERO); - cuMemberPerkDetail.setDistinctRepurchaseAchieve(BigDecimal.ZERO); - - QueryWrapper memberPerkDetailQueryWrapper = new QueryWrapper<>(); - memberPerkDetailQueryWrapper.eq("PK_MEMBER_PERK", pkMemberPerk); - memberPerkDetailQueryWrapper.eq("CALCULATE_DATE", calculateDateStr); - CuMemberPerkDetail memberPerkDetail = iCuMemberPerkDetailService.getOne(memberPerkDetailQueryWrapper); - if (null == memberPerkDetail) { - // 没有补贴明细，需要新増 - cuMemberPerkDetail.setPkMemberPerk(pkMemberPerk); - cuMemberPerkDetail.setCalculateDate(calculateDateStr); - cuMemberPerkDetail.setCreationTime(nowDate); - cuMemberPerkDetail.setPkCreator(pkCreator); - cuMemberPerkDetail.setPkCountry(pkCountry); - iCuMemberPerkDetailService.save(cuMemberPerkDetail); - } else { - // 有补贴明细，需要更新 - cuMemberPerkDetail.setPkId(memberPerkDetail.getPkId()); - cuMemberPerkDetail.setModifiedTime(nowDate); - cuMemberPerkDetail.setPkModified(pkCreator); - iCuMemberPerkDetailService.updateById(cuMemberPerkDetail); - // 删除补贴订单明细（物理） - iCuMemberPerkDetailOrderService.clearOrder(pkMemberPerk, calculateDateStr); - } - - // 记录重算的补贴每天明细 - perkDetailMap.put(pkMemberPerk + calculateDateStr, cuMemberPerkDetail); - - // 批量插入补贴明细订单 - iCuMemberPerkDetailOrderService.insertBatch(pkMemberPerk, cuMemberPerkDetail.getPkId(), orderList); - } else { - // 没有当天的订单 - // 删除补贴订单明细（物理） - iCuMemberPerkDetailOrderService.clearOrder(pkMemberPerk, calculateDateStr); - // 删除补贴明细（物理） - iCuMemberPerkDetailService.clearDetail(pkMemberPerk, calculateDateStr); - } - } - } - } - - // 需要更新去重的补贴配置明细map（key：需要更新的补贴配置， value：更新补贴配置数据明细） - Map distinctMemberPerkMap = new HashMap<>(); - // 需要入库的补贴明细会员 - List perkDetailMemberList = new ArrayList<>(); - // 遍历补贴配置（计算血缘上去重业绩） - for (CuMemberPerk cuMemberPerk : memberPerkList) { - // 补贴配置ID - Long pkMemberPerk = cuMemberPerk.getPkId(); - - // 遍历更新期数 - for (CuMemberSettlePeriod settlePeriod : periodList) { - // 查询数据时间 - Date calculateDate = settlePeriod.getSettleDate(); - // 查询数据时间字符串 - String calculateDateStr = DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, calculateDate); - - if (cuMemberPerk.getCalculateStartDate().compareTo(calculateDate) <= 0 - && cuMemberPerk.getCalculateEndDate().compareTo(calculateDate) >= 0) { - // 本次循环处理时间在本条补贴配置的执行时间之内，则需要重新计算数据 - - // 当前配置当前天，计算的数据（需要把金额、业绩去重） - CuMemberPerkDetail nowPerkDetail = perkDetailMap.get(pkMemberPerk + calculateDateStr); - if (null != nowPerkDetail - && nowPerkDetail.getFirstAmount().compareTo(BigDecimal.ZERO) > 0 - && nowPerkDetail.getFirstAchieve().compareTo(BigDecimal.ZERO) > 0 - && nowPerkDetail.getRepurchaseAmount().compareTo(BigDecimal.ZERO) > 0 - && nowPerkDetail.getRepurchaseAchieve().compareTo(BigDecimal.ZERO) > 0 - ) { - // 当存在数据，并且 首购金额、业绩，复购金额、业绩 都不为0时才进行处理 - - // 查询血缘上第一个补贴配置（这个是需要进行去重的数据，找到的人必须各种条件与当前配置一致，并且需要去重） - CuMemberPerkDetail tmpPerkDetail = iCuMemberPerkDetailService.queryFirstParentPerk(cuMemberPerk, calculateDateStr, settlePeriod.getPkId()); - if (null != tmpPerkDetail) { - // 需要去重的数据 - CuMemberPerkDetailExt distinctPerkDetailExt = distinctMemberPerkMap.get(tmpPerkDetail.getPkId()); - if (null == distinctPerkDetailExt) { - // 如果不存在，直接初始化去重金额、业绩 - distinctPerkDetailExt = new CuMemberPerkDetailExt(); - distinctPerkDetailExt.setPkId(tmpPerkDetail.getPkId()); - distinctPerkDetailExt.setDistinctFirstAmount(nowPerkDetail.getFirstAmount()); - distinctPerkDetailExt.setDistinctFirstAchieve(nowPerkDetail.getFirstAchieve()); - distinctPerkDetailExt.setDistinctRepurchaseAmount(nowPerkDetail.getRepurchaseAmount()); - distinctPerkDetailExt.setDistinctRepurchaseAchieve(nowPerkDetail.getRepurchaseAchieve()); - distinctPerkDetailExt.setDistinctPkMember(cuMemberPerk.getPkMember()); - distinctMemberPerkMap.put(tmpPerkDetail.getPkId(), distinctPerkDetailExt); - } else { - // 如果已经存在，则累加去重金额、业绩 - // 同一会员，时间范围内，配置了多条，去重金额、业绩只需要记录一份，实际业务不会发生 - if (!distinctPerkDetailExt.getDistinctPkMember().equals(cuMemberPerk.getPkMember())) { - distinctPerkDetailExt.setDistinctFirstAmount(distinctPerkDetailExt.getDistinctFirstAmount().add(nowPerkDetail.getFirstAmount())); - distinctPerkDetailExt.setDistinctFirstAchieve(distinctPerkDetailExt.getDistinctFirstAchieve().add(nowPerkDetail.getFirstAchieve())); - distinctPerkDetailExt.setDistinctRepurchaseAmount(distinctPerkDetailExt.getDistinctRepurchaseAmount().add(nowPerkDetail.getRepurchaseAmount())); - distinctPerkDetailExt.setDistinctRepurchaseAchieve(distinctPerkDetailExt.getDistinctRepurchaseAchieve().add(nowPerkDetail.getRepurchaseAchieve())); - } - } - - // 补贴明细会员 - CuMemberPerkDetailMember cuMemberPerkDetailMember = new CuMemberPerkDetailMember(); - cuMemberPerkDetailMember.setPkMemberPerk(tmpPerkDetail.getPkMemberPerk()); - cuMemberPerkDetailMember.setPkMemberPerkDetail(tmpPerkDetail.getPkId()); - cuMemberPerkDetailMember.setDistinctPkMember(cuMemberPerk.getPkMember()); - cuMemberPerkDetailMember.setDistinctPkMemberPerk(cuMemberPerk.getPkId()); - perkDetailMemberList.add(cuMemberPerkDetailMember); - } - } - } - } - } - if (distinctMemberPerkMap.size() > 0) { - // 更新补贴明细的去重相关数据 - iCuMemberPerkDetailService.updateDistinctDataBatch(distinctMemberPerkMap.values()); - } - if (perkDetailMemberList.size() > 0) { - // 处理补贴明细会员数据 - // 删除补贴明细会员（物理） - iCuMemberPerkDetailMemberService.clearMember(perkDetailMemberList); - // 批量插入补贴明细会员 - iCuMemberPerkDetailMemberService.insertBatch(perkDetailMemberList); - } - - // 遍历补贴配置（计算血缘上去重业绩） - for (CuMemberPerk cuMemberPerk : memberPerkList) { - // 更新补贴配置表中数据 - iCuMemberPerkService.updateMemberPerkData(cuMemberPerk.getPkId()); - } - } - return null; - } - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailMemberServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailMemberServiceImpl.java index 91f01727..95ad915d 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailMemberServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailMemberServiceImpl.java @@ -18,16 +18,6 @@ import java.util.List; @Service public class CuMemberPerkDetailMemberServiceImpl extends ServiceImpl implements ICuMemberPerkDetailMemberService { - @Override - public int clearMember(List perkDetailMemberList) { - return baseMapper.clearMember(perkDetailMemberList); - } - - @Override - public int insertBatch(List perkDetailMemberList) { - return baseMapper.insertBatch(perkDetailMemberList); - } - @Override public List queryMemberList(Long pkMemberPerk) { return baseMapper.queryMemberList(pkMemberPerk); diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailOrderServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailOrderServiceImpl.java index 6dad19b0..30b926d6 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailOrderServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailOrderServiceImpl.java @@ -18,16 +18,6 @@ import java.util.List; @Service public class CuMemberPerkDetailOrderServiceImpl extends ServiceImpl implements ICuMemberPerkDetailOrderService { - @Override - public int clearOrder(Long pkMemberPerk, String calculateDate) { - return baseMapper.clearOrder(pkMemberPerk, calculateDate); - } - - @Override - public int insertBatch(Long pkMemberPerk, Long pkMemberPerkDetail, List orderList) { - return baseMapper.insertBatch(pkMemberPerk, pkMemberPerkDetail, orderList); - } - @Override public List queryOrderList(Long pkMemberPerk) { return baseMapper.queryOrderList(pkMemberPerk); diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailServiceImpl.java index c3daf3ba..70b41cfc 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkDetailServiceImpl.java @@ -1,15 +1,11 @@ package com.hzs.report.member.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.CuMemberPerkDetail; -import com.hzs.common.domain.report.member.ext.CuMemberPerkDetailExt; import com.hzs.report.member.mapper.CuMemberPerkDetailMapper; import com.hzs.report.member.service.ICuMemberPerkDetailService; import org.springframework.stereotype.Service; -import java.util.Collection; - /** * 会员补贴明细 服务实现类 * @@ -19,19 +15,4 @@ import java.util.Collection; @Service public class CuMemberPerkDetailServiceImpl extends ServiceImpl implements ICuMemberPerkDetailService { - @Override - public int clearDetail(Long pkMemberPerk, String calculateDate) { - return baseMapper.clearDetail(pkMemberPerk, calculateDate); - } - - @Override - public CuMemberPerkDetail queryFirstParentPerk(CuMemberPerk queryMemberPerk, String calculateDateStr, Integer period) { - return baseMapper.queryFirstParentPerk(queryMemberPerk, calculateDateStr, period); - } - - @Override - public int updateDistinctDataBatch(Collection detailList) { - return baseMapper.updateDistinctDataBatch(detailList); - } - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkProductServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkProductServiceImpl.java index c8e09ab0..5ee6def2 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkProductServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkProductServiceImpl.java @@ -1,17 +1,11 @@ package com.hzs.report.member.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.domain.report.member.CuMemberPerkProduct; import com.hzs.report.member.mapper.CuMemberPerkProductMapper; import com.hzs.report.member.service.ICuMemberPerkProductService; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - /** * 会员补贴产品配置 服务实现类 * @@ -21,15 +15,4 @@ import java.util.stream.Collectors; @Service public class CuMemberPerkProductServiceImpl extends ServiceImpl implements ICuMemberPerkProductService { - @Override - public List queryPerkProductList(Integer type) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("TYPE", type); - List perkProductList = this.list(queryWrapper); - if (CollectionUtil.isNotEmpty(perkProductList)) { - return perkProductList.stream().map(CuMemberPerkProduct::getPkProduct).collect(Collectors.toList()); - } - return Collections.emptyList(); - } - } diff --git a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkServiceImpl.java b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkServiceImpl.java index 31e19ca8..976aa0eb 100644 --- a/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkServiceImpl.java +++ b/hzs-business/hzs-business-report/src/main/java/com/hzs/report/member/service/impl/CuMemberPerkServiceImpl.java @@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.utils.DateUtils; -import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.report.member.CuMemberPerk; import com.hzs.common.domain.report.member.CuMemberPerkDetail; import com.hzs.common.domain.report.member.ext.CuMemberPerkExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.report.member.mapper.CuMemberPerkMapper; import com.hzs.report.member.param.MemberPerkQueryParam; import com.hzs.report.member.service.ICuMemberPerkDetailService; @@ -34,26 +32,6 @@ public class CuMemberPerkServiceImpl extends ServiceImpl queryHandleData(Date nowDate, Integer pkCountry) { - return baseMapper.queryHandleData(nowDate, pkCountry); - } - - @Override - public List queryPeriodIdByDate(Date startDate, Date endDate) { - return baseMapper.queryPeriodIdByDate(startDate, endDate); - } - - @Override - public List queryOrderData(Long pkMember, Date queryDate, Integer period, List notProductList, Integer pkCountry) { - return baseMapper.queryOrderData(pkMember, queryDate, period, notProductList, pkCountry); - } - - @Override - public int updateMemberPerkData(Long pkId) { - return baseMapper.updateMemberPerkData(pkId); - } - @Override public List queryList(MemberPerkQueryParam param, Integer pkCountry) { return baseMapper.queryList(param, pkCountry); diff --git a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMapper.xml b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMapper.xml index fa0379fb..566fc0d3 100644 --- a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMapper.xml +++ b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMapper.xml @@ -2,88 +2,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - delete - from CU_MEMBER_PERK_DETAIL cmpd - where cmpd.del_flag = 0 - and cmpd.pk_member_perk = #{pkMemberPerk} - and cmpd.calculate_date = #{calculateDate} - - - - - - - - MERGE INTO CU_MEMBER_PERK_DETAIL cmpd - USING ( - - select #{item.pkId} pk_id, - #{item.distinctFirstAmount} distinct_first_amount, - #{item.distinctFirstAchieve} distinct_first_achieve, - #{item.distinctRepurchaseAmount} distinct_repurchase_amount, - #{item.distinctRepurchaseAchieve} distinct_repurchase_achieve - from dual - - ) tmp - on (tmp.pk_id = cmpd.pk_id) - WHEN MATCHED THEN - update - set cmpd.distinct_first_amount = tmp.distinct_first_amount, - cmpd.distinct_first_achieve = tmp.distinct_first_achieve, - cmpd.distinct_repurchase_amount = tmp.distinct_repurchase_amount, - cmpd.distinct_repurchase_achieve = tmp.distinct_repurchase_achieve - - diff --git a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMemberMapper.xml b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMemberMapper.xml index bd7ccbc9..26b399cb 100644 --- a/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMemberMapper.xml +++ b/hzs-business/hzs-business-report/src/main/resources/mapper/report/member/CuMemberPerkDetailMemberMapper.xml @@ -2,32 +2,6 @@ - - - - - - - - - - - delete from cu_member_perk_detail_member cmpdm - where (cmpdm.pk_member_perk, cmpdm.pk_member_perk_detail) in - - select #{item.pkMemberPerk}, #{item.pkMemberPerkDetail} from dual - - - - - - insert into cu_member_perk_detail_member - (pk_member_perk, pk_member_perk_detail, distinct_pk_member, distinct_pk_member_perk) - - select #{item.pkMemberPerk}, #{item.pkMemberPerkDetail}, #{item.distinctPkMember}, #{item.distinctPkMemberPerk} from dual - - - - select cmp.* - from CU_MEMBER_PERK cmp - where cmp.del_flag = 0 - and cmp.status = 3 - - - and cmp.pk_country = #{pkCountry} - - - and cmp.pk_country = 1 - - - and #{nowDate} >= cmp.CALCULATE_START_DATE - and cmp.CALCULATE_END_DATE >= #{nowDate} - - - - - - - - - - - - - - - - - - - - - - - - update CU_MEMBER_PERK cmp - set ( - cmp.USED_POLICY, - cmp.USED_REPURCHASE, - FIRST_AMOUNT, - FIRST_ACHIEVE, - REPURCHASE_AMOUNT, - REPURCHASE_ACHIEVE, - DISTINCT_FIRST_AMOUNT, - DISTINCT_FIRST_ACHIEVE, - DISTINCT_REPURCHASE_AMOUNT, - DISTINCT_REPURCHASE_ACHIEVE, - MODIFIED_TIME - ) = ( - select nvl(sum(POLICY_AMOUNT), 0) POLICY_AMOUNT, - nvl(sum(REPURCHASE_COUPON_AMOUNT), 0) REPURCHASE_COUPON_AMOUNT, - nvl(sum(FIRST_AMOUNT), 0) FIRST_AMOUNT, - nvl(sum(FIRST_ACHIEVE), 0) FIRST_ACHIEVE, - nvl(sum(REPURCHASE_AMOUNT), 0) REPURCHASE_AMOUNT, - nvl(sum(REPURCHASE_ACHIEVE), 0) REPURCHASE_ACHIEVE, - nvl(sum(DISTINCT_FIRST_AMOUNT), 0) DISTINCT_FIRST_AMOUNT, - nvl(sum(DISTINCT_FIRST_ACHIEVE), 0) DISTINCT_FIRST_ACHIEVE, - nvl(sum(DISTINCT_REPURCHASE_AMOUNT), 0) DISTINCT_REPURCHASE_AMOUNT, - nvl(sum(DISTINCT_REPURCHASE_ACHIEVE), 0) DISTINCT_REPURCHASE_ACHIEVE, - sysdate - from CU_MEMBER_PERK_DETAIL cmpd - where cmpd.pk_member_perk = #{pkId} - and cmpd.del_flag = 0) - where cmp.pk_id = #{pkId} - - - -