From ae133ef950e0add3f6d2f030355bbedf2646fdd9 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Fri, 11 Apr 2025 18:17:50 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E5=A5=96=E9=87=91?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E5=A4=84=E7=90=86=EF=BC=9B?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=8D=A3=E8=AA=89=E5=A2=99=E7=AD=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/CuMemberSettleController.java | 43 +------ .../service/ICuMemberMonthAchieveService.java | 3 +- .../service/ICuMemberSettlePeriodService.java | 29 +++-- .../achieve/service/ICuMemberTreeService.java | 121 +++++++++++------- .../impl/CuMemberAchieveServiceImpl.java | 25 +--- .../impl/CuMemberMonthAchieveServiceImpl.java | 48 ------- .../impl/CuMemberSettlePeriodServiceImpl.java | 22 +--- .../service/impl/CuMemberTreeServiceImpl.java | 45 ++----- .../bonus/base/mapper/CuHonorWallMapper.java | 13 +- .../base/mapper/CuMemberHonorWallMapper.java | 2 - .../base/service/ICuHonorWallService.java | 13 -- .../service/ICuMemberHonorWallService.java | 2 - .../service/impl/CuHonorWallServiceImpl.java | 12 -- .../impl/CuMemberHonorWallServiceImpl.java | 2 - .../api/ApiCuMemberBonusController.java | 89 +++++++------ .../bonus/service/impl/BonusSettleHandle.java | 2 + .../service/impl/BonusSettleServiceImpl.java | 34 +++-- .../bonus/bonus/vo/MemberBonusDetailVO.java | 4 + .../impl/CuMemberAssessServiceImpl.java | 12 +- .../achieve/CuMemberMonthAchieveMapper.xml | 8 +- .../achieve/CuMemberSettlePeriodMapper.xml | 30 ++++- .../member/achieve/CuMemberTreeMapper.xml | 6 +- .../mapper/member/base/CuHonorWallMapper.xml | 54 -------- .../member/base/CuMemberHonorWallMapper.xml | 8 -- .../member/bonus/CuMemberBonusMapper.xml | 21 ++- .../member/detail/CuMemberAssessMapper.xml | 1 + .../member/detail/CuMemberAwardsMapper.xml | 20 +-- .../com/hzs/member/base/vo/CuMemberVO.java | 16 +-- 28 files changed, 268 insertions(+), 417 deletions(-) diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java index e7acda1e..7f5a566d 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/controller/manage/CuMemberSettleController.java @@ -42,48 +42,19 @@ import java.util.List; @RequestMapping("/manage/settle") public class CuMemberSettleController extends BaseController { + @Autowired private ICuMemberBonusService cuMemberBonusService; - + @Autowired private IBonusSettleService bonusSettleService; - + @Autowired private ICuMemberTreeService cuMemberTreeService; - + @Autowired private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - + @Autowired private IBonusGrantService bonusGrantService; - + @Autowired private ICuMemberMonthAchieveService cuMemberMonthAchieveService; - @Autowired - public void setCuMemberBonusService(ICuMemberBonusService cuMemberBonusService) { - this.cuMemberBonusService = cuMemberBonusService; - } - - @Autowired - public void setCuMemberMonthAchieveService(ICuMemberMonthAchieveService cuMemberMonthAchieveService) { - this.cuMemberMonthAchieveService = cuMemberMonthAchieveService; - } - - @Autowired - public void setBonusGrantService(IBonusGrantService bonusGrantService) { - this.bonusGrantService = bonusGrantService; - } - - @Autowired - public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) { - this.cuMemberSettlePeriodService = cuMemberSettlePeriodService; - } - - @Autowired - public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) { - this.cuMemberTreeService = cuMemberTreeService; - } - - @Autowired - public void setBonusSettleService(IBonusSettleService bonusSettleService) { - this.bonusSettleService = bonusSettleService; - } - /** * 初始化奖金结算表 * @@ -231,7 +202,6 @@ public class CuMemberSettleController extends BaseController { /** * 秒接结算业绩，仅用于测试 - * w * * @return AjaxResult */ @@ -243,7 +213,6 @@ public class CuMemberSettleController extends BaseController { /** * 发放直推达人、抗衰达人 - * w * * @return AjaxResult */ diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java index 3a127363..a2c34a69 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberMonthAchieveService.java @@ -6,9 +6,7 @@ import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; import java.util.Date; /** - *

* 会员月数据 服务类 - *

* * @author hzs * @since 2023-06-06 @@ -38,4 +36,5 @@ public interface ICuMemberMonthAchieveService extends IService * 会员结算期间 服务类 - *

* * @author hzs * @since 2022-10-26 @@ -22,15 +20,17 @@ public interface ICuMemberSettlePeriodService extends IService * @Author: sui q * @Date: 2023/1/30 17:27 @@ -48,19 +49,21 @@ public interface ICuMemberSettlePeriodService extends IService - * @Author: sui q - * @Date: 2023/1/30 17:27 - */ + * @return: List + * @Author: sui q + * @Date: 2023/1/30 17:27 + */ List queryCuMemberSettlePeriod(MemberPeriodParam periodParam); /** * 根据时间更新会员结算期间状态 + * * @param cuMemberSettlePeriodByDate 修改的期间 - * @Author: sui q - * @Date: 2023/3/20 18:37 - */ + * @Author: sui q + * @Date: 2023/3/20 18:37 + */ void updateCuMemberSettlePeriodByDate(CuMemberSettlePeriodExt cuMemberSettlePeriodByDate); } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java index 6f242db8..01a8f151 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java @@ -17,9 +17,7 @@ import java.util.Map; import java.util.Set; /** - *

* 会员网体历史记录 服务类 - *

* * @author hzs * @since 2022-10-31 @@ -111,8 +109,8 @@ public interface ICuMemberTreeService extends IService { * * @param revokeRegSaOrderList 注册撤销订单 * @param revokeUpdSaOrderList 升级撤销订单 - * @param settleDate 计算日期 - * @param settleTableName 结算表名 + * @param settleDate 计算日期 + * @param settleTableName 结算表名 * @return: void * @Author: sui q * @Date: 2022/11/4 15:42 @@ -154,13 +152,14 @@ public interface ICuMemberTreeService extends IService { /** * 将结算日表的值插入到结算月表中 - * @param settleDate 结算日期 + * + * @param settleDate 结算日期 * @param settleTableName 结算日表 - * @param period 期间 - * @return: void - * @Author: sui q - * @Date: 2023/2/16 11:35 - */ + * @param period 期间 + * @return: void + * @Author: sui q + * @Date: 2023/2/16 11:35 + */ void insertCuMemberTreeBySettleDate(String settleDate, String settleTableName, Integer period); /** @@ -215,8 +214,8 @@ public interface ICuMemberTreeService extends IService { /** * 查询会员结算表，查询出结算表中会员血缘关系满足等级 * - * @param settleTableName 结算表 - * @param pkMember 会员 + * @param settleTableName 结算表 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2022/11/4 18:21 @@ -246,17 +245,19 @@ public interface ICuMemberTreeService extends IService { /** * 根据订单，查询出网体中记录的会员数据，推荐人、安置人 + * * @param settleTableName 结算表 - * @param saOrderExtList 订单 - * @return: List - * @Author: sui q - * @Date: 2022/11/10 18:49 - */ + * @param saOrderExtList 订单 + * @return: List + * @Author: sui q + * @Date: 2022/11/10 18:49 + */ List batchQueryMemberSettleBySaOrder(String settleTableName, List saOrderExtList); /** * 根据订单，查询出网体中记录的会员数据，推荐人、安置人 - * @param settleTableName 结算表 + * + * @param settleTableName 结算表 * @param serviceMemberSet 会员编号 * @return: List * @Author: sui q @@ -274,7 +275,8 @@ public interface ICuMemberTreeService extends IService { /** * 根据订单，查询出网体中记录的会员数据及推荐人 - * @param settleTableName 结算表 + * + * @param settleTableName 结算表 * @param serviceMemberSet 会员编号 * @return: List * @Author: sui q @@ -284,9 +286,10 @@ public interface ICuMemberTreeService extends IService { /** * 批量根据订单信息查询会员结算表中的父级安置数据 - * @param settleTableName 结算表 + * + * @param settleTableName 结算表 * @param firPurchaseOrderList 首单列表 - * @return: Map> + * @return: Map> * @Author: sui q * @Date: 2022/11/15 13:43 */ @@ -294,6 +297,7 @@ public interface ICuMemberTreeService extends IService { /** * 批量根据量奖信息查询会员结算表中的父级血缘数据 + * * @param settleTableName 结算表 * @param expandMemberSet 有量奖的会员 * @return: Map 主键，通过推荐人向上找父级 @@ -304,6 +308,7 @@ public interface ICuMemberTreeService extends IService { /** * 批量根据量奖信息查询会员结算表中的父级血缘数据 + * * @param settleTableName 结算表 * @param expandMemberSet 有量奖的会员 * @return: Map 主键，通过推荐人向上找父级 @@ -324,7 +329,7 @@ public interface ICuMemberTreeService extends IService { * 批量根据量奖信息查询会员结算表中的父级血缘数据 * * @param settleTableName 结算表 - * @param expandMemberSet 有量奖的会员列表 + * @param expandMemberSet 有量奖的会员列表 * @return: Map> * @Author: sui q * @Date: 2022/11/15 13:43 @@ -333,6 +338,7 @@ public interface ICuMemberTreeService extends IService { /** * 更新会员树的累计业绩 + * * @param settleTableName 结算日期 * @param cuMemberTreeMap 树 * @return: void @@ -343,6 +349,7 @@ public interface ICuMemberTreeService extends IService { /** * 更新会员树的累计业绩 + * * @param settleTableName 结算日期 * @param cuMemberTreeMap 树 * @return: void @@ -350,8 +357,10 @@ public interface ICuMemberTreeService extends IService { * @Date: 2022/12/9 16:57 */ void updateCuMemberExpandSettle(String settleTableName, Map cuMemberTreeMap); + /** * 更新会员树的累计业绩 + * * @param settleTableName 结算日期 * @param cuMemberTreeMap 树 * @return: void @@ -362,11 +371,12 @@ public interface ICuMemberTreeService extends IService { /** * 根据会员编号更新会员伞上秒结数据，新增或修改 - * @param secondTableName 秒结表 - * @param settleTableName 结算表 - * @param pkMember 会员表 + * + * @param secondTableName 秒结表 + * @param settleTableName 结算表 + * @param pkMember 会员表 * @param cuMemberTreeList 树 - * @param isPlace 是否安置 + * @param isPlace 是否安置 * @return: void * @Author: sui q * @Date: 2022/12/9 16:57 @@ -377,8 +387,9 @@ public interface ICuMemberTreeService extends IService { /** * 根据会员编号查询会员伞上安置秒结数据 + * * @param secondTableName 秒接 - * @param pkMember 会员 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2023/2/2 21:01 @@ -388,8 +399,8 @@ public interface ICuMemberTreeService extends IService { /** * 根据会员编号查询会员伞上安置人秒结数据 * - * @param secondTableName 秒接 - * @param pkMember 会员 + * @param secondTableName 秒接 + * @param pkMember 会员 * @return: List * @Author: sui q * @Date: 2023/2/2 21:01 @@ -409,14 +420,16 @@ public interface ICuMemberTreeService extends IService { /** * 查询安置上下级 + * * @param settleTableName * @param pkMember * @return */ - List queryCuMemberTreePlaceParentTable(String settleTableName,Long pkMember,List memberIdList,Integer level ); + List queryCuMemberTreePlaceParentTable(String settleTableName, Long pkMember, List memberIdList, Integer level); /** * 根据pkmember查询 + * * @param settleTableName * @param pkMember * @return @@ -425,6 +438,7 @@ public interface ICuMemberTreeService extends IService { /** * 查询推荐关系 + * * @param settleTableName * @param pkMember * @return @@ -433,27 +447,30 @@ public interface ICuMemberTreeService extends IService { /** * 查询直推人数 + * * @param settleTableName * @param pkMember * @return */ Long queryCuMemberTreeParentTableCount(String settleTableName, Long pkMember); + /** * 查询历史安置上下级 + * * @param settleTableName * @param pkMember * @return */ - List queryCuMemberTreePlaceParentHistoryTable(String settleTableName, Long pkMember, List memberIdList,Integer level); + List queryCuMemberTreePlaceParentHistoryTable(String settleTableName, Long pkMember, List memberIdList, Integer level); - /** - * @description: 查询每一期汇总 - * @author: yh - * @date: 2023/3/1 17:18 - * @param: - * @return: - **/ - CensusSummaryVo queryCuMemberTreeParentSumTable( String settleTableName, CensusSummaryParam censusSummaryParam); + /** + * @description: 查询每一期汇总 + * @author: yh + * @date: 2023/3/1 17:18 + * @param: + * @return: + **/ + CensusSummaryVo queryCuMemberTreeParentSumTable(String settleTableName, CensusSummaryParam censusSummaryParam); /* * description: 查询历史网体的最末安置人，左右区一起查出来 @@ -475,22 +492,25 @@ public interface ICuMemberTreeService extends IService { /** * 查询秒结表会员信息 + * * @param pkMember * @param settleTableName * @param level * @return */ - List selectByTreeMemberList(Long pkMember, String settleTableName,Integer level); + List selectByTreeMemberList(Long pkMember, String settleTableName, Integer level); /** * 查询会员真实业绩 + * * @param pkMember * @return */ - CuMemberSettleExt getCuMemberRealPerformanceByMemberId(Long pkMember,String tableName); + CuMemberSettleExt getCuMemberRealPerformanceByMemberId(Long pkMember, String tableName); /** * 查询会员安置左右区 + * * @param userId * @param settleTableName * @return @@ -499,14 +519,16 @@ public interface ICuMemberTreeService extends IService { /** * 查询安置左右区人数 + * * @param memberId 会员id * @param placeDept * @return */ - Long queryPlaceParentPeopleNumber(Long memberId, Integer placeDept); + Long queryPlaceParentPeopleNumber(Long memberId, Integer placeDept); /** * 查询推荐大小区人数 + * * @param memberId * @param placeDept * @return @@ -515,20 +537,24 @@ public interface ICuMemberTreeService extends IService { /** * 查询秒结表是否有值 + * * @param settleTableName * @return */ - Long selectByselectByTreeMemberCount(String settleTableName,Long pkMember); + Long selectByselectByTreeMemberCount(String settleTableName, Long pkMember); /** * 查询伞下安置新增业绩 + * * @param settleTableName * @param pkMember * @return */ List brollyBelowResettle(String settleTableName, Long pkMember); + /** * 根据pkmember查询 关联parent + * * @param settleTableName * @param pkMember * @return @@ -537,6 +563,7 @@ public interface ICuMemberTreeService extends IService { /** * 查询会员直推业绩 + * * @param settleTableName * @param memberIds * @return @@ -545,15 +572,18 @@ public interface ICuMemberTreeService extends IService { /** * 查询历史安置上下架 + * * @param settleTableName * @param pkMember * @param memberIdList * @param level * @return */ - List queryCuMemberTreePlaceParentHistoryFramework(String settleTableName, Long pkMember, List memberIdList,Integer level); + List queryCuMemberTreePlaceParentHistoryFramework(String settleTableName, Long pkMember, List memberIdList, Integer level); + /** * 查询历史推荐上下架 + * * @param settleTableName * @param pkMember * @param level @@ -615,11 +645,12 @@ public interface ICuMemberTreeService extends IService { /** * 查询会员历史直推业绩 + * * @param settleTableName * @param memberIds * @return */ - List queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName,@Param("memberIds") List memberIds); + List queryByMemberParentSettleSumPv(@Param("settleTableName") String settleTableName, @Param("memberIds") List memberIds); /* * @description: 根据结算表更新奖衔 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java index 0f995aa3..f187dd62 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -12,7 +12,6 @@ import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt; import com.hzs.common.domain.member.swing.ext.CuMemberSwingNetExt; import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.bonus.achieve.mapper.CuMemberAchieveMapper; import com.hzs.bonus.achieve.param.MemberAchieveParam; import lombok.extern.slf4j.Slf4j; @@ -33,31 +32,13 @@ import java.util.*; @Service public class CuMemberAchieveServiceImpl extends ServiceImpl implements ICuMemberAchieveService { + @Autowired private ICuMemberTreeService cuMemberTreeService; - + @Autowired private CuMemberBonusSettle cuMemberBonusSettle; - + @Autowired private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - - @Autowired - public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) { - this.cuMemberSettlePeriodService = cuMemberSettlePeriodService; - } - - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } - - @Autowired - public void setCuMemberTreeService(ICuMemberTreeService cuMemberTreeService) { - this.cuMemberTreeService = cuMemberTreeService; - } - - @Autowired - ITransactionCommonService iTransactionCommonService; - @Override public String createCuMemberAchieve(String date) { // 创建业绩月表记录表 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 4a789200..2b7b032b 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 @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.achieve.service.ICuMemberAchieveService; import com.hzs.bonus.achieve.service.ICuMemberMonthAchieveService; import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.bonus.base.service.ICuMemberHonorWallService; import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.TableNameConstants; -import com.hzs.common.core.enums.HonorWallType; import com.hzs.common.core.utils.DateUtils; import com.hzs.common.domain.member.achieve.CuMemberMonthAchieve; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; @@ -17,7 +15,6 @@ import com.hzs.common.domain.member.honor.CuHonorWall; import com.hzs.common.domain.member.honor.CuMemberHonorWall; import com.hzs.bonus.achieve.mapper.CuMemberMonthAchieveMapper; import com.hzs.bonus.achieve.service.ICuMemberTreeService; -import com.hzs.bonus.base.service.ICuHonorWallService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,9 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; /** - *

* 会员月数据 服务实现类 - *

* * @author hzs * @since 2023-06-06 @@ -38,10 +33,6 @@ 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); -// } -// } } @Override diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java index a36f24f1..47081476 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberSettlePeriodServiceImpl.java @@ -28,9 +28,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; /** - *

* 会员结算期间 服务实现类 - *

* * @author hzs * @since 2022-10-26 @@ -38,22 +36,15 @@ import java.util.*; @Service public class CuMemberSettlePeriodServiceImpl extends ServiceImpl implements ICuMemberSettlePeriodService { - + @Autowired private RedisService redisService; - @Autowired private ICuMemberSettlePeriodDetailService cuMemberSettlePeriodDetailService; @DubboReference - private ICountryServiceApi countryServiceApi; - + ICountryServiceApi countryServiceApi; @DubboReference - private ISystemConfigServiceApi systemConfigServiceApi; - - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } + ISystemConfigServiceApi systemConfigServiceApi; @Override public void initCuMemberPeriod(String settleDate) { @@ -63,11 +54,10 @@ public class CuMemberSettlePeriodServiceImpl extends ServiceImpl cuMemberSettlePeriodDetailList = new ArrayList<>(); Date startDate = DateUtils.parseStringToDate("2021-01-12"); - Date endDate = DateUtils.parseStringToDate(settleDate); - Map memberSettlePeriodMap = queryCuMemberSettlePeriod(startDate, - endDate); + Date endDate = DateUtils.parseStringToDate(settleDate); + Map memberSettlePeriodMap = queryCuMemberSettlePeriod(startDate, endDate); List periodList = new ArrayList<>(); - while (DateUtils.compareDate(endDate, startDate) >=0) { + while (DateUtils.compareDate(endDate, startDate) >= 0) { if (daySettleCountry.size() > 0) { CuMemberSettlePeriod cuMemberSettlePeriod = memberSettlePeriodMap.get(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, startDate)); for (Integer pkCountry : daySettleCountry) { 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 9bd015bf..a853cf72 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 @@ -32,9 +32,7 @@ import java.util.*; import java.util.stream.Collectors; /** - *

* 会员网体历史记录 服务实现类 - *

* * @author hzs * @since 2022-10-31 @@ -42,39 +40,20 @@ import java.util.stream.Collectors; @Slf4j @Service public class CuMemberTreeServiceImpl extends ServiceImpl implements ICuMemberTreeService { + @Autowired private ICuMemberTreeService memberTreeService; + @Autowired private ICuMemberAchieveService cuMemberAchieveService; - + @Autowired private CuMemberBonusSettle cuMemberBonusSettle; - + @Autowired private ICuMemberSettlePeriodService cuMemberSettlePeriodService; - + @Autowired private ICuMemberAssessService cuMemberAssessService; - @Autowired private ICuBonusExpandService bonusExpandService; - @Autowired - public void setCuMemberAssessService(ICuMemberAssessService cuMemberAssessService) { - this.cuMemberAssessService = cuMemberAssessService; - } - - @Autowired - public void setCuMemberSettlePeriodService(ICuMemberSettlePeriodService cuMemberSettlePeriodService) { - this.cuMemberSettlePeriodService = cuMemberSettlePeriodService; - } - - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } - - @Autowired - public void setCuMemberAchieveService(ICuMemberAchieveService cuMemberAchieveService) { - this.cuMemberAchieveService = cuMemberAchieveService; - } - @Override @Transactional(rollbackFor = Exception.class) public void createCuMemberTree(String date) { @@ -138,11 +117,11 @@ public class CuMemberTreeServiceImpl extends ServiceImpl * 荣誉墙 Mapper 接口 - *

* * @author hzs * @since 2023-04-26 */ public interface CuHonorWallMapper extends BaseMapper { - /** - * 查询荣誉墙全量信息 - * @param pkCountry - * @return - */ - List queryAll(@Param("pkCountry") Integer pkCountry, @Param("pkMember") Long pkMember); + } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java index 1ec91457..d41f0ffd 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/mapper/CuMemberHonorWallMapper.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.honor.CuMemberHonorWall; /** - *

* 会员荣誉墙关联表 Mapper 接口 - *

* * @author hzs * @since 2023-04-26 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java index 491e6ae0..d228a69d 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuHonorWallService.java @@ -1,27 +1,14 @@ package com.hzs.bonus.base.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.ext.CuHonorWallExt; import com.hzs.common.domain.member.honor.CuHonorWall; -import java.util.List; - /** - *

* 荣誉墙 服务类 - *

* * @author hzs * @since 2023-04-26 */ public interface ICuHonorWallService extends IService { - /* - * @description: 查询所有的徽章 - * @author: sui q - * @date: 2023/6/7 14:30 - * @param: null null - **/ - List queryCuHonorWall(); - } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java index b48a299d..b5adc346 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/ICuMemberHonorWallService.java @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.honor.CuMemberHonorWall; /** - *

* 会员荣誉墙关联表 服务类 - *

* * @author hzs * @since 2023-04-26 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java index b31fb58a..03c87c54 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuHonorWallServiceImpl.java @@ -1,18 +1,13 @@ package com.hzs.bonus.base.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.base.mapper.CuHonorWallMapper; import com.hzs.bonus.base.service.ICuHonorWallService; import com.hzs.common.domain.member.honor.CuHonorWall; import org.springframework.stereotype.Service; -import java.util.List; - /** - *

* 荣誉墙 服务实现类 - *

* * @author hzs * @since 2023-04-26 @@ -20,11 +15,4 @@ import java.util.List; @Service public class CuHonorWallServiceImpl extends ServiceImpl implements ICuHonorWallService { - @Override - public List queryCuHonorWall() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("pk_id,PK_COUNTRY,TYPE,VALUE,IMG"); - return baseMapper.selectList(queryWrapper); - } - } diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java index 051d32ac..d5c4c43a 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/base/service/impl/CuMemberHonorWallServiceImpl.java @@ -7,9 +7,7 @@ import com.hzs.common.domain.member.honor.CuMemberHonorWall; import org.springframework.stereotype.Service; /** - *

* 会员荣誉墙关联表 服务实现类 - *

* * @author hzs * @since 2023-04-26 diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java index 72a878f3..6781e1af 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java @@ -36,7 +36,7 @@ import java.util.List; @RestController @RequestMapping("/api/bonus") @Slf4j -public class ApiCuMemberBonusController extends BaseController { +public class ApiCuMemberBonusController extends BaseController { private ICuMemberBonusService cuMemberBonusService; @@ -83,7 +83,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询直推 */ @PostMapping("/query-bonus-first") - public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List firstPurchaseVOList = new ArrayList<>(); @@ -96,14 +96,29 @@ public class ApiCuMemberBonusController extends BaseController { // memberBonusFirstPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); // memberBonusFirstPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); // if(DateUtils.compareDate(cuMemberBonus.getSettleDate(), DateUtils.parseStringToDate("2024-09-09"))>0) { - BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getDirectIncome(), memberBonusFirstPurchaseVO.getExpandIncome(), - memberBonusFirstPurchaseVO.getCoachIncome(), memberBonusFirstPurchaseVO.getServiceIncome(), memberBonusFirstPurchaseVO.getShareIncome(), - memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurRangeIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome()), - ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal())); - memberBonusFirstPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); - memberBonusFirstPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); + // 新版逻辑，首购+复购合并计算显示 + + // TODO new 乐学直推级差收益现在扣20%，所以直接使用库中的就可以 +// BigDecimal serviceSpend = ComputeUtil.computeSubtract( +// // 直推收益 + 拓展收益 + 辅导收益 + 分红收益 + 报单收益 + 复购拓展收益 + 复购级差收益 + 复购推荐收益 + 乐学直推收益 +// ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getDirectIncome(), memberBonusFirstPurchaseVO.getExpandIncome(), +// memberBonusFirstPurchaseVO.getCoachIncome(), memberBonusFirstPurchaseVO.getShareIncome(), memberBonusFirstPurchaseVO.getServiceIncome(), +// memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurRangeIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome(), +// memberBonusFirstPurchaseVO.getGlobalPoints()), +// +// ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal()) +// +// ); +// memberBonusFirstPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); +// memberBonusFirstPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); + memberBonusFirstPurchaseVO.setBackPoints(cuMemberBonus.getBackPoints()); + memberBonusFirstPurchaseVO.setServiceSpend(cuMemberBonus.getServiceSpend()); + + // 拓展收益 = 首购拓展 + 复购拓展 + 复购推荐 memberBonusFirstPurchaseVO.setExpandIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getExpandIncome(), memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome())); + // 首购实发小计 = 首购实发小计 + 复购实发小计 memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal())); + // }else{ // BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getDirectIncome(), memberBonusFirstPurchaseVO.getExpandIncome(), // memberBonusFirstPurchaseVO.getCoachIncome(), memberBonusFirstPurchaseVO.getServiceIncome(), memberBonusFirstPurchaseVO.getShareIncome(), @@ -112,7 +127,9 @@ public class ApiCuMemberBonusController extends BaseController { // memberBonusFirstPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); // memberBonusFirstPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); // } - memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getGlobalPoints())); + // TODO new 乐学直推结算时，已经加到首购实发小计，此处不需要再累加 +// memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getGlobalPoints())); + firstPurchaseVOList.add(memberBonusFirstPurchaseVO); }); return getDataTable(firstPurchaseVOList); @@ -122,7 +139,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员实时奖金，当日的奖金 */ @PostMapping("/query-current-bonus") - public TableDataInfo listCurrentBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listCurrentBonus(@RequestBody BonusParam bonusParam) { bonusParam.setPkCountry(SecurityUtils.getPkCountry()); bonusParam.setPkMember(SecurityUtils.getUserId()); bonusParam.setStartDate(DateUtils.currentDate()); @@ -131,7 +148,7 @@ public class ApiCuMemberBonusController extends BaseController { List cuMemberBonusList = cuMemberBonusService.queryMemberSecondBonusVoByCondition(bonusParam); List memberBonusVOList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { - if(ComputeUtil.compareValue(cuMemberBonus.getRealIncomeTotal())) { + if (ComputeUtil.compareValue(cuMemberBonus.getRealIncomeTotal())) { MemberBonusVO memberBonusVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusVO.class, "settleDate"); // // 首购 // BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(memberBonusVO.getDirectIncome(), memberBonusVO.getExpandIncome(), @@ -160,8 +177,8 @@ public class ApiCuMemberBonusController extends BaseController { memberBonusVO.setServiceSpend(BigDecimal.ZERO); memberBonusVO.setSettleDate(DateUtils.currentDate()); BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(cuMemberBonus.getDirectIncome(), cuMemberBonus.getExpandIncome(), - cuMemberBonus.getCoachIncome(), cuMemberBonus.getServiceIncome(), cuMemberBonus.getShareIncome(), - cuMemberBonus.getRepurExpandIncome(), cuMemberBonus.getRepurRangeIncome(), cuMemberBonus.getRepurPushIncome()), + cuMemberBonus.getCoachIncome(), cuMemberBonus.getServiceIncome(), cuMemberBonus.getShareIncome(), + cuMemberBonus.getRepurExpandIncome(), cuMemberBonus.getRepurRangeIncome(), cuMemberBonus.getRepurPushIncome()), ComputeUtil.computeAdd(cuMemberBonus.getPurRealSubtotal(), cuMemberBonus.getRepurRealSubtotal())); memberBonusVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); memberBonusVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); @@ -181,16 +198,16 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员昨天奖金的值 */ @PostMapping("/query-bonus-total") - public TableDataInfo lisBonusTotal(@RequestBody BonusParam bonusParam){ + public TableDataInfo lisBonusTotal(@RequestBody BonusParam bonusParam) { bonusParam.setPkCountry(SecurityUtils.getPkCountry()); bonusParam.setPkMember(SecurityUtils.getUserId()); bonusParam.setStartDate(DateUtils.beforeDate(1, ChronoUnit.DAYS)); bonusParam.setEndDate(DateUtils.currentDate()); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusTotalByCondition(bonusParam); MemberRealIncomeVO memberRealIncomeVO = new MemberRealIncomeVO(); - if(CollectionUtil.isEmpty(cuMemberBonusList)){ + if (CollectionUtil.isEmpty(cuMemberBonusList)) { memberRealIncomeVO.setRealIncomeTotal(BigDecimal.ZERO); - }else { + } else { memberRealIncomeVO.setRealIncomeTotal(cuMemberBonusList.get(0).getRealIncomeTotal()); } return getDataTable(Collections.singletonList(memberRealIncomeVO)); @@ -200,7 +217,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-repurchase") - public TableDataInfo listRepurchaseBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listRepurchaseBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List memberBonusPurchaseVoList = new ArrayList<>(); @@ -217,7 +234,7 @@ public class ApiCuMemberBonusController extends BaseController { } @PostMapping("/query-bonus-range") - public TableDataInfo listRangeBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listRangeBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List memberBonusPurchaseVoList = new ArrayList<>(); @@ -232,7 +249,7 @@ public class ApiCuMemberBonusController extends BaseController { .build(); packageSettleDate(cuMemberBonus, memberBonusPurchaseVO); BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(memberBonusPurchaseVO.getRepurPushIncome(), memberBonusPurchaseVO.getRepurExpandIncome(), - memberBonusPurchaseVO.getRepurRangeIncome(), memberBonusPurchaseVO.getDirectIncome(), memberBonusPurchaseVO.getStoreIncome()), + memberBonusPurchaseVO.getRepurRangeIncome(), memberBonusPurchaseVO.getDirectIncome(), memberBonusPurchaseVO.getStoreIncome()), memberBonusPurchaseVO.getRepurRealSubtotal()); memberBonusPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend)); memberBonusPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend)); @@ -245,7 +262,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-hi-fun") - public TableDataInfo listHiFunBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listHiFunBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List bonusHiFunVoList = new ArrayList<>(); @@ -259,11 +276,11 @@ public class ApiCuMemberBonusController extends BaseController { } private static void packageSettleDate(CuMemberBonusExt cuMemberBonus, PubMemberBonusVO pubMemberBonusVO) { - if(cuMemberBonus.getEndSettleDate() == null){ + if (cuMemberBonus.getEndSettleDate() == null) { pubMemberBonusVO.setSettleDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberBonus.getSettleDate())); - }else{ + } else { pubMemberBonusVO.setSettleDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberBonus.getSettleDate()) + "-" + - DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberBonus.getEndSettleDate()) ); + DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cuMemberBonus.getEndSettleDate())); } pubMemberBonusVO.setServiceSpend(BigDecimal.ZERO); } @@ -272,16 +289,16 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-cloud") - public TableDataInfo listCloudAgentBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listCloudAgentBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List memberBonusCloudAgentVoArrayList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { - if(ComputeUtil.compareValue(cuMemberBonus.getCloudRepurIncome())) { + if (ComputeUtil.compareValue(cuMemberBonus.getCloudRepurIncome())) { MemberBonusCloudAgentVO bonusCloudAgentVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusCloudAgentVO.class, "settleDate"); packageSettleDate(cuMemberBonus, bonusCloudAgentVO); BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(bonusCloudAgentVO.getCloudDirectIncome(), - bonusCloudAgentVO.getCloudPurIncome(), bonusCloudAgentVO.getCloudRepurIncome()), + bonusCloudAgentVO.getCloudPurIncome(), bonusCloudAgentVO.getCloudRepurIncome()), bonusCloudAgentVO.getCloudRealSubtotal()); bonusCloudAgentVO.setServiceSpend(serviceSpend); memberBonusCloudAgentVoArrayList.add(bonusCloudAgentVO); @@ -294,7 +311,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-coupon") - public TableDataInfo listRepurchaseCouponBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listRepurchaseCouponBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List memberBonusRepurchaseCouponList = new ArrayList<>(); @@ -313,7 +330,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-maker") - public TableDataInfo listMakerSpaceBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listMakerSpaceBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List memberBonusMakerSpaceVoList = new ArrayList<>(); @@ -333,7 +350,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金，默认查询15天内,查询复购 */ @PostMapping("/query-bonus-hai-fun") - public TableDataInfo listHaiFunBonus(@RequestBody BonusParam bonusParam){ + public TableDataInfo listHaiFunBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); List cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List bonusHaiFunVoList = new ArrayList<>(); @@ -352,14 +369,14 @@ public class ApiCuMemberBonusController extends BaseController { bonusParam.setPkCountry(SecurityUtils.getPkCountry()); bonusParam.setPkMember(SecurityUtils.getUserId()); Date startDate = DateUtils.beforeDate(15, ChronoUnit.DAYS, DateUtils.currentDate()); - if(bonusParam.getStartDate() == null){ + if (bonusParam.getStartDate() == null) { bonusParam.setStartDate(startDate); - }else if(DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)){ + } else if (DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)) { bonusParam.setStartDate(startDate); } - if(bonusParam.getEndDate() == null){ + if (bonusParam.getEndDate() == null) { bonusParam.setEndDate(DateUtils.currentDate()); - }else { + } else { bonusParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, bonusParam.getEndDate())); } } @@ -368,7 +385,7 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金来源 */ @PostMapping("/query-bonus-detail") - public TableDataInfo listBonusSource(@RequestBody BonusParam bonusParam){ + public TableDataInfo listBonusSource(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); startPage(); // List memberBonusVoList = new ArrayList<>(); @@ -386,8 +403,8 @@ public class ApiCuMemberBonusController extends BaseController { * 查询会员某个时间段内的奖金来源 */ @PostMapping("/query-mark-bonus-detail") - public TableDataInfo listMarkBonusSource(@RequestBody BonusParam bonusParam){ - if(bonusParam.getStartDate() == null || bonusParam.getBonusValue() == null){ + public TableDataInfo listMarkBonusSource(@RequestBody BonusParam bonusParam) { + if (bonusParam.getStartDate() == null || bonusParam.getBonusValue() == null) { return getDataTable(null); } bonusParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS, bonusParam.getStartDate())); diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java index 6641c338..16cc5ca3 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java @@ -985,7 +985,9 @@ public abstract class BonusSettleHandle { // 处理扣项 setBonusDeduct(bdBonusDeduct, cuMemberBonus, bonusDetail); BigDecimal realIncome = ReflectUtils.invokeGetter(bonusDetail, BonusFieldConstants.REAL_INCOME); + // 首购实发小计 cuMemberBonus.setPurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonus.getPurRealSubtotal(), realIncome)); + // 实发收益总计 cuMemberBonus.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonus.getRealIncomeTotal(), realIncome)); } 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 632f87b8..71f6ed9c 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 @@ -347,9 +347,12 @@ public class BonusSettleServiceImpl implements IBonusSettleService { @Transactional(rollbackFor = Exception.class) public void calculateCuMemberBonus(String settleDate, List saOrderExtList) { try { + // 期间 Integer period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); + // 会员结算日表（cu_member_settle） + 期间 String currentSettleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; String yesterday = DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, settleDate); + // 昨日期间 Integer yesterdayPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday).getPkId(); // 查询日期-1的网体数据，从日历史表中获得 // 将结算日昨日业绩数据 迁移到 网体业绩历史记录结算表 @@ -362,8 +365,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { List cuMemberAchieveLogList = cuMemberAchieveLogService.queryMemberAchieveLogByPeriod(period); // 有特殊业务 if (cuMemberAchieveLogList.size() > 0) { - cuMemberAchieveLogList.forEach(cuMemberAchieveLog -> - cuMemberAchieveService.updateCuMemberSettleAchieveBySpecialBus(currentSettleTableName, period, cuMemberAchieveLog.getPkId())); + cuMemberAchieveLogList.forEach(cuMemberAchieveLog -> cuMemberAchieveService.updateCuMemberSettleAchieveBySpecialBus(currentSettleTableName, period, cuMemberAchieveLog.getPkId())); } // 注水到期回退 cuMemberAchieveService.mergeCuMemberSettleByAchieveLogByDate(currentSettleTableName, DateUtils.parseStringToDate(settleDate)); @@ -397,9 +399,12 @@ public class BonusSettleServiceImpl implements IBonusSettleService { saOrderExtList.forEach(saOrderExt -> { //根据订单状态回退网体,查询撤销订单, 撤销订单不进行结算 if (saOrderExt.getDelFlag() == EYesNo.NO.getIntValue()) { - if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrderExt.getOrderType())) { + if (Objects.equals(EOrderType.REGISTER_ORDER.getValue(), saOrderExt.getOrderType()) + || Objects.equals(EOrderType.SPECIAL_REGISTER_ORDER.getValue(), saOrderExt.getOrderType()) + ) { revokeRegSaOrderList.add(saOrderExt); - } else if (Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) { + } else if (Objects.equals(EOrderType.UPGRADE_ORDER.getValue(), saOrderExt.getOrderType()) + || Objects.equals(EOrderType.SPECIAL_UPGRADE_ORDER.getValue(), saOrderExt.getOrderType())) { revokeUpdSaOrderList.add(saOrderExt); } return; @@ -428,16 +433,16 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // cuMemberTreeService.updateCuMemberBackSettle(cuMemberAchieveHashMap, currentSettleTableName); //********************************重新考核*********************************/ - // TODO new 乐学没有分红、复购考核，这个位置需要去掉？？？ - cuMemberAssessService.retryCalculationAssess(DateUtils.parseStringToDate(settleDate), Boolean.TRUE); + // TODO new 乐学没有分红、复购考核，这个位置需要去掉 +// cuMemberAssessService.retryCalculationAssess(DateUtils.parseStringToDate(settleDate), Boolean.TRUE); //*********************************计算奖金********************************/ // 首购订单 （注册+升级） 直推奖、量奖、领导奖、（注册）报单服务费 Map cuMemberBonusMap = new HashMap<>(); //*********************************根据首购订单计算奖金************************/ //计算 直推奖、拓展奖、辅导奖 Map cuMemberSettleExtMap = new HashMap<>(); + // 奖金记录明细（统一入库使用） BonusRecordDetailVO recordDetailVO = new BonusRecordDetailVO(); - // 计算奖金（主入口） // 乐学易考奖金计算，回写代金券数量 LeXueRangeParam leXueRangeParam = calculateBonusBySaOrderList(settleDate, period, currentSettleTableName, @@ -507,16 +512,19 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 计算完当日奖金后，根据业绩计算下月奖衔 String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate); if (afterDate.endsWith("01")) { - String rangeTableName = TableNameConstants.CU_MEMBER_RANGE + period; - String monthFirstDate = DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(settleDate)); - Integer startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(monthFirstDate).getPkId(); - // 更新奖衔，根据新结算的奖衔 - cuMemberTreeService.updateCuMemberAwardsBySettle(currentSettleTableName, rangeTableName, startPeriod, period); +// String rangeTableName = TableNameConstants.CU_MEMBER_RANGE + period; +// // 月第一天日期 +// String monthFirstDate = DateUtils.currentMonthFirstDateStr(DateUtils.parseStringToDate(settleDate)); +// // 月第一天期数 +// Integer startPeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(monthFirstDate).getPkId(); + // TODO new 不是月奖衔，每月初不更新 +// // 更新奖衔，根据新结算的奖衔 +// cuMemberTreeService.updateCuMemberAwardsBySettle(currentSettleTableName, rangeTableName, startPeriod, period); // 结算每月月末那一天，都是先删除，在新增，重新考核 cuMemberTreeService.initCuMemberAssessData(settleDate); // 更新奖衔考核结果 cuMemberAwardsService.updateCuMemberAwardsExamine(currentDate, period); - // 生成月表 + // 生成月表（cu_member_month） String monthTableName = TableNameConstants.CU_MEMBER_MONTH + DateUtils.getMonth(afterDate); Integer number = cuMemberTreeService.queryExistOracleTable(monthTableName); if (number == null || number <= 0) { diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java index f6cf7e76..2d51c608 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusDetailVO.java @@ -3,6 +3,7 @@ package com.hzs.bonus.bonus.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Transaction; import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; @@ -68,11 +69,13 @@ public class MemberBonusDetailVO implements Serializable { /** * 订单金额 */ + @BigDecimalFormat private BigDecimal orderAmount; /** * 订单业绩 */ + @BigDecimalFormat private BigDecimal orderAchieve; /** @@ -83,6 +86,7 @@ public class MemberBonusDetailVO implements Serializable { /** * 实际收益 */ + @BigDecimalFormat private BigDecimal realIncome; /** diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java index 7df901d1..f2cce21d 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java @@ -252,11 +252,6 @@ public class CuMemberAssessServiceImpl extends ServiceImpl merge into CU_MEMBER_MONTH_ACHIEVE a using ( - select pk_member, #{period} period, RECOMMEND_MONEY, RECOMMEND_ACHIEVE, REPURCHASE_MONEY, REPURCHASE_ACHIEVE, pk_country + select pk_member, + #{period} period, + RECOMMEND_MONEY, + RECOMMEND_ACHIEVE, + REPURCHASE_MONEY, + REPURCHASE_ACHIEVE, + pk_country from ( select pk_member, pk_country, diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml index 41bc5854..8a04602c 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/achieve/CuMemberSettlePeriodMapper.xml @@ -22,19 +22,35 @@ + - select cp.pk_id,cp.settle_date,cd.settle_cycle,cd.start_period,cd.end_period,cd.is_settle, - cd.publish_date,cd.is_publish,cd.grant_date,cd.is_grant, - cd.withdrawal_date,cd.is_withdrawal,cd.is_retry,cd.pk_country from cu_member_settle_period cp - inner join cu_member_settle_period_detail cd - on cp.pk_id>=cd.start_period and cp.pk_id <= cd.end_period - where cp.del_flag=0 and cd.del_flag=0 + select cp.pk_id, + cp.settle_date, + cd.settle_cycle, + cd.start_period, + cd.end_period, + cd.is_settle, + cd.publish_date, + cd.is_publish, + cd.grant_date, + cd.is_grant, + cd.withdrawal_date, + cd.is_withdrawal, + cd.is_retry, + cd.pk_country + from cu_member_settle_period cp + inner join cu_member_settle_period_detail cd + on cp.pk_id >= cd.start_period and cp.pk_id <= cd.end_period + where cp.del_flag = 0 + and cd.del_flag = 0 + + - select - hw.*,a.CREATION_TIME haveTime,a.PK_MEMBER - from CU_HONOR_WALL hw - - left join ( - select mhw.CREATION_TIME,mhw.PK_MEMBER,mhw.PK_HONOR_WALL from CU_MEMBER_HONOR_WALL mhw where mhw.PK_MEMBER = #{pkMember} - ) a on a.PK_HONOR_WALL = hw.pk_id - where hw.PK_COUNTRY = #{pkCountry} - order by hw.type,hw.value - - diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml index de20c999..62e3e78b 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/base/CuMemberHonorWallMapper.xml @@ -2,12 +2,4 @@ - - - - - - - - diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml index ba5eafc7..e008da04 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/bonus/CuMemberBonusMapper.xml @@ -74,6 +74,7 @@ and pk_country = #{pkCountry} + delete from cu_member_bonus @@ -217,14 +218,19 @@ +