Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java

@@ -35,46 +35,7 @@ public class ApiCuMemberBonusController extends BaseController {
     private ICuMemberBonusService cuMemberBonusService;
 
     /**
-     * 查询会员某个时间段内的奖金，默认查询15天内,查询直推
-     */
-    @PostMapping("/query-bonus-first")
-    public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) {
-        setBonusParam(bonusParam);
-        List<CuMemberBonusExt> cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam);
-        List<MemberBonusFirstPurchaseVO> firstPurchaseVOList = new ArrayList<>();
-        cuMemberBonusList.forEach(cuMemberBonus -> {
-            MemberBonusFirstPurchaseVO memberBonusFirstPurchaseVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusFirstPurchaseVO.class, "settleDate");
-            packageSettleDate(cuMemberBonus, memberBonusFirstPurchaseVO);
-//            BigDecimal serviceSpend = ComputeUtil.computeSubtract(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getDirectIncome(), memberBonusFirstPurchaseVO.getExpandIncome(),
-//                            memberBonusFirstPurchaseVO.getCoachIncome(), memberBonusFirstPurchaseVO.getServiceIncome(), memberBonusFirstPurchaseVO.getShareIncome()),
-//                    memberBonusFirstPurchaseVO.getPurRealSubtotal());
-//            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));
-            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(),
-//                                memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurExpandIncome()),
-//                        ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal()));
-//                memberBonusFirstPurchaseVO.setBackPoints(ComputeUtil.computeMultiplyHalf(serviceSpend));
-//                memberBonusFirstPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend));
-//            }
-            memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getGlobalPoints()));
-            firstPurchaseVOList.add(memberBonusFirstPurchaseVO);
-        });
-        return getDataTable(firstPurchaseVOList);
-    }
-
-    /**
-     * 查询会员实时奖金，当日的奖金
+     * 新零售实时奖金：查询会员实时奖金，当日的奖金
      */
     @PostMapping("/query-current-bonus")
     public TableDataInfo listCurrentBonus(@RequestBody BonusParam bonusParam) {
@@ -102,17 +63,40 @@ public class ApiCuMemberBonusController extends BaseController {
     }
 
     /**
-     * 查询会员昨天奖金的值
+     * 查询会员某个时间段内的奖金，默认查询15天内,查询直推
+     */
+    @PostMapping("/query-bonus-first")
+    public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) {
+        setBonusParam(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusList = cuMemberBonusService.queryMemberBonusVoByCondition(bonusParam);
+        List<MemberBonusFirstPurchaseVO> firstPurchaseVOList = new ArrayList<>();
+        cuMemberBonusList.forEach(cuMemberBonus -> {
+            MemberBonusFirstPurchaseVO memberBonusFirstPurchaseVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusFirstPurchaseVO.class, "settleDate");
+            packageSettleDate(cuMemberBonus, memberBonusFirstPurchaseVO);
+            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));
+            memberBonusFirstPurchaseVO.setExpandIncome(ComputeUtil.computeAddNum(memberBonusFirstPurchaseVO.getExpandIncome(), memberBonusFirstPurchaseVO.getRepurExpandIncome(), memberBonusFirstPurchaseVO.getRepurPushIncome()));
+            memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getRepurRealSubtotal()));
+            memberBonusFirstPurchaseVO.setPurRealSubtotal(ComputeUtil.computeAdd(memberBonusFirstPurchaseVO.getPurRealSubtotal(), memberBonusFirstPurchaseVO.getGlobalPoints()));
+            firstPurchaseVOList.add(memberBonusFirstPurchaseVO);
+        });
+        return getDataTable(firstPurchaseVOList);
+    }
+
+    /**
+     * 新零售实时奖金：查询会员昨日奖金汇总
      */
     @PostMapping("/query-bonus-total")
     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());
