diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java index 21327fe0..ab2c8434 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/BdWaresBonusItemsMapper.java @@ -4,12 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.bonus.BdWaresBonusItems; /** - *

* 特殊商品分配ev奖金明细 Mapper 接口 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface BdWaresBonusItemsMapper extends BaseMapper { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java index cf604fad..3ce3c4d4 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusCoachMapper.java @@ -9,48 +9,35 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-辅导收益明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-15 */ public interface CuMemberBonusCoachMapper extends BaseMapper { /** * 删除会员奖金汇总表 + * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusCoach(Integer period); /** * 批量插入会员奖金主表 + * * @param cuMemberBonusCoachList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 */ void batchInsertCuMemberBonusCoach(@Param("cuMemberBonusCoachList") List cuMemberBonusCoachList); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusCoachByBonusItems(BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusCoachByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java index e447c118..04dc1814 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusDetailMapper.java @@ -9,76 +9,49 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-奖金收益明细表(报单费) Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-17 */ public interface CuMemberBonusDetailMapper extends BaseMapper { /** * 删除会员奖金汇总表 + * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusDetail(Integer period); /** * 批量插入会员奖金主表 + * * @param cuMemberBonusDetailList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 */ void batchInsertCuMemberBonusDetail(@Param("cuMemberBonusDetailList") List cuMemberBonusDetailList); - /** - * 批量插入会员奖金主表 - * - * @param cuMemberBonusDetail 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 - */ - void insertCuMemberBonusDetail(@Param("item") CuMemberBonusDetail cuMemberBonusDetail); - /** * 根据查询条件查询会员奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 9:18 */ List queryMemberBonusDetailByCondition(BonusParam bonusParam); /** * 会员端根据查询条件查询会员奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 9:18 */ List queryMemberBonusDetailByConditionForServer(@Param("bonusParam") BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 - */ + */ List queryMemberBonusDetailByBonusItems(BonusParam bonusParam); /** * 根据查询条件查询固定的奖金明细 + * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusDetailByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java index bbeec528..eff30d4b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusExpandMapper.java @@ -9,12 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-拓展收益明细表 Mapper 接口 - *

- * - * @author hzs - * @since 2022-11-15 */ public interface CuMemberBonusExpandMapper extends BaseMapper { @@ -22,9 +17,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper cuMemberBonusExpandList); - /** - * 批量插入会员奖金,拓展 - * - * @param cuMemberBonusExpandList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 - */ - void insertCuMemberBonusExpand(List cuMemberBonusExpandList); - - /** * 根据查询条件查询固定的奖金明细 * * @param bonusParam 查询条件 - * @return: List - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusExpandByBonusItems(BonusParam bonusParam); @@ -63,9 +38,6 @@ public interface CuMemberBonusExpandMapper extends BaseMapper - * @Author: sui q - * @Date: 2023/1/14 11:18 */ List queryMemberBonusExpandByBonusItemsForServer(@Param("bonusParam") BonusParam bonusParam); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java index 4b9fa3e5..6b9d96aa 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java @@ -20,13 +20,6 @@ public interface CuMemberBonusMapper extends BaseMapper { */ List batchQueryCuMemberBonusSeq(Integer rowNum); - /** - * 根据查询条件查询会员奖金 - * - * @param bonusParam 查询条件 - */ - List queryMemberBonusTotalByCondition(BonusParam bonusParam); - /** * 根据查询条件查询会员奖金 * @@ -46,7 +39,6 @@ public interface CuMemberBonusMapper extends BaseMapper { **/ CuMemberBonusExt queryMemberBonusByConditionForServerSum(@Param("bonusParam") BonusParam bonusParam); - /** * 根据查询条件查询会员奖金 * @@ -90,10 +82,5 @@ public interface CuMemberBonusMapper extends BaseMapper { */ void mergeBackRangeBonusIncome(@Param("pkOrder") Long pkOrder, @Param("bonusValue") Integer bonusValue); - /** - * 查询会员一周周期的拓展累计，复购拓展累计 - */ - List queryWeekMemberBonus(@Param("startPeriod") int startPeriod, @Param("endPeriod") int endPeriod); - void recalculateTeamNewBoxNum(@Param("pkId") Long pkId, @Param("retailsTableName") String retailsTableName); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java deleted file mode 100644 index 8c5524c9..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hzs.bonus.bonus.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.bonus.CuMemberBonusPushHis; - -/** - *

- * 会员奖金-直推历史轮次记录 Mapper 接口 - *

- * - * @author hzs - * @since 2023-09-10 - */ -public interface CuMemberBonusPushHisMapper extends BaseMapper { - -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java index 83e18f22..3e559148 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java @@ -6,20 +6,12 @@ import com.hzs.common.domain.member.ext.CuMemberShareBonusExt; import org.apache.ibatis.annotations.Param; /** - *

* 会员奖金-分红奖金配置 Mapper 接口 - *

- * - * @author hzs - * @since 2023-07-03 */ public interface CuMemberShareBonusMapper extends BaseMapper { /* - * @description: 查询会员分享奖金 - * @author: sui q - * @date: 2023/7/3 15:28 - * @param: null null + * 查询会员分享奖金 **/ CuMemberShareBonusExt queryCuMemberShareBonus(@Param("pkCountry") Integer pkCountry, @Param("settleMonth") String settleMonth); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java index 3793719b..3df67329 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java @@ -8,28 +8,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - *

* 会员奖金-分红奖金配置明细 Mapper 接口 - *

- * - * @author hzs - * @since 2023-07-03 */ public interface CuMemberShareDetailMapper extends BaseMapper { /* - * @description: 更新分享明细 - * @author: sui q - * @date: 2023/7/3 14:11 - * @param: null null + * 更新分享明细 **/ void saveMemberShareBonus(@Param("cuMemberShareDetailList") List cuMemberShareDetailList); - /* - * @description: 根据期间查询对应的奖衔 period当前月第一天 - * @author: sui q - * @date: 2023/8/11 15:42 - * @param: null null - **/ - List queryCuMemberShareBonusByPeriod(Integer period); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareMaxMapper.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareMaxMapper.java deleted file mode 100644 index ebc7abd0..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareMaxMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.bonus.bonus.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.bonus.CuMemberShareMax; - -/** - *

- * 会员奖金-最大分红奖金 Mapper 接口 - *

- * - * @author hzs - * @since 2023-01-06 - */ -public interface CuMemberShareMaxMapper extends BaseMapper { - - /** - * 物理删除理论最大分红金额 - * @param period 期间 - * @return: void - * @Author: sui q - * @Date: 2023/1/7 10:31 - */ - void deleteCuMemberShareMax(Integer period); -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java index ec7c8444..b4b9cb29 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/IBdWaresBonusItemsService.java @@ -6,36 +6,22 @@ import com.hzs.common.domain.member.bonus.BdWaresBonusItems; import java.util.List; /** - *

* 特殊商品分配ev奖金明细 服务类 - *

- * - * @author hzs - * @since 2024-10-30 */ public interface IBdWaresBonusItemsService extends IService { /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null + * 插入奖金特殊项奖金 **/ void insetWaresBonusItems(List waresBonusItemsList); /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null + * 插入奖金特殊项奖金 **/ void updateWaresBonusItems(List waresBonusItemsList); /* - * @description: 插入奖金特殊项奖金 - * @author: sui q - * @date: 2024/11/7 15:04 - * @param: null null + * 插入奖金特殊项奖金 **/ void deleteWaresBonusItems(List waresBonusItemsList, Long pkWaresBonus, Long userId); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java index 241fcf7c..876debdf 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusCoachService.java @@ -7,30 +7,21 @@ import java.util.List; import java.util.Set; /** - *

* 会员奖金-辅导收益明细表 服务类 - *

- * - * @author hzs - * @since 2022-11-15 */ public interface ICuMemberBonusCoachService extends IService { /** * 删除会员奖金汇总表 + * * @param period 结算期间 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 11:54 */ void deleteCuMemberBonusCoach(Integer period); /** * 批量插入会员奖金主表 + * * @param cuMemberBonusCoachList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 */ void batchInsertCuMemberBonusCoach(List cuMemberBonusCoachList, Set memberIdSet); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java index 522bddd7..677069ac 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusDetailService.java @@ -7,12 +7,7 @@ import java.util.List; import java.util.Set; /** - *

* 会员奖金-奖金收益明细表(报单费) 服务类 - *

- * - * @author hzs - * @since 2022-11-17 */ public interface ICuMemberBonusDetailService extends IService { @@ -20,9 +15,6 @@ public interface ICuMemberBonusDetailService extends IService cuMemberBonusDetailList, Set memberIdSet); - /** - * 批量插入会员奖金主表 - * - * @param cuMemberBonusDetail 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 - */ - void insertCuMemberBonusDetail(CuMemberBonusDetail cuMemberBonusDetail); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java index ee0a56b0..9143331f 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusExpandService.java @@ -7,12 +7,7 @@ import java.util.List; import java.util.Set; /** - *

* 会员奖金-拓展收益明细表 服务类 - *

- * - * @author hzs - * @since 2022-11-15 */ public interface ICuMemberBonusExpandService extends IService { @@ -20,9 +15,6 @@ public interface ICuMemberBonusExpandService extends IService cuMemberBonusExpandList, Set memberIdSet); - /** - * 批量插入会员奖金主表 - * - * @param cuMemberBonusExpandList 会员奖金 - * @return: void - * @Author: sui q - * @Date: 2022/12/13 13:56 - */ - void insertCuMemberBonusExpand(List cuMemberBonusExpandList); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java deleted file mode 100644 index a2cf7cce..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.bonus.bonus.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.bonus.CuMemberBonusPushHis; - -import java.util.List; - -/** - *

- * 会员奖金-直推历史轮次记录 服务类 - *

- * - * @author hzs - * @since 2023-09-10 - */ -public interface ICuMemberBonusPushHisService extends IService { - - /* - * @description: 查询会员历史推荐 - * @author: sui q - * @date: 2023/9/10 14:23 - * @param: null null - **/ - List queryCuMemberBonusPushHis(Long pkMember); -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java index 412b9329..4eb22b9a 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusService.java @@ -8,7 +8,6 @@ import com.hzs.common.domain.member.ext.CuMemberBonusExt; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -141,11 +140,6 @@ public interface ICuMemberBonusService extends IService { */ void mergeBackMemberBonusIncome(Long pkOrder); - /** - * 查询会员一周周期的拓展累计，复购拓展累计 - */ - Map queryWeekMemberBonus(int startPeriod, int endPeriod); - void calculateBonusTotal(CuMemberBonusExt cuMemberBonusExt, CuMemberBonusExt memberBonusExt); CuMemberBonusExt initCuMemberBonus(); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java index ec2be654..3998d935 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java @@ -6,28 +6,17 @@ import com.hzs.common.domain.member.ext.CuMemberShareBonusExt; import com.hzs.bonus.bonus.param.CuMemberShareBonusParam; /** - *

* 会员奖金-分红奖金配置 服务类 - *

- * - * @author hzs - * @since 2023-07-03 */ public interface ICuMemberShareBonusService extends IService { /* - * @description: 保存会员分红奖金及明细 - * @author: sui q - * @date: 2023/7/3 14:04 - * @param: null null + * 保存会员分红奖金及明细 **/ void saveMemberShareBonus(CuMemberShareBonusParam cuMemberShareBonusParam); /* - * @description: 查询分红配置的参数 - * @author: sui q - * @date: 2023/7/3 15:24 - * @param: null null + * 查询分红配置的参数 **/ CuMemberShareBonusExt queryCuMemberShareBonus(Integer pkCountry, String settleMonth); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java index cd39d1e3..c29b99a1 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java @@ -8,29 +8,13 @@ import java.util.List; import java.util.Map; /** - *

* 会员奖金-分红奖金配置明细 服务类 - *

- * - * @author hzs - * @since 2023-07-03 */ public interface ICuMemberShareDetailService extends IService { /* - * @description: 更新分享明细 - * @author: sui q - * @date: 2023/7/3 14:11 - * @param: null null + * 更新分享明细 **/ void saveMemberShareBonus(List cuMemberShareDetailList); - /* - * @description: 根据期间查询奖衔设置的分红配置 - * key 国家+奖衔 明细 - * @author: sui q - * @date: 2023/8/11 15:35 - * @param: null null - **/ - Map queryCuMemberShareBonusByPeriod(Integer period); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareMaxService.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareMaxService.java deleted file mode 100644 index 8e4f0024..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareMaxService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.hzs.bonus.bonus.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.bonus.CuMemberShareMax; - -/** - *

- * 会员奖金-最大分红奖金 服务类 - *

- * - * @author hzs - * @since 2023-01-06 - */ -public interface ICuMemberShareMaxService extends IService { - - /** - * 插入理论最大的可以进行分红的奖金 - * @param cuMemberShareMax 最大分红的奖金 - * @return: void - * @Author: sui q - * @Date: 2023/1/6 17:23 - */ - void insertMaxShareBonus(CuMemberShareMax cuMemberShareMax); -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java index 8cb99f7a..c73d56db 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java @@ -11,18 +11,13 @@ import com.hzs.common.domain.member.bonus.BdWaresBonusItems; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; import java.util.List; import java.util.Set; import java.util.stream.Collectors; /** - *

* 特殊商品分配ev奖金明细 服务实现类 - *

* - * @author hzs - * @since 2024-10-30 */ @Service public class BdWaresBonusItemsServiceImpl extends ServiceImpl implements IBdWaresBonusItemsService { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java index a7fe58da..b3ecf203 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java @@ -159,11 +159,12 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { } } - // 查询区域配置 - Map countyRangeExtMap = new HashMap<>(); + // 区域处理 List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailSecondRangeByCounty(rangeTableName, secondRangeTableName, saOrderExt.getRecCounty()); + // 区域会员map（key:区域分组ID + 区ID ,value: 区域会员结算数据） + Map countyRangeExtMap = new HashMap<>(); countyRangeExtList.forEach(cuMemberRetailRangeExt -> - countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); + countyRangeExtMap.put(cuMemberRetailRangeExt.getRegionVertexPkId() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 计算区域奖 CuMemberBonusDetail cuMemberBonusDetail = calculateRetailAreaBonus(countyRangeExtMap, bonusConfigDTO, currentPeriod, memberRangeExtMap, cuMemberBonusMap, saOrderExt); if (cuMemberBonusDetail != null) { @@ -264,9 +265,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 订单业绩 BigDecimal orderAchieve = saOrderExt.getOrderAchieve(); // 复购、重消，盒数、业绩算个人累计数据（盒数、业绩） - sourceMemberRangeExt.setNewBoxNum(sourceMemberRangeExt.getNewBoxNum().add(boxNum)); - sourceMemberRangeExt.setConsumeBoxNum(sourceMemberRangeExt.getConsumeBoxNum().add(boxNum)); - sourceMemberRangeExt.setMonthBoxNum(sourceMemberRangeExt.getMonthBoxNum().add(boxNum)); + sourceMemberRangeExt.setNewBoxNum(sourceMemberRangeExt.getNewBoxNum().subtract(boxNum)); + sourceMemberRangeExt.setConsumeBoxNum(sourceMemberRangeExt.getConsumeBoxNum().subtract(boxNum)); + sourceMemberRangeExt.setMonthBoxNum(sourceMemberRangeExt.getMonthBoxNum().subtract(boxNum)); sourceMemberRangeExt.setNewConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getNewConsumePv(), orderAchieve)); sourceMemberRangeExt.setConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getConsumePv(), orderAchieve)); sourceMemberRangeExt.setMonthConsumePv(ComputeUtil.computeSubtract(sourceMemberRangeExt.getMonthConsumePv(), orderAchieve)); @@ -481,10 +482,10 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { // 区域处理 List countyRangeExtList = iCuMemberRetailRangeService.batchQueryMemberRetailRangeByCounty(rangeTableName); - // 区域会员map（key:系统+区ID ,value: 区域会员结算数据） + // 区域会员map（key:区域分组ID + 区ID ,value: 区域会员结算数据） Map countyRangeExtMap = new HashMap<>(); countyRangeExtList.forEach(cuMemberRetailRangeExt -> - countyRangeExtMap.put(cuMemberRetailRangeExt.getSystemType() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); + countyRangeExtMap.put(cuMemberRetailRangeExt.getRegionVertexPkId() + "_" + cuMemberRetailRangeExt.getRegionAddress(), cuMemberRetailRangeExt)); // 会员等级升级记录 List cuMemberGradeList = new ArrayList<>(); @@ -836,9 +837,9 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { targetMemberRangeExt.setTeamConsumeAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamConsumeAmount(), orderAmount)); targetMemberRangeExt.setTeamMonthAmount(ComputeUtil.computeSubtract(targetMemberRangeExt.getTeamMonthAmount(), orderAmount)); // 累计盒数 - targetMemberRangeExt.setTeamNewBoxNum(targetMemberRangeExt.getTeamNewBoxNum().add(boxNum)); - targetMemberRangeExt.setTeamBoxNum(targetMemberRangeExt.getTeamBoxNum().add(boxNum)); - targetMemberRangeExt.setTeamMonthBoxNum(targetMemberRangeExt.getTeamMonthBoxNum().add(boxNum)); + targetMemberRangeExt.setTeamNewBoxNum(targetMemberRangeExt.getTeamNewBoxNum().subtract(boxNum)); + targetMemberRangeExt.setTeamBoxNum(targetMemberRangeExt.getTeamBoxNum().subtract(boxNum)); + targetMemberRangeExt.setTeamMonthBoxNum(targetMemberRangeExt.getTeamMonthBoxNum().subtract(boxNum)); // 计算等级 calculateBackGrade(period, memberRangeExtMap, rangeTableName, saOrderExt, retailTeamGradeMap, retailAwardsMap, secondRangeTableName, cuMemberGradeMap, cuMemberAwardsMap, cuMemberShareAwardsMap, targetMemberRangeExt); @@ -1310,14 +1311,14 @@ public class BonusSettleRangeHandle extends BonusSettleHandle { if (saOrder.getOrderType().equals(EOrderType.RETAIL_CONSUME.getValue())) { return null; } - // 区域分红根据商品盒数来，如果没有盒数，直接返回为空 - if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) { - return null; - } +// // 区域分红根据商品盒数来，如果没有盒数，直接返回为空 +// if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) { +// return null; +// } CuMemberRetailRangeExt sourceRetailRangeExt = memberRangeExtMap.get(saOrder.getPkMember()); // 获取对应区域会员 - CuMemberRetailRangeExt cuMemberRetailRangeExt = countyRangeExtMap.get(sourceRetailRangeExt.getSystemType() + "_" + saOrder.getRecCounty()); + CuMemberRetailRangeExt cuMemberRetailRangeExt = countyRangeExtMap.get(sourceRetailRangeExt.getRegionVertexPkId() + "_" + saOrder.getRecCounty()); if (null == cuMemberRetailRangeExt) { return null; } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java index 2bf79bda..a2aeb266 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java @@ -135,6 +135,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService { // 非测试环境 if (settleDate.endsWith("01")) { // 计算新零售团队福利、福利分红等奖金 + log.info("正式处理：{}", settleDate); bonusSettleRangeHandle.calculateRetailShareBonus(settleDate, bonusConfigDTO, period, recordDetailVO, cuMemberBonusMap); } } @@ -142,8 +143,6 @@ public class BonusSettleServiceImpl implements IBonusSettleService { Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(settleDate)); String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate); if (afterDate.endsWith("01")) { - log.info("afterDate: {}", afterDate); - log.info("settleDate: {}", settleDate); // 计算完月奖，计算考核（区域6个月要达到蓝宝以上） String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java index fbfcc117..6d8fc67c 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusCoachServiceImpl.java @@ -13,22 +13,13 @@ import java.util.List; import java.util.Set; /** - *

* 会员奖金-辅导收益明细表 服务实现类 - *

- * - * @author hzs - * @since 2022-11-15 */ @Service public class CuMemberBonusCoachServiceImpl extends ServiceImpl implements ICuMemberBonusCoachService { - private CuMemberBonusSettle cuMemberBonusSettle; - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } + private CuMemberBonusSettle cuMemberBonusSettle; @Override public void deleteCuMemberBonusCoach(Integer period) { @@ -37,16 +28,16 @@ public class CuMemberBonusCoachServiceImpl extends ServiceImpl cuMemberBonusCoachList, Set memberIdSet) { - if(cuMemberBonusCoachList.size() == 0){ + if (cuMemberBonusCoachList.size() == 0) { return; } List cuMemberBonusCoaches = new ArrayList<>(); for (CuMemberBonusCoach cuMemberBonusCoach : cuMemberBonusCoachList) { - if(memberIdSet.contains(cuMemberBonusCoach.getPkBonus())){ + if (memberIdSet.contains(cuMemberBonusCoach.getPkBonus())) { cuMemberBonusCoaches.add(cuMemberBonusCoach); } } - if(cuMemberBonusCoaches.size()==0){ + if (cuMemberBonusCoaches.size() == 0) { return; } List> lists = cuMemberBonusSettle.handleCutList(cuMemberBonusCoaches); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java index b64edc9d..31393c29 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusDetailServiceImpl.java @@ -13,22 +13,13 @@ import java.util.List; import java.util.Set; /** - *

* 会员奖金-奖金收益明细表(报单费) 服务实现类 - *

- * - * @author hzs - * @since 2022-11-17 */ @Service public class CuMemberBonusDetailServiceImpl extends ServiceImpl implements ICuMemberBonusDetailService { - private CuMemberBonusSettle cuMemberBonusSettle; - @Autowired - public void setCuMemberBonusSettle(CuMemberBonusSettle cuMemberBonusSettle) { - this.cuMemberBonusSettle = cuMemberBonusSettle; - } + private CuMemberBonusSettle cuMemberBonusSettle; @Override public void deleteCuMemberBonusDetail(Integer period) { @@ -37,16 +28,16 @@ public class CuMemberBonusDetailServiceImpl extends ServiceImpl cuMemberBonusDetailList, Set memberIdSet) { - if(cuMemberBonusDetailList.size() == 0){ + if (cuMemberBonusDetailList.size() == 0) { return; } List cuMemberBonusDetails = new ArrayList<>(); for (CuMemberBonusDetail cuMemberBonusDetail : cuMemberBonusDetailList) { - if(memberIdSet.contains(cuMemberBonusDetail.getPkBonus())){ + if (memberIdSet.contains(cuMemberBonusDetail.getPkBonus())) { cuMemberBonusDetails.add(cuMemberBonusDetail); } } - if(cuMemberBonusDetails.size()==0){ + if (cuMemberBonusDetails.size() == 0) { return; } List> lists = cuMemberBonusSettle.handleCutList(cuMemberBonusDetails); @@ -54,8 +45,4 @@ public class CuMemberBonusDetailServiceImpl extends ServiceImpl * 会员奖金-拓展收益明细表 服务实现类 - *

- * - * @author hzs - * @since 2022-11-15 */ @Service public class CuMemberBonusExpandServiceImpl extends ServiceImpl implements ICuMemberBonusExpandService { @@ -37,16 +32,16 @@ public class CuMemberBonusExpandServiceImpl extends ServiceImpl cuMemberBonusExpandList, Set memberIdSet) { - if(cuMemberBonusExpandList.size() == 0){ + if (cuMemberBonusExpandList.size() == 0) { return; } List memberBonusExpands = new ArrayList<>(); for (CuMemberBonusExpand cuMemberBonusExpand : cuMemberBonusExpandList) { - if(memberIdSet.contains(cuMemberBonusExpand.getPkBonus())){ + if (memberIdSet.contains(cuMemberBonusExpand.getPkBonus())) { memberBonusExpands.add(cuMemberBonusExpand); } } - if(memberBonusExpands.size()==0){ + if (memberBonusExpands.size() == 0) { return; } List> lists = cuMemberBonusSettle.handleCutList(memberBonusExpands); @@ -54,9 +49,5 @@ public class CuMemberBonusExpandServiceImpl extends ServiceImpl cuMemberBonusExpandList) { - baseMapper.insertCuMemberBonusExpand(cuMemberBonusExpandList); - } } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java deleted file mode 100644 index f160257b..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hzs.bonus.bonus.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.bonus.service.ICuMemberBonusPushHisService; -import com.hzs.common.core.constant.MemberFieldConstants; -import com.hzs.common.domain.member.bonus.CuMemberBonusPushHis; -import com.hzs.bonus.bonus.mapper.CuMemberBonusPushHisMapper; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 会员奖金-直推历史轮次记录 服务实现类 - *

- * - * @author hzs - * @since 2023-09-10 - */ -@Service -public class CuMemberBonusPushHisServiceImpl extends ServiceImpl implements ICuMemberBonusPushHisService { - - @Override - public List queryCuMemberBonusPushHis(Long pkMember) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("(round+1) round,second,cal_achieve"); - queryWrapper.eq(MemberFieldConstants.PK_MEMBER, pkMember); - queryWrapper.orderByDesc("round,second"); - return baseMapper.selectList(queryWrapper); - } -} diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index c1d89216..635df5f3 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -621,14 +621,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl queryWeekMemberBonus(int startPeriod, int endPeriod) { - List cuMemberBonusList = baseMapper.queryWeekMemberBonus(startPeriod, endPeriod); - Map cuMemberBonusMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberBonusList.size())); - cuMemberBonusList.forEach(cuMemberBonus -> cuMemberBonusMap.put(cuMemberBonus.getPkMember(), cuMemberBonus)); - return cuMemberBonusMap; - } - @Override public void recalculateTeamNewBoxNum(List pkIdList) { String retailsTableName = getDayTableName(); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java index c4ac873f..23e727c5 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java @@ -36,21 +36,17 @@ import java.math.BigDecimal; import java.util.*; /** - *

* 会员奖金-分红奖金配置 服务实现类 - *

- * - * @author hzs - * @since 2023-07-03 */ @Service public class CuMemberShareBonusServiceImpl extends ServiceImpl implements ICuMemberShareBonusService { @DubboReference - private ISaOrderServiceApi saOrderServiceApi; - + ISaOrderServiceApi saOrderServiceApi; @DubboReference - private IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi awardsServiceApi; + @DubboReference + ICurrencyServiceApi currencyServiceApi; private ICuMemberShareDetailService cuMemberShareDetailService; @@ -60,9 +56,6 @@ public class CuMemberShareBonusServiceImpl extends ServiceImpl cuMemberShareDetailParamMap = new HashMap<>(); cuMemberShareBonusParam.getCuMemberShareDetailList().forEach(cuMemberShareDetailParam -> cuMemberShareDetailParamMap.put(cuMemberShareDetailParam.getPkAwards(), cuMemberShareDetailParam)); Date currentDateTime = DateUtils.currentDateTime(); - for(CuMemberShareDetailExt cuMemberShareDetail : cuMemberShareBonusExt.getCuMemberShareDetailList()){ - if(cuMemberShareDetailParamMap.containsKey(cuMemberShareDetail.getPkAwards())){ + for (CuMemberShareDetailExt cuMemberShareDetail : cuMemberShareBonusExt.getCuMemberShareDetailList()) { + if (cuMemberShareDetailParamMap.containsKey(cuMemberShareDetail.getPkAwards())) { CuMemberShareDetailParam cuMemberShareDetailParam = cuMemberShareDetailParamMap.get(cuMemberShareDetail.getPkAwards()); cuMemberShareDetail.setRealShareIncome(cuMemberShareDetailParam.getRealShareIncome()); cuMemberShareDetail.setRealShareSubtotal(ComputeUtil.computeMultiply(cuMemberShareDetailParam.getRealShareIncome(), cuMemberShareDetail.getReachTotal())); } - if(cuMemberShareDetail.getPkId() == null){ + if (cuMemberShareDetail.getPkId() == null) { cuMemberShareDetail.setPkCountry(cuMemberShareBonusParam.getPkCountry()); cuMemberShareDetail.setPkShareBonus(cuMemberShareBonus.getPkId()); cuMemberShareDetail.setCreationTime(currentDateTime); cuMemberShareDetail.setPkCreator(cuMemberShareBonusParam.getPkCreator()); - }else{ + } else { cuMemberShareDetail.setPkModified(cuMemberShareBonusParam.getPkCreator()); cuMemberShareDetail.setModifiedTime(DateUtils.currentDateTime()); } @@ -129,7 +122,7 @@ public class CuMemberShareBonusServiceImpl extends ServiceImpl 0) { + if (count > 0) { cuMemberShareDetail.setExpectShareSubtotal(ComputeUtil.computeDivide(cuMemberShareBonusExt.getExpectShareTotal(), BigDecimal.valueOf(count))); cuMemberShareDetail.setExpectShareIncome(ComputeUtil.computeDivide(cuMemberShareDetail.getExpectShareSubtotal(), BigDecimal.valueOf(cuMemberShareDetail.getPromoteTotal()))); - }else{ + } else { cuMemberShareDetail.setExpectShareSubtotal(BigDecimal.ZERO); cuMemberShareDetail.setExpectShareIncome(BigDecimal.ZERO); } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java index bba51a65..11371e81 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java @@ -1,25 +1,16 @@ package com.hzs.bonus.bonus.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.bonus.bonus.service.ICuMemberShareDetailService; -import com.hzs.common.core.utils.ComputeUtil; import com.hzs.common.domain.member.bonus.CuMemberShareDetail; import com.hzs.common.domain.member.ext.CuMemberShareDetailExt; import com.hzs.bonus.bonus.mapper.CuMemberShareDetailMapper; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** - *

* 会员奖金-分红奖金配置明细 服务实现类 - *

- * - * @author hzs - * @since 2023-07-03 */ @Service public class CuMemberShareDetailServiceImpl extends ServiceImpl implements ICuMemberShareDetailService { @@ -29,23 +20,4 @@ public class CuMemberShareDetailServiceImpl extends ServiceImpl queryCuMemberShareBonusByPeriod(Integer period){ - List cuMemberShareDetailList = baseMapper.queryCuMemberShareBonusByPeriod(period); - Map cuMemberShareDetailMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberShareDetailList.size())); - if(CollectionUtil.isNotEmpty(cuMemberShareDetailList)){ - for (CuMemberShareDetail cuMemberShareDetail : cuMemberShareDetailList) { - String key =cuMemberShareDetail.getPkCountry().toString() + cuMemberShareDetail.getPkAwards(); - cuMemberShareDetailMap.put(key, cuMemberShareDetail); - } - } - return cuMemberShareDetailMap; - } - } diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareMaxServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareMaxServiceImpl.java deleted file mode 100644 index a55ed63e..00000000 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareMaxServiceImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.bonus.bonus.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.bonus.bonus.service.ICuMemberShareMaxService; -import com.hzs.common.domain.member.bonus.CuMemberShareMax; -import com.hzs.bonus.bonus.mapper.CuMemberShareMaxMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - *

- * 会员奖金-最大分红奖金 服务实现类 - *

- * - * @author hzs - * @since 2023-01-06 - */ -@Service -public class CuMemberShareMaxServiceImpl extends ServiceImpl implements ICuMemberShareMaxService { - - - @Override - @Transactional(rollbackFor = Exception.class) - public void insertMaxShareBonus(CuMemberShareMax cuMemberShareMax) { - // 删除 - baseMapper.deleteCuMemberShareMax(cuMemberShareMax.getPeriod()); - baseMapper.insert(cuMemberShareMax); - } -} diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml index 10bfd6f9..4c8b1492 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml @@ -63,6 +63,7 @@ + @@ -357,7 +358,8 @@ bw.month_repurchase_ratio, bw.benefit_avg_ratio, bw.benefit_share_ratio, - br.name country_name + br.name country_name, + bv.region_vertex_pk_id from ( select * from ${tableName} start with pk_member = #{item} @@ -371,6 +373,8 @@ on bwa.pk_id = a.pk_share_awards and bwa.del_flag = 0 left join bd_area br on br.pk_id = a.region_address and br.del_flag = 0 + left join bd_vertex bv + on bv.pk_id = a.pk_vertex where ba.del_flag = 0 and bw.del_flag = 0 @@ -526,10 +530,11 @@ diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusItemsMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusItemsMapper.xml index d5c6eb60..6bfc1ee1 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusItemsMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/BdWaresBonusItemsMapper.xml @@ -4,16 +4,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml index cda1b68d..c4ace8f4 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusDetailMapper.xml @@ -72,17 +72,6 @@ SELECT 1 FROM dual - - insert into cu_member_bonus_detail(pk_bonus, pk_order, pk_bonus_items, income_status, - cal_type, cal_achieve, cal_value, pretax_income, - income_tax, real_income, remark, - income_ratio, income_dial_ratio, order_dial_ratio, pk_country, pk_creator) - values (#{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus}, - #{item.calType}, #{item.calAchieve,jdbcType=NUMERIC}, #{item.calValue,jdbcType=NUMERIC}, #{item.pretaxIncome,jdbcType=NUMERIC}, - #{item.incomeTax,jdbcType=NUMERIC}, #{item.realIncome,jdbcType=NUMERIC}, - #{item.remark}, #{item.incomeRatio,jdbcType=NUMERIC}, #{item.incomeDialRatio,jdbcType=NUMERIC}, #{item.orderDialRatio,jdbcType=NUMERIC}, - #{item.pkCountry}, #{item.pkCreator}) - delete from CU_MEMBER_BONUS_DETAIL diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml index 2279de06..db88bc0e 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusExpandMapper.xml @@ -77,19 +77,7 @@ SELECT 1 FROM dual - - insert into cu_member_bonus_expand(pk_bonus, pk_order, pk_bonus_items, income_status, - cal_type, cal_achieve, cal_value, pretax_income, - income_tax, real_income, current_touch, expand_touch, expand_no_capping, - expand_capping, expand_normal_half, expand_normal_real, remark, - income_ratio, income_dial_ratio, order_dial_ratio, pk_country, pk_creator) - values (#{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus}, - #{item.calType}, #{item.calAchieve}, #{item.calValue}, #{item.pretaxIncome}, - #{item.incomeTax}, #{item.realIncome}, #{item.currentTouch}, #{item.expandTouch}, - #{item.expandNoCapping}, #{item.expandCapping}, #{item.expandNormalHalf}, #{item.expandNormalReal}, - #{item.remark}, #{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio}, - #{item.pkCountry}, #{item.pkCreator}) - + delete from CU_MEMBER_BONUS_EXPAND diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml index a5abeba2..7291d327 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml @@ -244,37 +244,6 @@ b.retail_real_subtotal) - - - - MERGE INTO ${retailsTableName} s USING ( diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushHisMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushHisMapper.xml deleted file mode 100644 index 842c7eaf..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusPushHisMapper.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareBonusMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareBonusMapper.xml index 5d21bf66..a261fa85 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareBonusMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareBonusMapper.xml @@ -4,51 +4,53 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PERIOD, PK_RATE, SETTLE_MONTH, EXPECT_SHARE_TOTAL, REAL_SHARE_TOTAL - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareDetailMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareDetailMapper.xml index 638b8e49..690f8b9d 100644 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareDetailMapper.xml +++ b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareDetailMapper.xml @@ -4,62 +4,45 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - DEL_FLAG, - CREATION_TIME, - MODIFIED_TIME, - PK_COUNTRY, - PK_CREATOR, - PK_MODIFIED, - PK_ID, PK_AWARDS,PK_SHARE_BONUS, PROMOTE_TOTAL, REACH_TOTAL, EXPECT_SHARE_INCOME, EXPECT_SHARE_SUBTOTAL, REAL_SHARE_INCOME, REAL_SHARE_SUBTOTAL - merge into cu_member_share_detail a using( - - select #{item.pkAwards} pk_awards,#{item.pkShareBonus} pk_share_bonus,#{item.promoteTotal} promote_total,#{item.reachTotal} reach_total, - #{item.expectShareIncome} expect_share_income,#{item.expectShareSubtotal} expect_share_subtotal, - #{item.realShareIncome} real_share_income,#{item.realShareSubtotal} real_share_subtotal, - #{item.creationTime, jdbcType=TIMESTAMP} creation_time,#{item.pkCountry} pk_country,#{item.pkCreator,jdbcType=BIGINT} pk_creator, - #{item.modifiedTime, jdbcType=TIMESTAMP} modified_time,#{item.pkModified,jdbcType=BIGINT} pk_modified from dual - - ) b + + select #{item.pkAwards} pk_awards,#{item.pkShareBonus} pk_share_bonus,#{item.promoteTotal} promote_total,#{item.reachTotal} reach_total, + #{item.expectShareIncome} expect_share_income,#{item.expectShareSubtotal} expect_share_subtotal, + #{item.realShareIncome} real_share_income,#{item.realShareSubtotal} real_share_subtotal, + #{item.creationTime, jdbcType=TIMESTAMP} creation_time,#{item.pkCountry} pk_country,#{item.pkCreator,jdbcType=BIGINT} pk_creator, + #{item.modifiedTime, jdbcType=TIMESTAMP} modified_time,#{item.pkModified,jdbcType=BIGINT} pk_modified from dual + + ) b on (a.pk_share_bonus=b.pk_share_bonus and a.pk_awards=b.pk_awards) WHEN NOT MATCHED THEN insert(pk_awards,pk_share_bonus, promote_total, reach_total, expect_share_income, expect_share_subtotal, real_share_income, - real_share_subtotal,creation_time,pk_country,pk_creator) + real_share_subtotal,creation_time,pk_country,pk_creator) values (b.pk_awards,b.pk_share_bonus,b.promote_total,b.reach_total, b.expect_share_income, b.expect_share_subtotal, b.real_share_income, b.real_share_subtotal,b.creation_time,b.pk_country,b.pk_creator) when matched then update set a.promote_total=b.promote_total,a.reach_total=b.reach_total,a.expect_share_income=b.expect_share_income, - a.expect_share_subtotal=b.expect_share_subtotal,a.real_share_income=b.real_share_income, - a.real_share_subtotal=b.real_share_subtotal,a.modified_time=b.modified_time,a.pk_modified=b.pk_modified + a.expect_share_subtotal=b.expect_share_subtotal,a.real_share_income=b.real_share_income, + a.real_share_subtotal=b.real_share_subtotal,a.modified_time=b.modified_time,a.pk_modified=b.pk_modified - diff --git a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareMaxMapper.xml b/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareMaxMapper.xml deleted file mode 100644 index 97bbbc0a..00000000 --- a/bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareMaxMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - delete from CU_MEMBER_SHARE_MAX where period = #{period} and del_flag=0 - - - diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java index bb316212..3ad20739 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java @@ -2312,10 +2312,10 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService { // 不同产品，需要更新 // 调换货物选择不同产品，没有商品信息，此处先全部按默认值来处理 -// // 2025.02.11 如果盒数商品，历史商品ID不变，非盒数商品进行处理 -// if (saOrder.getBoxNum() == 0) { -// saOrderItems.setPkWares(0); -// } + // 2025.02.11 如果盒数商品，历史商品ID不变，非盒数商品进行处理 + if (saOrder.getBoxNum().compareTo(BigDecimal.ZERO) == 0) { + saOrderItems.setPkWares(0); + } saOrderItems.setPkWares(0); saOrderItems.setPkWaresDetail(0); saOrderItems.setPkWaresSpecsSku(0); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 30573063..7cad8626 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2648,10 +2648,18 @@ public class SaOrderServiceImpl extends ServiceImpl impl throw new ServiceException("当前已经是可以购买的最高等级"); } // 盒数基数 = 手动升级盒数 + 手动升级之后的升级订单盒数 - baseBoxNum = lastUpdateGrade.getBoxNumber().add(saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType)); + BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, lastMemberLevel.getUpgradeTime(), Collections.singletonList(EOrderType.RETAIL_UPGRADE.getValue()), systemType); + if (null != oldBoxNum) { + baseBoxNum = lastUpdateGrade.getBoxNumber().add(oldBoxNum); + } else { + baseBoxNum = lastUpdateGrade.getBoxNumber(); + } } else { // 没有手动升级记录 - baseBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType); + BigDecimal oldBoxNum = saOrderItemsService.getRetailWaresQuantityNew(cuMember.getPkId(), boxWaresList, null, Arrays.asList(EOrderType.RETAIL_REGISTER.getValue(), EOrderType.RETAIL_UPGRADE.getValue()), systemType); + if (null != oldBoxNum) { + baseBoxNum = oldBoxNum; + } } } return baseBoxNum; diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java index db1549e8..24710930 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java @@ -251,4 +251,11 @@ public class CuMemberRetailRange extends BaseEntity { @TableField("small_team_pv") private BigDecimal smallTeamPv; + + /** + * 区域分组ID + */ + @TableField("region_vertex_pk_id") + private Integer regionVertexPkId; + } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java index 7bb6a51f..300d4570 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/BdWaresBonusItems.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 特殊商品分配ev奖金明细 - *

- * - * @author hzs - * @since 2024-10-30 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java index 8be9276a..eb94232e 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusExpand.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员奖金-拓展收益明细表 - *

- * - * @author hzs - * @since 2022-11-15 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java index 5cd13430..dd3cd6e5 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusPushHis.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员奖金-直推历史轮次记录 - *

- * - * @author hzs - * @since 2023-09-10 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java index 2c5e5f28..948fe2c2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 会员奖金-分红奖金配置 - *

- * - * @author hzs - * @since 2023-07-03 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareMax.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareMax.java index ed612f6f..7e473d5b 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareMax.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareMax.java @@ -11,12 +11,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 会员奖金-理论最大分红奖金 - *

- * - * @author hzs - * @since 2023-01-06 */ @Data @EqualsAndHashCode(callSuper = true)