From a99830aff807837b021a131a191697cbc651167f Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 24 Jul 2025 15:37:20 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=97=A5=E7=BB=93=E5=89=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E8=A7=81=E7=82=B9=E8=80=83=E6=A0=B8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../achieve/mapper/CuMemberAchieveMapper.java | 100 +++--------------- .../achieve/mapper/CuMemberTreeMapper.java | 8 ++ .../service/ICuMemberAchieveService.java | 58 +--------- .../achieve/service/ICuMemberTreeService.java | 11 +- .../impl/CuMemberAchieveServiceImpl.java | 23 ++-- .../service/impl/CuMemberTreeServiceImpl.java | 5 + .../service/impl/BonusSettleServiceImpl.java | 17 +-- .../impl/CuMemberAssessServiceImpl.java | 2 + .../member/achieve/CuMemberTreeMapper.xml | 6 ++ 9 files changed, 67 insertions(+), 163 deletions(-) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java index 7f992a8f..15e0177a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberAchieveMapper.java @@ -17,9 +17,6 @@ import java.util.List; /** * 会员业绩记录 Mapper 接口 - * - * @author hzs - * @since 2022-10-26 */ public interface CuMemberAchieveMapper extends BaseMapper { @@ -27,9 +24,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * 创建会员网体记录表 * * @param tableName 日期 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 11:44 */ void createCuMemberAchieveTable(String tableName); @@ -37,25 +31,16 @@ public interface CuMemberAchieveMapper extends BaseMapper { * 创建每年的会员考核表 * * @param tableName 表名 - * @return: void - * @Author: sui q - * @Date: 2022/11/7 14:10 */ void createCuMemberMonthTable(String tableName); /* - * @description:更新会员业绩表 每月月统计报表 - * @author: sui q - * @date: 2023/8/29 10:57 - * @param: null null + * 更新会员业绩表 每月月统计报表 **/ void mergeCuMemberMonth(@Param("date") String date, @Param("period") Integer period); /* - * @description: 查询每月月业绩，获得血缘业绩 首购复购 - * @author: sui q - * @date: 2023/12/11 15:36 - * @param: null null + * 查询每月月业绩，获得血缘业绩 首购复购 **/ List queryCuMemberMonthAchieveByMemberIdList(@Param("settleTableName") String settleTableName, @Param("memberSwingNetExtList") List memberSwingNetExtList); @@ -65,9 +50,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * @param targetTableName 目标表 网体月表 * @param sourceTableName 来源表 结算日表 * @param period 期间 - * @return: void - * @Author: sui q - * @Date: 2023/2/16 11:35 */ void mergeCuMemberAchieveBySettleDate(@Param("targetTableName") String targetTableName, @Param("sourceTableName") String sourceTableName, @Param("period") Integer period); @@ -78,9 +60,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * * @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据 * @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 16:26 */ void updateCuMemberSettleAchieveByBeforeDay(@Param("sourceTable") String sourceTable, @Param("targetTable") String targetTable); @@ -90,17 +69,11 @@ public interface CuMemberAchieveMapper extends BaseMapper { * * @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据 * @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 16:26 */ void updateCuMemberExpandSettleAchieveByBeforeDay(@Param("sourceTable") String sourceTable, @Param("targetTable") String targetTable); /* - * @description: 更新为最初始的数据，新增的为0，历史的通过昨天进行更新 - * @author: sui q - * @date: 2023/8/11 14:57 - * @param: null null + * 更新为最初始的数据，新增的为0，历史的通过昨天进行更新 **/ void updateCuMemberSettleInitAchieve(String targetTable); @@ -110,26 +83,17 @@ public interface CuMemberAchieveMapper extends BaseMapper { * @param targetTable 结算表 * @param period 期间 * @param pkId 主键 - * @return: void - * @Author: sui q - * @Date: 2023/3/11 13:42 */ void updateCuMemberSettleAchieveBySpecialBus(@Param("targetTable") String targetTable, @Param("period") Integer period, @Param("pkId") Long pkId); /* - * @description: 注水到期更新业绩 - * @author: sui q - * @date: 2024/5/23 11:37 - * @param: null null + * 注水到期更新业绩 **/ void mergeCuMemberSettleByAchieveLogByDate(@Param("targetTable") String targetTable, @Param("settleDate") Date settleDate); /* - * @description: 根据到期日期更新业绩，到期后需要还原到实际累计金额 - * @author: sui q - * @date: 2023/4/8 15:32 - * @param: null null + * 根据到期日期更新业绩，到期后需要还原到实际累计金额 **/ void updateCuMemberSettleAchieveByDueDate(@Param("currentTableName") String currentTableName, @Param("yesTableName") String yesTableName, @Param("currentDate") Date currentDate); @@ -140,18 +104,12 @@ public interface CuMemberAchieveMapper extends BaseMapper { * * @param memberAchieveParamList 会员业绩 * @param tableName 更新的表，结算日的日表 - * @return: Boolean - * @Author: sui q - * @Date: 2022/11/2 11:30 */ Boolean updateCuMemberBackOldAchieveEveryDay(@Param("memberAchieveParamList") List memberAchieveParamList, @Param("tableName") String tableName); /* - * @description: 退单回退业绩 - * @author: sui q - * @date: 2023/9/22 9:27 - * @param: null null + * 退单回退业绩 **/ void chargeBackSaOrder(@Param("targetTable") String targetTable, @Param("sourceTable") String sourceTable, @Param("period") Integer period, @Param("achieve") MemberAchieveParam memberAchieveParam); @@ -161,9 +119,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * * @param memberAchieveParamList 会员业绩 * @param tableName 更新的表，结算日的日表 - * @return: Boolean - * @Author: sui q - * @Date: 2022/11/2 11:30 */ Boolean updateCuMemberBackAchieveEveryDay(@Param("memberAchieveParamList") List memberAchieveParamList, @Param("tableName") String tableName); @@ -172,9 +127,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { * 重新结算会员网体业绩 * * @param currentSettleTableName 更新甩网业绩 - * @return: void - * @Author: sui q - * @Date: 2022/11/3 13:56 */ void updateCuMemberNetAchieve(@Param("updMemberAchieveExtList") List updMemberAchieveExtList, @Param("tableName") String currentSettleTableName); @@ -184,22 +136,15 @@ public interface CuMemberAchieveMapper extends BaseMapper { * @param pkMember 会员主键 * @param pkCountry 公司 * @param tableName 结算表 - * @return: CuMemberAchieve - * @Author: sui q - * @Date: 2022/10/26 15:04 */ CuMemberAchieve queryCuMemberAchieveByPkMember(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry, @Param("tableName") String tableName); /* - * description: 查询会员伞下血缘业绩 - * @author: sui q - * @date: 2023/4/7 15:13 - * @param: null null + * 查询会员伞下血缘业绩 **/ BigDecimal queryCuMemberUnderBloodAchieveByPkMember(@Param("treeTable") String treeTable, @Param("achieveTable") String achieveTable, @Param("pkMember") Long pkMember, @Param("period") Integer period); - /** * 会员端新增业绩 * @@ -224,7 +169,6 @@ public interface CuMemberAchieveMapper extends BaseMapper { */ List selectUnderMemberAwards(CuMemberAwardsUnderVO memberAwardsUnderVO); - /** * 月度新增业绩对比 * @@ -252,51 +196,33 @@ public interface CuMemberAchieveMapper extends BaseMapper { List selectByParent(@Param("memberIds") List memberIds, @Param("pkCountry") Integer pkCountry, @Param("achieveTable") String achieveTable); /* - * @description: 更新会员的业绩 - * @author: sui q - * @date: 2023/8/12 15:46 - * @param: null null + * 更新会员的业绩 **/ void updateCuMemberAchieve(@Param("tableName") String tableName, @Param("period") Integer period); /* - * @description: 查询月统计数据，按照月倒叙 - * @author: sui q - * @date: 2023/8/29 16:10 - * @param: null null + * 查询月统计数据，按照月倒叙 **/ List queryMemberMonthAchieve(@Param("pkMember") Long pkMember, @Param("monthList") List monthList); /* - * @description: 查询会员一代伞下 - * @author: sui q - * @date: 2023/8/29 18:07 - * @param: null null + * 查询会员一代伞下 **/ List queryPkMemberMonthAchieve(@Param("month") String month, @Param("pkMember") Long pkMember); /* - * @description: 查询月统计数据，查询明细 - * @author: sui q - * @date: 2023/8/29 17:43 - * @param: null null + * 查询月统计数据，查询明细 **/ List queryMemberMonthAchieveDetail(@Param("monthAchieveParam") MonthAchieveParam monthAchieveParam, @Param("memberList") List memberList); /* - * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null + * 查询月统计数据，查询明细，安置伞下 **/ List queryPlaceParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); /* - * @description: 查询月统计数据，查询明细，安置伞下 - * @author: sui q - * @date: 2023/9/6 21:12 - * @param: null null + * 查询月统计数据，查询明细，安置伞下 **/ List queryParentMemberMonthAchieve(MonthAchieveParam monthAchieveParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java index f9cf2a7e..0b463696 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java @@ -325,4 +325,12 @@ public interface CuMemberTreeMapper extends BaseMapper { */ int updateCuMemberSettlePointAssess(@Param("settleTableName") String settleTableName, @Param("assessTableName") String assessTableName); + /** + * 初始化考核数据 + * + * @param settleTableName + * @return + */ + int initAssessDate(@Param("settleTableName") String settleTableName); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java index 7edbbc88..7831930a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberAchieveService.java @@ -13,9 +13,6 @@ import java.util.Map; /** * 会员业绩记录 服务类 - * - * @author hzs - * @since 2022-10-26 */ public interface ICuMemberAchieveService extends IService { @@ -23,9 +20,6 @@ public interface ICuMemberAchieveService extends IService { * 创建每月的会员业绩记录表 * * @param date 日期 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 15:17 */ String createCuMemberAchieve(String date); @@ -33,17 +27,11 @@ public interface ICuMemberAchieveService extends IService { * 创建每年的业绩统计年表，用于放月表 * * @param tableName 表名 - * @return: void - * @Author: sui q - * @Date: 2022/11/7 14:10 */ void createCuMemberMonthTable(String tableName); /* - * @description:更新会员业绩表 每月月统计报表 - * @author: sui q - * @date: 2023/8/29 10:57 - * @param: null null + * 更新会员业绩表 每月月统计报表 **/ void mergeCuMemberMonth(Integer day, String date); @@ -53,9 +41,6 @@ public interface ICuMemberAchieveService extends IService { * @param targetTableName 目标表 网体月表 * @param sourceTableName 来源表 结算日表 * @param period 期间 - * @return: void - * @Author: sui q - * @Date: 2023/2/16 11:35 */ void mergeCuMemberAchieveBySettleDate(String targetTableName, String sourceTableName, Integer period); @@ -64,9 +49,6 @@ public interface ICuMemberAchieveService extends IService { * * @param memberAchieveParamMap 修改的结算 * @param tablaName 修改的结算期间表 - * @return: Boolean - * @Author: sui q - * @Date: 2022/11/2 11:30 */ void updateCuMemberAchieveEveryDay(Map memberAchieveParamMap, String tablaName); @@ -74,9 +56,6 @@ public interface ICuMemberAchieveService extends IService { * 重新结算会员网体业绩 * * @param currentSettleTableName 更新甩网业绩 - * @return: void - * @Author: sui q - * @Date: 2022/11/3 13:56 */ void updateCuMemberNetAchieve(List updMemberAchieveExtList, String currentSettleTableName); @@ -85,9 +64,6 @@ public interface ICuMemberAchieveService extends IService { * * @param memberAchieveParamMap 修改的结算 * @param tablaName 修改的结算期间表 - * @return: Boolean - * @Author: sui q - * @Date: 2022/11/2 11:30 */ void updateCuMemberBackOldAchieveEveryDay(Map memberAchieveParamMap, String tablaName); @@ -96,9 +72,6 @@ public interface ICuMemberAchieveService extends IService { * 根据昨天结算表数据更新今天结算表的业绩数据 * * @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 16:26 */ void updateCuMemberSettleInitAchieve(String targetTable); @@ -108,9 +81,6 @@ public interface ICuMemberAchieveService extends IService { * * @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据 * @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 16:26 */ void updateCuMemberSettleAchieveByBeforeDay(String sourceTable, String targetTable); @@ -120,9 +90,6 @@ public interface ICuMemberAchieveService extends IService { * * @param sourceTable 来源表，记录10天跟月表一摸一样的滚动表数据 * @param targetTable 目标表 记录10天跟月表一摸一样的滚动表数据 - * @return: void - * @Author: sui q - * @Date: 2022/10/31 16:26 */ void updateCuMemberExpandSettleAchieveByBeforeDay(String sourceTable, String targetTable); @@ -132,41 +99,26 @@ public interface ICuMemberAchieveService extends IService { * @param targetTable 结算表 * @param period 期间 * @param pkId 主键 - * @return: void - * @Author: sui q - * @Date: 2023/3/11 13:42 */ void updateCuMemberSettleAchieveBySpecialBus(String targetTable, Integer period, Long pkId); /* - * @description: 注水到期更新业绩 - * @author: sui q - * @date: 2024/5/23 11:37 - * @param: null null + * 注水到期更新业绩 **/ void mergeCuMemberSettleByAchieveLogByDate(String targetTable, Date settleDate); /* - * @description: 根据到期日期更新业绩，到期后需要还原到实际累计金额 - * @author: sui q - * @date: 2023/4/8 15:32 - * @param: null null + * 根据到期日期更新业绩，到期后需要还原到实际累计金额 **/ void updateCuMemberSettleAchieveByDueDate(String currentTableName, String yesTableName, Date currentDate); /* - * @description: 退单回退业绩 - * @author: sui q - * @date: 2023/9/22 9:27 - * @param: null null + * 退单回退业绩 **/ Boolean chargeBackSaOrder(SaOrder saOrder); /* - * @description: 查询每月月业绩，获得血缘业绩 首购复购 - * @author: sui q - * @date: 2023/12/11 15:36 - * @param: null null + * 查询每月月业绩，获得血缘业绩 首购复购 **/ List queryCuMemberMonthAchieveByMemberIdList(String settleTableName, List memberSwingNetExtList); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java index 2bd7917c..ca51a5ab 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java @@ -6,7 +6,6 @@ import com.hzs.common.domain.member.achieve.ext.CuMemberAchieveExt; import com.hzs.common.domain.member.ext.CuMemberSettleExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.bonus.achieve.param.MemberAchieveParam; -import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -267,7 +266,7 @@ public interface ICuMemberTreeService extends IService { * @param cuMemberTreeList 推荐人 * @return: List */ - List queryCuMemberSecondParent(@Param("secondTableName") String secondTableName, @Param("cuMemberTreeList") List cuMemberTreeList); + List queryCuMemberSecondParent(String secondTableName, List cuMemberTreeList); /** * 删除日表数据 @@ -333,4 +332,12 @@ public interface ICuMemberTreeService extends IService { */ void updateCuMemberSettlePointAssess(String settleTableName, String assessTableName); + /** + * 初始化考核数据 + * + * @param settleTableName + * @return + */ + int initAssessDate(String settleTableName); + } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java index 173fd672..7f86aa5e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -25,30 +25,27 @@ import java.util.*; /** * 会员业绩记录 服务实现类 - * - * @author hzs - * @since 2022-10-26 */ @Slf4j @Service public class CuMemberAchieveServiceImpl extends ServiceImpl implements ICuMemberAchieveService { @Autowired - private ICuMemberTreeService cuMemberTreeService; + private ICuMemberTreeService iCuMemberTreeService; @Autowired private CuMemberBonusSettle cuMemberBonusSettle; @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Override public String createCuMemberAchieve(String date) { // 创建业绩月表记录表 String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + DateUtils.getMonth(date); - Integer num = cuMemberTreeService.queryExistOracleTable(tableName); + Integer num = iCuMemberTreeService.queryExistOracleTable(tableName); if (num == null || num <= 0) { baseMapper.createCuMemberAchieveTable(tableName); - cuMemberTreeService.createCuMemberTableUniqueIndex(tableName); - cuMemberTreeService.createCuMemberTableSequence(tableName, TableNameConstants.CU_MEMBER_ACHIEVE_SEQ); + iCuMemberTreeService.createCuMemberTableUniqueIndex(tableName); + iCuMemberTreeService.createCuMemberTableSequence(tableName, TableNameConstants.CU_MEMBER_ACHIEVE_SEQ); } return tableName; } @@ -61,12 +58,12 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl 0) { - cuMemberTreeService.truncateCuMemberTreeTable(tableName); + iCuMemberTreeService.truncateCuMemberTreeTable(tableName); } // } baseMapper.mergeCuMemberMonth(DateUtils.getMonth(date), cuMemberSettlePeriod.getPkId()); @@ -172,11 +169,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl 0; i--) { String settleDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.beforeDate(i, ChronoUnit.DAYS)); - int settlePeriod = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); + int settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); String targetTable = TableNameConstants.CU_MEMBER_SETTLE + settlePeriod; baseMapper.chargeBackSaOrder(targetTable, sourceTable, period, cuMemberAchieve); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java index 38a0bbf0..dd61ebd4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java @@ -430,4 +430,9 @@ public class CuMemberTreeServiceImpl extends ServiceImpl cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap, - bonusConfigDTO, purchaseOrderList, period, cuMemberBonusMap, cuAwardsControlMap); - bonusRecordDetailVO.setCuMemberBonusRangeList(cuMemberBonusRangeList); +// List cuMemberBonusRangeList = bonusSettlePurchaseHandle.calculateRepurchaseRangeBonus(cuMemberSettleExtMap, settleTableName, settleDate, rangeDtoMap, awardsMap, +// bonusConfigDTO, purchaseOrderList, period, cuMemberBonusMap, cuAwardsControlMap); +// bonusRecordDetailVO.setCuMemberBonusRangeList(cuMemberBonusRangeList); //****************************见点收益*****************************/ List cuMemberPointBonusList = bonusSettlePurchaseHandle.calculateRepurchasePointBonus(cuMemberSettleExtMap, settleTableName, period, @@ -1193,8 +1193,8 @@ public class BonusSettleServiceImpl implements IBonusSettleService { bonusRecordDetailVO.setCuMemberBonusCoachList(cuMemberPointBonusList); } - // TODO //****************************区域收益*****************************/ + // TODO Map memberBonusDetailCalVoMap = new HashMap<>(ComputeUtil.mapInitCapacity(purchaseOrderList.size())); if (null != cuMemberBonusExpandList) { @@ -1211,10 +1211,11 @@ public class BonusSettleServiceImpl implements IBonusSettleService { memberBonusDetailCalVO.setRepCoachIncome(ComputeUtil.computeAdd(memberBonusDetailCalVO.getRepCoachIncome(), cuMemberBonusCoach.getRealIncome())); }); } - cuMemberBonusRangeList.forEach(cuMemberBonusRange -> { - MemberBonusDetailCalVO memberBonusDetailCalVO = calculateOrderRatio(memberBonusDetailCalVoMap, cuMemberBonusRange); - memberBonusDetailCalVO.setRepRangeIncome(ComputeUtil.computeAdd(memberBonusDetailCalVO.getRepRangeIncome(), cuMemberBonusRange.getRealIncome())); - }); +// cuMemberBonusRangeList.forEach(cuMemberBonusRange -> { +// MemberBonusDetailCalVO memberBonusDetailCalVO = calculateOrderRatio(memberBonusDetailCalVoMap, cuMemberBonusRange); +// memberBonusDetailCalVO.setRepRangeIncome(ComputeUtil.computeAdd(memberBonusDetailCalVO.getRepRangeIncome(), cuMemberBonusRange.getRealIncome())); +// }); + // 见点收益 cuMemberPointBonusList.forEach(cuMemberPointBonus -> { MemberBonusDetailCalVO memberBonusDetailCalVO = calculateOrderRatio(memberBonusDetailCalVoMap, cuMemberPointBonus); memberBonusDetailCalVO.setGlobalPoints(ComputeUtil.computeAdd(memberBonusDetailCalVO.getGlobalPoints(), cuMemberPointBonus.getRealIncome())); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java index 321db143..9e70ca2e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberAssessServiceImpl.java @@ -420,6 +420,8 @@ public class CuMemberAssessServiceImpl extends ServiceImpl + + + update ${settleTableName} cms + set cms.is_maker_space = 1 + +