-        bonusParam.setStartDate(DateUtils.currentDate());
-        bonusParam.setGrantStatus(EGrantStatus.SETTLED.getValue());
-        bonusParam.setEndDate(DateUtils.afterDate(1, ChronoUnit.DAYS));
+        bonusParam.setEndDate(DateUtils.currentDate());
+        bonusParam.setStartDate(DateUtils.beforeDate(1, ChronoUnit.DAYS, bonusParam.getEndDate()));
+
         List<CuMemberBonusExt> cuMemberBonusList = cuMemberBonusService.queryMemberBonusTotalByCondition(bonusParam);
         MemberRealIncomeVO memberRealIncomeVO = new MemberRealIncomeVO();
         if (CollectionUtil.isEmpty(cuMemberBonusList)) {
@@ -141,7 +125,6 @@ public class ApiCuMemberBonusController extends BaseController {
                     memberBonusPurchaseVO.getRetailRealSubtotal());
             memberBonusPurchaseVO.setBackPoints(serviceSpend);
             memberBonusPurchaseVO.setRetailBenefitIncome(ComputeUtil.computeAdd(memberBonusPurchaseVO.getRetailBenefitIncome(), memberBonusPurchaseVO.getRetailBenefitAvgIncome()));
-//            memberBonusPurchaseVO.setServiceSpend(ComputeUtil.computeMultiplyHalf(serviceSpend));
             memberBonusPurchaseVoList.add(memberBonusPurchaseVO);
         });
         return getDataTable(memberBonusPurchaseVoList);
@@ -197,14 +180,7 @@ public class ApiCuMemberBonusController extends BaseController {
     public TableDataInfo listBonusSource(@RequestBody BonusParam bonusParam) {
         setBonusParam(bonusParam);
         startPage();
-//        List<MemberBonusVO> memberBonusVoList = new ArrayList<>();
         TableDataInfo tableDataInfo = cuMemberBonusService.queryMemberBonusDetailVoByCondition(bonusParam);
-//        cuMemberBonusList.forEach(cuMemberBonus -> {
-//            MemberBonusVO memberBonusVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusVO.class);
-//            memberBonusVoList.add(memberBonusVO);
-//        });
-//        TableDataInfo dataTable = getDataTable(cuMemberBonusList);
-//        dataTable.setRows(memberBonusVoList);
         return tableDataInfo;
     }
 

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusMapper.java

@@ -9,12 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * <p>
  * 会员奖金-会员奖金汇总表 Mapper 接口
- * </p>
- *
- * @author hzs
- * @since 2022-11-11
  */
 public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
 
@@ -22,9 +17,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 批量获取cuMemberBonus主键
      *
      * @param rowNum 数量
-     * @return: List<Integer>
-     * @Author: sui q
-     * @Date: 2022/12/13 13:47
      */
     List<Long> batchQueryCuMemberBonusSeq(Integer rowNum);
 
@@ -32,9 +24,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 根据查询条件查询会员奖金
      *
      * @param bonusParam 查询条件
-     * @return: List<MemberBonusVO>
-     * @Author: sui q
-     * @Date: 2023/1/13 11:27
      */
     List<CuMemberBonus> queryMemberBonusTotalByCondition(BonusParam bonusParam);
 
@@ -42,9 +31,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 根据查询条件查询会员奖金
      *
      * @param bonusParam 查询条件
-     * @return: List<MemberBonusVO>
-     * @Author: sui q
-     * @Date: 2023/1/13 11:27
      */
     List<CuMemberBonusExt> queryMemberBonusByCondition(BonusParam bonusParam);
 
@@ -52,30 +38,19 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 根据查询条件查询会员奖金
      *
      * @param bonusParam 查询条件
-     * @return: List<MemberBonusVO>
-     * @Author: sui q
-     * @Date: 2023/1/13 11:27
      */
     List<CuMemberBonusExt> queryMemberBonusByConditionForServer(@Param("bonusParam") BonusParam bonusParam);
 
     /**
-     * @description: 查询奖金明细合计（最后一行）
-     * @author: zhang jing
-     * @date: 2024/10/12 14:06
-     * @param: [bonusParam]
-     * @return: com.hzs.common.domain.member.ext.CuMemberBonusExt
+     * 查询奖金明细合计（最后一行）
      **/
     CuMemberBonusExt queryMemberBonusByConditionForServerSum(@Param("bonusParam") BonusParam bonusParam);
 
 
-
     /**
      * 根据查询条件查询会员奖金
      *
      * @param bonusParam 查询条件
-     * @return: List<MemberBonusVO>
-     * @Author: sui q
-     * @Date: 2023/1/13 11:27
      */
     List<CuMemberBonusExt> queryBonusTotalVoByConditionForServer(@Param("bonusParam") BonusParam bonusParam);
 
@@ -83,9 +58,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 删除会员奖金汇总表
      *
      * @param period 结算期间
-     * @return: void
-     * @Author: sui q
-     * @Date: 2022/12/13 11:54
      */
     void deleteCuMemberBonus(Integer period);
 
@@ -93,9 +65,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 批量插入会员奖金主表
      *
      * @param cuMemberBonusList 会员奖金
-     * @return: void
-     * @Author: sui q
-     * @Date: 2022/12/13 13:56
      */
     void batchInsertCuMemberBonus(@Param("cuMemberBonusList") List<?> cuMemberBonusList);
 
@@ -103,9 +72,6 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      * 批量插入会员奖金主表
      *
      * @param cuMemberBonusList 会员奖金
-     * @return: void
-     * @Author: sui q
-     * @Date: 2022/12/13 13:56
      */
     void insertOrUpdateCuMemberBonus(@Param("cuMemberBonusList") List<CuMemberBonus> cuMemberBonusList);
 
@@ -114,28 +80,19 @@ public interface CuMemberBonusMapper extends BaseMapper<CuMemberBonus> {
      *
      * @param grantStatus    发放状态
      * @param oldGrantStatus 原来的发放状态
-     * @return: Boolean
-     * @Author: sui q
-     * @Date: 2023/3/20 17:21
      */
     Integer updateCuMemberBonusStatus(@Param("pkCountry") Integer pkCountry, @Param("grantStatus") Integer grantStatus,
                                       @Param("oldGrantStatus") Integer oldGrantStatus, @Param("startPeriod") Integer startPeriod,
                                       @Param("endPeriod") Integer endPeriod);
 
-    /*
-     * @description: 回退极差奖金
-     * @author: sui q
-     * @date: 2024/12/25 17:06
-     * @param: null null
-     **/
+    /**
+     * 回退极差奖金
+     */
     void mergeBackRangeBonusIncome(@Param("pkOrder") Long pkOrder, @Param("bonusValue") Integer bonusValue);
 
-    /*
-     * @description: 查询会员一周周期的拓展累计，复购拓展累计
-     * @author: sui q
-     * @date: 2023/7/15 14:26
-     * @param: null null
-     **/
+    /**
+     * 查询会员一周周期的拓展累计，复购拓展累计
+     */
     List<CuMemberBonus> queryWeekMemberBonus(@Param("startPeriod") int startPeriod, @Param("endPeriod") int endPeriod);
 
     void recalculateTeamNewBoxNum(@Param("pkId") Long pkId, @Param("retailsTableName") String retailsTableName);

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/param/BonusParam.java

@@ -2,17 +2,12 @@ package com.hzs.bonus.bonus.param;
 
 import com.hzs.common.core.web.domain.BaseAuthorityEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 import java.util.List;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2023/1/13 9:44
- * @Classname: BonusParam
- * @PackageName: com.hzs.member.bonus.param
- */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class BonusParam extends BaseAuthorityEntity {
 

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java

@@ -56,10 +56,10 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
     ICurrencyServiceApi iCurrencyServiceApi;
     @DubboReference
     IBonusItemsServiceApi iBonusItemsServiceApi;
+
     @Autowired
     private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
 
-
     private CuMemberBonusDetailMapper cuMemberBonusDetailMapper;
 
     private CuMemberBonusPushMapper cuMemberBonusPushMapper;
@@ -140,7 +140,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             // 周结的话不能查询当前周的数据，只能查询上周的数据
             bonusParam.setEndDate(DateUtils.parseStringToDate(DateUtils.getRecentlyTuesday(bonusParam.getEndDate())));
         }
-        return handleMemberBonusPurchase(getCuMemberBonusExtList(bonusParam, value), bonusParam, value);
+        return handleMemberBonusPurchase(getCuMemberBonusExtList(bonusParam), bonusParam, value);
     }
 
     private List<CuMemberBonusExt> handleMemberBonusPurchase(List<CuMemberBonusExt> cuMemberBonusExtList, BonusParam bonusParam, String value) {
@@ -211,16 +211,10 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
 
     @Override
     public List<CuMemberBonusExt> queryMemberSecondBonusVoByCondition(BonusParam bonusParam) {
-        String value = iSystemConfigServiceApi.getBonusSystemConfig(bonusParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
-//        if (StringUtils.isNotEmpty(value) && Objects.equals(Integer.toString(EExpandCapMethod.WEEK_SETTLE.getValue()), value)) {
-//            // 周结的话不能查询当前周的数据，只能查询上周的数据
-//            bonusParam.setStartDate(DateUtils.parseStringToDate(DateUtils.getRecentlyTuesday(bonusParam.getStartDate())));
-//            bonusParam.setEndDate(DateUtils.parseStringToDate(DateUtils.getRecentlyMonday(bonusParam.getStartDate())));
-//        }
-        return getCuMemberBonusExtList(bonusParam, value);
+        return getCuMemberBonusExtList(bonusParam);
     }
 
-    private List<CuMemberBonusExt> getCuMemberBonusExtList(BonusParam bonusParam, String value) {
+    private List<CuMemberBonusExt> getCuMemberBonusExtList(BonusParam bonusParam) {
         if (bonusParam.getGrantStatus() == null) {
             bonusParam.setGrantStatus(EGrantStatus.PUBLISHED.getValue());
         }
@@ -241,20 +235,11 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRangeIncome(), inExchangeRate));
             cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurExpandIncome(), inExchangeRate));
             cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurRealSubtotal(), inExchangeRate));
-            cuMemberBonusExt.setCloudDirectIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudDirectIncome(), inExchangeRate));
-            cuMemberBonusExt.setCloudPurIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudPurIncome(), inExchangeRate));
-            cuMemberBonusExt.setCloudRepurIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudRepurIncome(), inExchangeRate));
-            cuMemberBonusExt.setCloudRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getCloudRealSubtotal(), inExchangeRate));
             cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCoupon(), inExchangeRate));
             cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponShare(), inExchangeRate));
             cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRepurCouponSubtotal(), inExchangeRate));
-            cuMemberBonusExt.setMakerDirectIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getMakerDirectIncome(), inExchangeRate));
-            cuMemberBonusExt.setMakerShareIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getMakerShareIncome(), inExchangeRate));
-            cuMemberBonusExt.setMakerRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getMakerRealSubtotal(), inExchangeRate));
             cuMemberBonusExt.setGlobalPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getGlobalPoints(), inExchangeRate));
             cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeMultiply(cuMemberBonusExt.getCarAwardPoints(), inExchangeRate));
-            cuMemberBonusExt.setHiFunIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getHiFunIncome(), inExchangeRate));
-            cuMemberBonusExt.setHaiFunIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getHaiFunIncome(), inExchangeRate));
             cuMemberBonusExt.setRealIncomeTotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRealIncomeTotal(), inExchangeRate));
             cuMemberBonusExt.setStoreIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getStoreIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailRangeIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRangeIncome(), inExchangeRate));
@@ -265,31 +250,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
         }
-//        if (StringUtils.isNotEmpty(value) && Objects.equals(Integer.toString(EExpandCapMethod.WEEK_SETTLE.getValue()), value)) {
-//            Map<String, List<CuMemberBonusExt>> weekDateMap = new TreeMap<>();
-//            // 计算周开始和结束
-//            for (CuMemberBonusExt cuMemberBonusExt : cuMemberBonusExtList) {
-//                String startDateStr = DateUtils.getRecentlyTuesday(cuMemberBonusExt.getSettleDate());
-//                if (weekDateMap.containsKey(startDateStr)) {
-//                    weekDateMap.get(startDateStr).add(cuMemberBonusExt);
-//                } else {
-//                    List<CuMemberBonusExt> cuMemberBonusExtList1 = new ArrayList<>();
-//                    cuMemberBonusExtList1.add(cuMemberBonusExt);
-//                    weekDateMap.put(startDateStr, cuMemberBonusExtList1);
-//                }
-//            }
-//            List<CuMemberBonusExt> cuMemberBonusExtList1 = new ArrayList<>();
-//            for (String key : weekDateMap.keySet()) {
-//                CuMemberBonusExt cuMemberBonusExt = initCuMemberBonus();
-//                cuMemberBonusExt.setSettleDate(DateUtils.parseStringToDate(key));
-//                cuMemberBonusExt.setEndSettleDate(DateUtils.afterDate(6, ChronoUnit.DAYS, cuMemberBonusExt.getSettleDate()));
-//                for (CuMemberBonusExt memberBonusExt : weekDateMap.get(key)) {
-//                    calculateBonusTotal(cuMemberBonusExt, memberBonusExt);
-//                }
-//                cuMemberBonusExtList1.add(cuMemberBonusExt);
-//            }
-//            return cuMemberBonusExtList1;
-//        }
         return cuMemberBonusExtList;
     }
 
@@ -327,13 +287,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
 
     @Override
     public List<CuMemberBonusExt> queryMemberBonusTotalByCondition(BonusParam bonusParam) {
-        String value = iSystemConfigServiceApi.getBonusSystemConfig(bonusParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
-        if (StringUtils.isNotEmpty(value) && Objects.equals(Integer.toString(EExpandCapMethod.WEEK_SETTLE.getValue()), value)) {
-            // 周结的话不能查询当前周
-            bonusParam.setEndDate(DateUtils.parseStringToDate(DateUtils.getRecentlyTuesday(bonusParam.getEndDate())));
-            bonusParam.setStartDate(DateUtils.beforeDate(7, ChronoUnit.DAYS, bonusParam.getEndDate()));
-        }
-        return getCuMemberBonusExtList(bonusParam, value);
+        return getCuMemberBonusExtList(bonusParam);
     }
 
     @Override
@@ -706,6 +660,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             baseMapper.recalculateTeamNewBoxNum(pkId, retailsTableName);
         }
     }
+
     private String getDayTableName() {
         String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/PubMemberBonusVO.java

@@ -6,12 +6,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @description: 会员端奖金明细查询vo
- * @author: sui q
- * @time: 2023/7/17 14:58
- * @classname: PubMemberBonusVO
- * @package_name: com.hzs.member.bonus.vo
- * version 1.0.0
+ * 会员端奖金明细查询vo
  */
 @Data
 public class PubMemberBonusVO implements Serializable {

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/controller/manage/CuRegionAssessController.java

@@ -1,46 +1,28 @@
 package com.hzs.bonus.detail.controller.manage;
 
-
 import cn.hutool.core.bean.BeanUtil;
 import com.hzs.bonus.achieve.service.ICuMemberSettlePeriodService;
-import com.hzs.bonus.bonus.param.BonusParam;
-import com.hzs.bonus.bonus.vo.BonusTotalVO;
 import com.hzs.bonus.detail.service.ICuRegionAssessService;
-import com.hzs.bonus.detail.vo.CuRegionAssessDetailVO;
 import com.hzs.bonus.detail.vo.CuRegionAssessExcelVO;
 import com.hzs.bonus.detail.vo.CuRegionAssessVO;
 import com.hzs.bonus.param.CuRegionAssessParam;
-import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.constant.TableNameConstants;
-import com.hzs.common.core.enums.EOperationBusiness;
-import com.hzs.common.core.enums.EOperationMethod;
-import com.hzs.common.core.enums.EOperationModule;
-import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.poi.ExcelUtil;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.detail.CuRegionAssessDetail;
 import com.hzs.common.domain.member.detail.ext.CuRegionAssessExt;
-import com.hzs.common.domain.member.ext.CuMemberBonusExt;
 import com.hzs.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
- * <p>
  * 新零售会员区域考核 前端控制器
- * </p>
- *
- * @author hzs
- * @since 2025-01-13
  */
 @RestController
 @RequestMapping("/manage/region")
@@ -58,6 +40,7 @@ public class CuRegionAssessController extends BaseController {
     /**
      * 考核
      * 考核默认考核当月
+     *
      * @return AjaxResult
      */
     @GetMapping("/examine")
@@ -72,7 +55,7 @@ public class CuRegionAssessController extends BaseController {
      * 查询会员昨天奖金的值
      */
     @PostMapping("/query")
-    public TableDataInfo listRegionAssess(@RequestBody CuRegionAssessParam cuRegionAssessParam){
+    public TableDataInfo listRegionAssess(@RequestBody CuRegionAssessParam cuRegionAssessParam) {
         startPage();
         cuRegionAssessParam.setPkCountry(SecurityUtils.getPkCountry());
         List<CuRegionAssessExt> cuRegionAssessExtList = regionAssessService.queryRegionAssessByCondition(cuRegionAssessParam);
@@ -86,7 +69,7 @@ public class CuRegionAssessController extends BaseController {
      * 分页查询会员某个时间段内的奖金汇总
      */
     @PostMapping("/export")
-    public void exportRegionAssess(HttpServletResponse response, CuRegionAssessParam cuRegionAssessParam){
+    public void exportRegionAssess(HttpServletResponse response, CuRegionAssessParam cuRegionAssessParam) {
         List<CuRegionAssessExt> cuRegionAssessExtList = regionAssessService.queryRegionAssessByCondition(cuRegionAssessParam);
         List<CuRegionAssessExcelVO> cuRegionAssessVoList = new ArrayList<>();
         for (CuRegionAssessExt cuRegionAssessExt : cuRegionAssessExtList) {

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusMapper.xml

@@ -272,21 +272,40 @@
     </select>
 
     <select id="queryMemberBonusByCondition" resultMap="CuMemberBonus">
-        select cp.settle_date,cb.direct_income,cb.expand_income,cb.expand_no_capping,
-        cb.expand_capping,cb.coach_income,cb.share_income,cb.service_income,cb.back_points,cb.service_spend,
-        cb.pur_real_subtotal,cb.repur_push_income,cb.repur_range_income,cb.repur_expand_income,cb.repur_real_subtotal,
-        cb.cloud_direct_income,cb.cloud_pur_income,cb.cloud_repur_income,cb.cloud_real_subtotal,
-        cb.repur_coupon,cb.repur_coupon_share,cb.repur_coupon_subtotal,cb.store_income,
-        cb.maker_direct_income,cb.maker_share_income,cb.maker_real_subtotal,
-        cb.global_points,cb.car_award_points,cb.hi_fun_income,cb.hai_fun_income,
-        cb.retail_range_income,cb.retail_same_level_income,cb.retail_area_income,
-        cb.retail_benefit_range_income,cb.retail_benefit_avg_income,
-        cb.retail_benefit_income,cb.retail_real_subtotal,
-        cb.real_income_total from cu_member_bonus cb
+        select cp.settle_date,
+        cb.direct_income,
+        cb.expand_income,
+        cb.expand_no_capping,
+        cb.expand_capping,
+        cb.coach_income,
+        cb.share_income,
+        cb.service_income,
+        cb.back_points,
+        cb.service_spend,
+        cb.pur_real_subtotal,
+        cb.repur_push_income,
+        cb.repur_range_income,
+        cb.repur_expand_income,
+        cb.repur_real_subtotal,
+        cb.repur_coupon,
+        cb.repur_coupon_share,
+        cb.repur_coupon_subtotal,
+        cb.store_income,
+        cb.global_points,
+        cb.car_award_points,
+        cb.retail_range_income,
+        cb.retail_same_level_income,
+        cb.retail_area_income,
+        cb.retail_benefit_range_income,
+        cb.retail_benefit_avg_income,
+        cb.retail_benefit_income,
+        cb.retail_real_subtotal,
+        cb.real_income_total
+        from cu_member_bonus cb
         inner join cu_member_settle_period cp
         on cb.period = cp.pk_id
-        where cb.del_flag=0 and cp.del_flag=0
-        and cb.pk_member=#{pkMember}
+        where cb.del_flag = 0 and cp.del_flag = 0
+        and cb.pk_member = #{pkMember}
         <if test="grantStatus != null">
             and cb.grant_status >= #{grantStatus}
         </if>

bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EExpandCapMethod.java

@@ -4,12 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
- * @description: 封顶方式
- * @author: sui q
- * @time: 2023/7/15 15:08
- * @classname: ExpandCapMethod
- * @package_name: com.hzs.common.core.enums
- * version 1.0.0
+ * 封顶方式
  */
 @AllArgsConstructor
 @Getter

bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/domain/BaseAuthorityEntity.java

@@ -5,11 +5,7 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Description: 基础权限基数
- * @Author: jiang chao
- * @Time: 2023/5/22 15:48
- * @Classname: BaseAuthorityEntity
- * @PackageName: com.hzs.common.core.web.domain
+ * 基础权限基数
  */
 @Data
 public class BaseAuthorityEntity {