## 去掉结算奖衔相关入库操作；去掉部分不需要奖金基础数据查询；

bd-api/bd-api-system/src/main/java/com/hzs/system/config/IGradeServiceApi.java

@@ -68,13 +68,6 @@ public interface IGradeServiceApi {
      */
     R<List<GradeDTO>> selectGradeAll(Integer dataCountry);
 
-    /**
-     * 根据国家查询等级配置列表
-     *
-     * @param pkCountry 国家
-     */
-    R<List<BdGrade>> queryGrowUpFootmarkGrade(Integer pkCountry);
-
     /**
      * 查询全部的等级
      *

bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusConfigDTO.java

@@ -27,64 +27,26 @@ public class BonusConfigDTO implements Serializable {
      */
     private Map<String, BdBonusItemsExt> bonusItemsExtMap;
 
-    /**
-     * 循环配置 key 第一个键国家主键 +等级，第二个键 循环类型 EBonusType
-     */
-    private Map<String, BonusDirectLoopDTO> bonusDirectLoopDtoMap;
-
     /**
      * 直推奖励配置 key 第一个键国家主键 ，第二个键 range_type+pk_level
      */
     private Map<String, BonusDirectDTO> bonusDirectDtoMap;
 
-    /**
-     * 嗨粉直推奖励配置 key 第一个键国家主键 ，第二个键 range_type+pk_level
-     */
-    private Map<Integer, List<BonusHiPinkDTO>> bonusHiPinkDtoMap;
-
     /**
      * 一次性补差 key 国家作为主键，只有一条
      */
     private Map<Integer, BonusDifferenceDTO> bonusDifferenceDtoMap;
 
-    /**
-     * 奖金4-N配置 国家
-     */
-    private Map<Integer, BonusExpandDTO> bonusExpandMap;
-
     /**
      * 复购推荐奖励配置 key第一个键国家主键，第二个键 代数
      */
     private Map<Integer, Map<Integer, BonusRepurchasePushDTO>> bonusRepurchasePushMap;
 
-    /**
-     * 拓展奖配置 国家+等级
-     */
-    private Map<String, BdGrade> gradeMap;
-
     /**
      * 新零售团队等级
      */
     private List<BdGrade> retaiGradeList;
 
-    /**
-     * 主任每个国家值对应的配置 需要主键 memberSettleExt.getPkSettleCountry().toString() + 奖衔值 为了解决服务中心算主任
-     */
-    private Map<String, BdAwards> directorAwardsMap;
-
-    /**
-     * 辅导奖配置 需要主键 memberSettleExt.getPkSettleCountry().toString() + memberSettleExt.getPkAwards()
-     */
-    private Map<String, BdAwards> awardsMap;
-
-    /**
-     * 辅导奖配置 需要主键 memberSettleExt.getPkSettleCountry().toString() + memberSettleExt.getAwardsValue()
-     */
-    private Map<String, BdAwards> awardsValueMap;
-
-    private List<BdAwards> awardsList;
-
-
     /**
      * 奖金扣项 需要主键 奖金主键
      */
@@ -95,9 +57,4 @@ public class BonusConfigDTO implements Serializable {
      */
     private Map<String, BdBonusService> bonusServiceMap;
 
-    /**
-     * 云代奖金 需要主键 国家+收益类型
-     */
-    private Map<String, BdBonusCloud> bonusCloudMap;
-
 }

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

@@ -39,12 +39,12 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
 //     * 报单收益
 //     */
 //    private BigDecimal serviceIncome;
-
+//
-    /**
+//    /**
-     * 商城重消
+//     * 商城重消
-     */
+//     */
-    @BigDecimalFormat
+//    @BigDecimalFormat
-    private BigDecimal backPoints;
+//    private BigDecimal backPoints;
 //
 //    /**
 //     * 首购实发小计
@@ -60,36 +60,35 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
 //     * 复购拓展收益
 //     */
 //    private BigDecimal repurExpandIncome;
-//
+
-//    /**
+    /**
-//     * 复购级差收益
+     * 复购级差收益
-//     */
+     */
-//    private BigDecimal repurRangeIncome;
+    @BigDecimalFormat
-//
+    private BigDecimal repurRangeIncome;
+
 //    /**
 //     * 复购实发小计
 //     */
 //    private BigDecimal repurRealSubtotal;
 
-
-
     /**
      * 新零售直推收益
      */
     @BigDecimalFormat
     private BigDecimal retailRangeIncome;
-
+//
-    /**
+//    /**
-     * 新零售平级收益
+//     * 新零售平级收益
-     */
+//     */
-    @BigDecimalFormat
+//    @BigDecimalFormat
-    private BigDecimal retailSameLevelIncome;
+//    private BigDecimal retailSameLevelIncome;
-
+//
-    /**
+//    /**
-     * 新零售区域分红
+//     * 新零售区域分红
-     */
+//     */
-    @BigDecimalFormat
+//    @BigDecimalFormat
-    private BigDecimal retailAreaIncome;
+//    private BigDecimal retailAreaIncome;
 
     /**
      * 新零售收益小计

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml

@@ -127,7 +127,7 @@
         merge into ${rangeTableName} a
         using (
         <foreach collection="cuMemberRangeExtList" item="item" open=" " close=" " separator="union">
-            select #{item.pkMember} pk_member, #{item.pkAwards} pk_awards, #{item.pkGrade} pk_grade, #{item.pkShareAwards} pk_share_awards,
+            select #{item.pkMember} pk_member, #{item.pkGrade} pk_grade,
             #{item.newBoxNum} new_box_num, #{item.consumeBoxNum} consume_box_num, #{item.monthBoxNum} month_box_num,
             #{item.newConsumePv} new_consume_pv, #{item.consumePv} consume_pv, #{item.monthConsumePv} month_consume_pv,
             #{item.teamNewBoxNum} team_new_box_num, #{item.teamBoxNum} team_box_num, #{item.teamMonthBoxNum} team_month_box_num,
@@ -139,7 +139,7 @@
         ) b
         on (a.pk_member = b.pk_member)
         when matched then
-        update set a.pk_awards = b.pk_awards, a.pk_grade = b.pk_grade, a.pk_share_awards = b.pk_share_awards,
+        update set a.pk_grade = b.pk_grade,
         a.new_box_num = b.new_box_num, a.consume_box_num = b.consume_box_num, a.month_box_num = b.month_box_num,
         a.new_consume_pv = b.new_consume_pv, a.consume_pv = b.consume_pv, a.month_consume_pv = b.month_consume_pv,
         a.team_new_box_num = b.team_new_box_num, a.team_box_num = b.team_box_num, a.team_month_box_num = b.team_month_box_num,

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/MemberFootmarkController.java

@@ -1,150 +0,0 @@
-package com.hzs.member.base.controller.api;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.hzs.common.core.domain.R;
-import com.hzs.common.core.enums.ESystemType;
-import com.hzs.common.core.web.domain.AjaxResult;
-import com.hzs.common.domain.member.base.CuMember;
-import com.hzs.common.domain.system.config.BdAwards;
-import com.hzs.common.domain.system.config.BdGrade;
-import com.hzs.common.security.utils.SecurityUtils;
-import com.hzs.member.base.service.ICuMemberService;
-import com.hzs.member.base.vo.AwardsVo;
-import com.hzs.system.base.ICurrencyServiceApi;
-import com.hzs.system.base.dto.CurrencyDTO;
-import com.hzs.system.config.IAwardsServiceApi;
-import com.hzs.system.config.IGradeServiceApi;
-import com.hzs.system.config.dto.GradeDTO;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@RestController
-@RequestMapping("/api/member-footmark")
-public class MemberFootmarkController {
-
-    @DubboReference
-    IGradeServiceApi gradeServiceApi;
-    @DubboReference
-    IAwardsServiceApi awardsServiceApi;
-    @DubboReference
-    ICurrencyServiceApi currencyServiceApi;
-    @Autowired
-    private ICuMemberService memberService;
-
-    /**
-     * 成长之路 奖衔
-     */
-    @GetMapping("/grow-up-footmark-awards")
-    public AjaxResult growUpFootmarkAwards() {
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        Long userId = SecurityUtils.getUserId();
-        CuMember member = memberService.getMember(userId);
-        Integer pkAwards = member.getPkAwards();
-        R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
-        CurrencyDTO currency = currencyDto.getData();
-        R<BdAwards> awardsOne = awardsServiceApi.getAwardsOne(pkAwards);
-
-        List<BdAwards> awardsList = awardsServiceApi.queryByPkCountryAwards(pkCountry).getData();
-
-        // 奖衔级别
-        Integer awardsValue = awardsOne.getData().getAwardsValue();
-        // 子级名称
-        String childLevelName = "";
-        // 累计业绩
-        BigDecimal achievement = BigDecimal.ZERO;
-        // 用户头像
-        String thisAvatarUrl = "";
-        List<AwardsVo> resultList = new ArrayList<>();
-        for (BdAwards bdAwards : awardsList) {
-            // 下一级别
-            if (bdAwards.getAwardsValue() == (awardsValue - 5)) {
-                childLevelName = bdAwards.getAwardsName();
-            }
-            if (bdAwards.getAwardsValue() > awardsValue) {
-                bdAwards.setColor("#C0C1C1");
-            }
-            if (pkAwards.equals(bdAwards.getPkId())) {
-                achievement = bdAwards.getCommunityCheck();
-                thisAvatarUrl = bdAwards.getImage();
-            }
-
-            AwardsVo awardsVo = BeanUtil.copyProperties(bdAwards, AwardsVo.class);
-            // 小区业绩
-            BigDecimal communityCheck = bdAwards.getCommunityCheck().multiply(currency.getInExchangeRate());
-            if (communityCheck.compareTo(new BigDecimal(10000)) > 0) {
-                awardsVo.setCommunityCheckStr(communityCheck.divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString() + "万");
-            } else {
-                awardsVo.setCommunityCheckStr(communityCheck + "");
-            }
-            resultList.add(awardsVo);
-        }
-
-        Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("childLevelName", childLevelName);
-        // 排序
-        resultMap.put("awardsList", new ArrayList<>(resultList));
-        resultMap.put("thisAwardsName", awardsOne.getData().getAwardsName());
-        resultMap.put("thisPkAwards", awardsOne.getData().getPkId());
-        resultMap.put("achievement", achievement);
-        resultMap.put("thisAvatarUrl", thisAvatarUrl);
-        return AjaxResult.success(resultMap);
-    }
-
-    /**
-     * 成长之路 等级
-     */
-    @GetMapping("/grow-up-footmark-grade")
-    public AjaxResult growUpFootmarkGrade() {
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        Long userId = SecurityUtils.getUserId();
-        CuMember member = memberService.getMember(userId);
-        Integer grade = member.getPkSettleGrade();
-        // 当前等级
-        String thisGradeName = "";
-        // 用户头像
-        String thisAvatarUrl = "";
-        // 色值
-        String color = "";
-        R<CurrencyDTO> currencyDate = currencyServiceApi.getCurrency(pkCountry);
-        CurrencyDTO currency = currencyDate.getData();
-        R<GradeDTO> gradeDto = gradeServiceApi.getGrade(grade);
-        List<BdGrade> gradeList = gradeServiceApi.queryGrowUpFootmarkGrade(pkCountry).getData();
-
-        for (BdGrade g : gradeList) {
-            if (grade.equals(g.getPkId())) {
-                thisGradeName = g.getGradeName();
-                thisAvatarUrl = g.getImage();
-                color = g.getColor();
-            }
-            if (g.getGradeValue() > gradeDto.getData().getGradeValue()) {
-                g.setColor("#C0C1C1");
-            }
-            // 计算人民币业绩
-            g.setStartValue(g.getStartValue().multiply(currency.getInExchangeRate()));
-        }
-
-        Map<String, Object> resultMap = new HashMap<>();
-        // 颜色
-        resultMap.put("color", color);
-        // 等级
-        resultMap.put("gradeList", gradeList.stream());
-        // 当前等级
-        resultMap.put("thisGradeName", thisGradeName);
-        // 编号
-        resultMap.put("memberCode", member.getMemberCode());
-        // 会员名称
-        resultMap.put("memberName", member.getMemberName());
-        // 业绩
-        resultMap.put("achievement", member.getConsumeAchieve());
-        // 头像
-        resultMap.put("thisAvatarUrl", thisAvatarUrl);
-        return AjaxResult.success(resultMap);
-    }
-
-}

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusCloudMapper.java

@@ -1,17 +1,10 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdBonusCloud;
 
 /**
- * <p>
  * 云代配置
- Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-01
  */
 public interface BdBonusCloudMapper extends BaseMapper<BdBonusCloud> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusDirectLoopMapper.java

@@ -1,6 +1,5 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdBonusDirectLoop;
 import com.hzs.common.domain.system.config.ext.BdBonusDirectLoopExt;
@@ -8,20 +7,12 @@ import com.hzs.common.domain.system.config.ext.BdBonusDirectLoopExt;
 import java.util.List;
 
 /**
- * <p>
  * 直推循环配置 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 public interface BdBonusDirectLoopMapper extends BaseMapper<BdBonusDirectLoop> {
 
     /**
      * 查询奖金推荐明细
-     * @return: List<BdBonusDirectLoopExt>
-     * @Author: sui q
-     * @Date: 2023/2/17 17:34
      */
     List<BdBonusDirectLoopExt> queryBonusDirectLoop();
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdBonusHiPinkMapper.java

@@ -1,16 +1,10 @@
 package com.hzs.system.config.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hzs.common.domain.system.config.BdBonusHiPink;
 
 /**
- * <p>
  * 嗨粉直推奖励配置 Mapper 接口
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 public interface BdBonusHiPinkMapper extends BaseMapper<BdBonusHiPink> {
 

bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/BonusItemsServiceProvider.java

@@ -2,14 +2,12 @@ package com.hzs.system.config.provider;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.hzs.common.core.domain.R;
-import com.hzs.common.core.enums.ERangeType;
 import com.hzs.common.core.utils.ComputeUtil;
 import com.hzs.common.domain.bonus.BdBonusDeduct;
 import com.hzs.common.domain.bonus.BdBonusService;
 import com.hzs.common.domain.system.base.BdCountry;
 import com.hzs.common.domain.system.base.BdCurrency;
 import com.hzs.common.domain.system.config.*;
-import com.hzs.common.domain.system.config.ext.BdBonusDirectLoopExt;
 import com.hzs.common.domain.system.config.ext.BdBonusItemsExt;
 import com.hzs.system.base.service.IBdCountryService;
 import com.hzs.system.base.service.IBdCurrencyService;
@@ -32,45 +30,22 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
 
     @Autowired
     private IBdBonusItemsService bonusItemsService;
-
-    @Autowired
-    private IBdBonusDirectLoopService bdBonusDirectLoopService;
-
-    @Autowired
-    private IBdBonusHiPinkService bdBonusHiPinkService;
-
     @Autowired
     private IBdBonusDirectService bdBonusDirectService;
-
     @Autowired
     private IBdBonusDifferenceService bdBonusDifferenceService;
-
-    @Autowired
-    private IBdBonusExpandService bdBonusExpandService;
-
-    @Autowired
-    private IBdGradeService gradeService;
-
-    @Autowired
-    private IBdAwardsService awardsService;
-
     @Autowired
     private IBdBonusDeductService bdBonusDeductService;
-
     @Autowired
     private IBdBonusServiceService bdBonusServiceService;
-
     @Autowired
     private IBdCurrencyService bdCurrencyService;
-
     @Autowired
     private IBdCountryService bdCountryService;
-
     @Autowired
     private IBdRepoDirectPushService bdRepoDirectPushService;
-
     @Autowired
-    private IBdBonusCloudService bdBonusCloudService;
+    private IBdGradeService iBdGradeService;
 
     @Override
     public R<List<BdBonusItemsExt>> queryBonusItems(Integer pkCountry) {
@@ -99,33 +74,18 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
                 countrySet.add(bdCountry.getPkId()));
         bonusConfigDTO.setBonusItemsExtMap(getBdBonusItemsExtMap(countrySet));
         // 根据奖金项验证参数，没有配置参数的，需要提醒
-        // 查询循环配置参数
-        bonusConfigDTO.setBonusDirectLoopDtoMap(getBonusLoopConfig());
         // 查询直推奖励配置
         bonusConfigDTO.setBonusDirectDtoMap(getBonusDirectConfig());
-        // 嗨粉直推奖励配置
-        bonusConfigDTO.setBonusHiPinkDtoMap(getBonusHiPinkMap());
         // 一次性补差
         bonusConfigDTO.setBonusDifferenceDtoMap(getBonusDifferenceConfig());
-        // 奖金4-N配置
-        bonusConfigDTO.setBonusExpandMap(getBonusExpandConfig());
         // 复购直推配置
         bonusConfigDTO.setBonusRepurchasePushMap(getRepurchasePushMap());
-        // 拓展奖跟辅导奖需要查询所有国家的配置
-        // 拓展奖配置
-        bonusConfigDTO.setGradeMap(getBonusExpandGradeConfig());
-        bonusConfigDTO.setRetaiGradeList(getRetailBonusGradeConfig());
-        // 辅导奖配置
-        Map<String, BdAwards> awardsValueMap = new HashMap<>();
-        bonusConfigDTO.setAwardsMap(getBonusCoachConfig(awardsValueMap));
-        bonusConfigDTO.setAwardsValueMap(awardsValueMap);
-        bonusConfigDTO.setAwardsList(awardsService.queryRetailAwards());
         // 奖金扣项
         bonusConfigDTO.setBonusDeductsMap(getBonusDeductConfig());
         // 报单服务费
         bonusConfigDTO.setBonusServiceMap(getBonusServiceConfig());
-        // 云代奖金
+        // 等级数据
-        bonusConfigDTO.setBonusCloudMap(getBonusCloudConfig());
+        bonusConfigDTO.setRetaiGradeList(getRetailBonusGradeConfig());
         return R.ok(bonusConfigDTO);
     }
 
@@ -149,25 +109,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
         return bonusItemsMap;
     }
 
-    /**
-     * 嗨粉直推奖励
-     */
-    private Map<Integer, List<BonusHiPinkDTO>> getBonusHiPinkMap() {
-        List<BdBonusHiPink> bdBonusHiPinks = bdBonusHiPinkService.queryBonusHiPink();
-        Map<Integer, List<BonusHiPinkDTO>> bonusHiPinkMap = new LinkedHashMap<>(ComputeUtil.mapInitCapacity(bdBonusHiPinks.size()));
-        bdBonusHiPinks.forEach(bdBonusHiPink -> {
-            BonusHiPinkDTO bonusHiPinkDTO = BeanUtil.copyProperties(bdBonusHiPink, BonusHiPinkDTO.class);
-            if (bonusHiPinkMap.containsKey(bonusHiPinkDTO.getPkCountry())) {
-                bonusHiPinkMap.get(bonusHiPinkDTO.getPkCountry()).add(bonusHiPinkDTO);
-            } else {
-                List<BonusHiPinkDTO> bonusHiPinkDTOList = new ArrayList<>();
-                bonusHiPinkDTOList.add(bonusHiPinkDTO);
-                bonusHiPinkMap.put(bonusHiPinkDTO.getPkCountry(), bonusHiPinkDTOList);
-            }
-        });
-        return bonusHiPinkMap;
-    }
-
     /**
      * 复购直推奖励
      */
@@ -187,20 +128,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
         return repurchasePushMap;
     }
 
-    /**
-     * 获得奖金循环配置的参数
-     */
-    private Map<String, BonusDirectLoopDTO> getBonusLoopConfig() {
-        List<BdBonusDirectLoopExt> bonusDirectLoopList = bdBonusDirectLoopService.queryBonusDirectLoop();
-        Map<String, BonusDirectLoopDTO> bonusDirectLoopDtoMap = new HashMap<>(4);
-        bonusDirectLoopList.forEach(bdBonusDirectLoop -> {
-            BonusDirectLoopDTO bonusDirectLoopDTO = BeanUtil.copyProperties(bdBonusDirectLoop, BonusDirectLoopDTO.class);
-            bonusDirectLoopDtoMap.put(bonusDirectLoopDTO.getPkCountry().toString() + bonusDirectLoopDTO.getBonusType()
-                    + bonusDirectLoopDTO.getPkGrade(), bonusDirectLoopDTO);
-        });
-        return bonusDirectLoopDtoMap;
-    }
-
     /**
      * 获得奖金 推荐什么等级 直推奖励配置
      */
@@ -227,51 +154,6 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
         return bonusDifferenceDtoMap;
     }
 
-
-    /**
-     * 拓展奖拓展的次数  国家作为键
-     */
-    private Map<Integer, BonusExpandDTO> getBonusExpandConfig() {
-        List<BdBonusExpand> bdBonusExpandList = bdBonusExpandService.queryBdBonusExpand();
-        Map<Integer, BonusExpandDTO> bdBonusExpandMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdBonusExpandList.size()));
-        bdBonusExpandList.forEach(bdBonusExpand -> {
-            BonusExpandDTO bonusExpandDTO = BeanUtil.copyProperties(bdBonusExpand, BonusExpandDTO.class);
-            bdBonusExpandMap.put(bonusExpandDTO.getPkCountry(), bonusExpandDTO);
-        });
-        return bdBonusExpandMap;
-    }
-
-    /**
-     * 获取等级对应的拓展奖对应参数
-     */
-    private Map<String, BdGrade> getBonusExpandGradeConfig() {
-        List<BdGrade> bdGradeList = gradeService.queryBdGrade();
-        Map<String, BdGrade> bdGradeMap = new HashMap<>(ComputeUtil.mapInitCapacity(bdGradeList.size()));
-        bdGradeList.forEach(bdGrade ->
-                bdGradeMap.put(bdGrade.getPkCountry().toString() + "_" + bdGrade.getPkId(), bdGrade));
-        return bdGradeMap;
-    }
-
-    /**
-     * 获取等级对应的拓展奖对应参数
-     */
-    private List<BdGrade> getRetailBonusGradeConfig() {
-        return gradeService.queryRetailGrade();
-    }
-
-    /**
-     * 获取奖衔对应的辅导奖对应参数
-     */
-    private Map<String, BdAwards> getBonusCoachConfig(Map<String, BdAwards> awardsValueMap) {
-        List<BdAwards> bdAwardsList = awardsService.queryAwards();
-        Map<String, BdAwards> bdAwardsMap = new LinkedHashMap<>(ComputeUtil.mapInitCapacity(bdAwardsList.size()));
-        bdAwardsList.forEach(bdAwards -> {
-            bdAwardsMap.put(bdAwards.getPkCountry().toString() + ERangeType.AWARDS.getValue() + bdAwards.getPkId(), bdAwards);
-            awardsValueMap.put(bdAwards.getPkCountry().toString() + ERangeType.AWARDS.getValue() + bdAwards.getAwardsValue(), bdAwards);
-        });
-        return bdAwardsMap;
-    }
-
     /**
      * 获取每个国家奖金项对应的扣项
      */
@@ -295,14 +177,11 @@ public class BonusItemsServiceProvider implements IBonusItemsServiceApi {
     }
 
     /**
-     * 获取每个国家奖金项对应的扣项
+     * 获取等级对应的拓展奖对应参数
      */
-    private Map<String, BdBonusCloud> getBonusCloudConfig() {
+    private List<BdGrade> getRetailBonusGradeConfig() {
-        List<BdBonusCloud> bonusCloudList = bdBonusCloudService.queryBdBonusCloud();
+        return iBdGradeService.queryRetailGrade();
-        Map<String, BdBonusCloud> bdBonusCloudHashMap = new HashMap<>(ComputeUtil.mapInitCapacity(bonusCloudList.size()));
-        bonusCloudList.forEach(bdBonusCloud ->
-                bdBonusCloudHashMap.put(bdBonusCloud.getPkCountry().toString() + bdBonusCloud.getCloudType(), bdBonusCloud));
-        return bdBonusCloudHashMap;
     }
 
+
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/GradeServiceProvider.java

@@ -116,11 +116,6 @@ public class GradeServiceProvider implements IGradeServiceApi {
         return R.ok(gradeDTOList);
     }
 
-    @Override
-    public R<List<BdGrade>> queryGrowUpFootmarkGrade(Integer pkCountry) {
-        return R.ok(iBdGradeService.queryGrowUpFootmarkGrade(pkCountry));
-    }
-
     @Override
     public R<List<GradeDTO>> findAll() {
         List<BdGrade> gradeList = iBdGradeService.list();

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdAwardsService.java

@@ -55,11 +55,6 @@ public interface IBdAwardsService extends IService<BdAwards> {
      */
     List<BdAwards> queryAwards();
 
-    /*
-     *  查询新零售奖衔
-     **/
-    List<BdAwards> queryRetailAwards();
-
     /**
      * 查询等级或奖衔是否被使用
      **/

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusCloudService.java

@@ -1,6 +1,5 @@
 package com.hzs.system.config.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdBonusCloud;
 import com.hzs.common.domain.system.config.ext.BdBonusCloudExt;
@@ -8,38 +7,17 @@ import com.hzs.common.domain.system.config.ext.BdBonusCloudExt;
 import java.util.List;
 
 /**
- * <p>
  * 云代配置
- 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-01
  */
 public interface IBdBonusCloudService extends IService<BdBonusCloud> {
 
-    /*
-     * @description: 查询云代奖金配置
-     * @author: sui q
-     * @date: 2023/7/5 15:17
-     * @param: null null
-     **/
-    List<BdBonusCloud> queryBdBonusCloud();
-
     /**
-     * @description: 新增云代配置
+     * 新增云代配置
-     * @author: zhang jing
-     * @date: 2022/11/1 17:13
-     * @param: [bonusCloudExt]
-     * @return: boolean
      **/
     boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt);
+
     /**
-     * @description: 修改云代配置
+     * 修改云代配置
-     * @author: zhang jing
-     * @date: 2022/11/1 17:13
-     * @param: [bonusCloudExt]
-     * @return: boolean
      **/
     boolean updateBonusCloud(BdBonusCloudExt bonusCloudExt);
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusDirectLoopService.java

@@ -1,39 +1,17 @@
 package com.hzs.system.config.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdBonusDirectLoop;
-import com.hzs.common.domain.system.config.ext.BdBonusDirectLoopExt;
 import com.hzs.system.config.vo.BdBonusDirectVo;
 
-import java.util.List;
-
 /**
- * <p>
  * 直推循环配置 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 public interface IBdBonusDirectLoopService extends IService<BdBonusDirectLoop> {
 
-
-
     /**
      * 新增直推奖励循环配置、直推奖励配置、嗨粉直推配置奖励、一次性补差升级配置
-     * @author: zhang jing
-     * @date: 2022/11/4 10:46
-     * @param: [bonusDirectVo]
-     * @return: boolean
      **/
     boolean saveBonusDirectVo(BdBonusDirectVo bonusDirectVo, Integer pkCountry, String addAttribute);
 
-    /**
-     * 查询奖金推荐明细
-    * @return: List<BdBonusDirectLoopExt>
-    * @Author: sui q
-    * @Date: 2023/2/17 17:34
-    */
-    List<BdBonusDirectLoopExt> queryBonusDirectLoop();
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusExpandService.java

@@ -3,15 +3,9 @@ package com.hzs.system.config.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdBonusExpand;
 
-import java.util.List;
-
 /**
  * 奖金4—N配置
  */
 public interface IBdBonusExpandService extends IService<BdBonusExpand> {
 
-    /**
-     * 查询奖金的4-n配置
-     */
-    List<BdBonusExpand> queryBdBonusExpand();
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdBonusHiPinkService.java

@@ -1,44 +1,12 @@
 package com.hzs.system.config.service;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.common.domain.system.config.BdBonusHiPink;
 
-import java.util.List;
 
 /**
- * <p>
  * 嗨粉直推奖励配置 服务类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 public interface IBdBonusHiPinkService extends IService<BdBonusHiPink> {
 
-    /**
-     * @description: 新增嗨粉直推奖励配置
-     * @author: zhang jing
-     * @date: 2022/11/4 9:25
-     * @param: [bonusHiPinkList]
-     * @return: boolean
-     **/
-    boolean saveBonusHiPink(List<BdBonusHiPink> bonusHiPinkList);
-
-    /**
-     * @description: 修改嗨粉直推奖励配置
-     * @author: zhang jing
-     * @date: 2022/11/4 9:25
-     * @param: [bonusHiPinkList]
-     * @return: boolean
-     **/
-    boolean updateBonusHiPink(List<BdBonusHiPink> bonusHiPinkList);
-
-    /**
-    * 查询会员嗨粉推荐奖金
-    * @return: List<BdBonusHiPink>
-    * @Author: sui q
-    * @Date: 2023/1/4 15:23
-    */
-    List<BdBonusHiPink> queryBonusHiPink();
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdGradeService.java

@@ -58,11 +58,6 @@ public interface IBdGradeService extends IService<BdGrade> {
      **/
     boolean updateExpand(BdGradeExt gradeExt);
 
-    /**
-     * 查询所有国家的等级配置
-     */
-    List<BdGrade> queryBdGrade();
-
     List<BdGrade> queryRetailGrade();
 
     /**
@@ -82,13 +77,6 @@ public interface IBdGradeService extends IService<BdGrade> {
      */
     List<BdGrade> selectGradeAll(Integer pkCountry);
 
-    /**
-     * 根据国家查询等级配置列表
-     *
-     * @param pkCountry 国家
-     */
-    List<BdGrade> queryGrowUpFootmarkGrade(Integer pkCountry);
-
     /**
      * 获取小于等于业绩最合适的等级
      *

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAwardsServiceImpl.java

@@ -114,13 +114,6 @@ public class BdAwardsServiceImpl extends ServiceImpl<BdAwardsMapper, BdAwards> i
         return baseMapper.selectList(queryWrapper);
     }
 
-    @Override
-    public List<BdAwards> queryRetailAwards() {
-        LambdaQueryWrapper<BdAwards> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BdAwards::getSystemType, 2);
-        return baseMapper.selectList(queryWrapper);
-    }
-
     @Override
     public Integer checkGradeAwards(Long pkRegisterGrade, Long pkSettleGrade, Long pkAwards) {
         return baseMapper.checkGradeAwards(pkRegisterGrade, pkSettleGrade, pkAwards);

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusCloudServiceImpl.java

@@ -1,6 +1,5 @@
 package com.hzs.system.config.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.domain.system.config.BdBonusCloud;
@@ -11,35 +10,14 @@ import com.hzs.system.config.service.IBdBonusCloudService;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.List;
 
 /**
- * <p>
  * 云代配置
- 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-01
  */
 @Service
 public class BdBonusCloudServiceImpl extends ServiceImpl<BdBonusCloudMapper, BdBonusCloud> implements IBdBonusCloudService {
 
     @Override
-    public List<BdBonusCloud> queryBdBonusCloud() {
-        QueryWrapper<BdBonusCloud> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("CLOUD_TYPE,CLOUD_RATIO,PK_COUNTRY");
-        return baseMapper.selectList(queryWrapper);
-    }
-
-    /**
-     * @description: 新增云代配置
-     * @author: zhang jing
-     * @date: 2022/11/1 17:11
-     * @param: [bonusCloudExt]
-     * @return: boolean
-     **/
-    @Override
     public boolean saveBonusCloud(BdBonusCloudExt bonusCloudExt) {
         for (BdBonusCloud bonusCloud : bonusCloudExt.getBonusCloudList()) {
             bonusCloud.setPkCountry(SecurityUtils.getPkCountry());

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusDirectLoopServiceImpl.java

@@ -1,7 +1,5 @@
 package com.hzs.system.config.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.enums.EDelFlag;
@@ -9,7 +7,6 @@ import com.hzs.common.core.enums.ERangeType;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.domain.system.config.*;
 import com.hzs.common.domain.system.config.ext.BdBonusDirectLoopExt;
-import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.system.config.mapper.BdBonusDirectLoopMapper;
 import com.hzs.system.config.service.*;
 import com.hzs.system.config.vo.BdBonusDirectVo;
@@ -18,16 +15,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-import java.util.List;
-
 
 /**
- * <p>
  * 直推循环配置 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 @Service
 public class BdBonusDirectLoopServiceImpl extends ServiceImpl<BdBonusDirectLoopMapper, BdBonusDirectLoop> implements IBdBonusDirectLoopService {
@@ -43,14 +33,6 @@ public class BdBonusDirectLoopServiceImpl extends ServiceImpl<BdBonusDirectLoopM
     @Autowired
     private IBdRepoDirectPushService iBdRepoDirectPushService;
 
-
-    /**
-     * @description: 新增直推奖励循环配置、直推奖励配置、嗨粉直推配置奖励、一次性补差升级配置
-     * @author: zhang jing
-     * @date: 2022/11/3 19:17
-     * @param: [bonusDirectLoopExtsList]
-     * @return: boolean
-     **/
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean saveBonusDirectVo(BdBonusDirectVo bonusDirectVo, Integer pkCountry, String addAttribute) {
@@ -155,9 +137,4 @@ public class BdBonusDirectLoopServiceImpl extends ServiceImpl<BdBonusDirectLoopM
         }
         return true;
     }
-
-    @Override
-    public List<BdBonusDirectLoopExt> queryBonusDirectLoop() {
-        return baseMapper.queryBonusDirectLoop();
-    }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusExpandServiceImpl.java

@@ -1,22 +1,14 @@
 package com.hzs.system.config.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.domain.system.config.BdBonusExpand;
 import com.hzs.system.config.mapper.BdBonusExpandMapper;
 import com.hzs.system.config.service.IBdBonusExpandService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 奖金4—N配置
  */
 @Service
 public class BdBonusExpandServiceImpl extends ServiceImpl<BdBonusExpandMapper, BdBonusExpand> implements IBdBonusExpandService {
-
-    @Override
-    public List<BdBonusExpand> queryBdBonusExpand() {
-        return baseMapper.selectList(new QueryWrapper<>());
-    }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdBonusHiPinkServiceImpl.java

@@ -1,60 +1,15 @@
 package com.hzs.system.config.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.domain.system.config.BdBonusHiPink;
 import com.hzs.system.config.mapper.BdBonusHiPinkMapper;
 import com.hzs.system.config.service.IBdBonusHiPinkService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
- * <p>
  * 嗨粉直推奖励配置 服务实现类
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 @Service
 public class BdBonusHiPinkServiceImpl extends ServiceImpl<BdBonusHiPinkMapper, BdBonusHiPink> implements IBdBonusHiPinkService {
 
-    /**
-     * @description: 新增嗨粉直推奖励配置
-     * @author: zhang jing
-     * @date: 2022/11/3 19:54
-     * @param: [bonusHiPinkList]
-     * @return: boolean
-     **/
-    @Override
-    public boolean saveBonusHiPink(List<BdBonusHiPink> bonusHiPinkList) {
-        for(BdBonusHiPink bbhp : bonusHiPinkList){
-            baseMapper.insert(bbhp);
-        }
-        return true;
-    }
-
-    /**
-     * @description: 修改嗨粉直推奖励配置
-     * @author: zhang jing
-     * @date: 2022/11/4 9:25
-     * @param: [bonusHiPinkList]
-     * @return: boolean
-     **/
-    @Override
-    public boolean updateBonusHiPink(List<BdBonusHiPink> bonusHiPinkList) {
-        for(BdBonusHiPink bbhp : bonusHiPinkList){
-            baseMapper.insert(bbhp);
-        }
-        return true;
-    }
-
-    @Override
-    public List<BdBonusHiPink> queryBonusHiPink() {
-        QueryWrapper<BdBonusHiPink> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select(" pk_country,range_type,pk_level,cal_type,bonus_value ")
-                .orderByAsc("pk_country,bonus_value,range_type,pk_level");
-        return baseMapper.selectList(queryWrapper);
-    }
 }

bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdGradeServiceImpl.java

@@ -200,14 +200,6 @@ public class BdGradeServiceImpl extends ServiceImpl<BdGradeMapper, BdGrade> impl
         return true;
     }
 
-    @Override
-    public List<BdGrade> queryBdGrade() {
-        QueryWrapper<BdGrade> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("PK_ID,GRADE_VALUE,FIRST_CALCULATE,FIRST_ASSESS,EXPAND_CAPPING,EXPAND_RATIO,REPURCHASE_CALCULATE,REPURCHASE_ASSESS,REPURCHASE_CAPPING,REPURCHASE_RATIO,PK_COUNTRY");
-        queryWrapper.eq("SYSTEM_TYPE", 0);
-        return baseMapper.selectList(queryWrapper);
-    }
-
     @Override
     public List<BdGrade> queryRetailGrade() {
         QueryWrapper<BdGrade> queryWrapper = new QueryWrapper<>();
@@ -245,16 +237,6 @@ public class BdGradeServiceImpl extends ServiceImpl<BdGradeMapper, BdGrade> impl
         return baseMapper.selectList(queryWrapper);
     }
 
-    @Override
-    public List<BdGrade> queryGrowUpFootmarkGrade(Integer pkCountry) {
-        LambdaQueryWrapper<BdGrade> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BdGrade::getPkCountry, pkCountry);
-        queryWrapper.eq(BdGrade::getEnableState, EnableStatus.ENABLE.getValue());
-        queryWrapper.le(BdGrade::getGradeValue, EGrade.S_VIP.getValue());
-        queryWrapper.orderByAsc(BdGrade::getGradeValue);
-        return baseMapper.selectList(queryWrapper);
-    }
-
     @Override
     public BdGrade getLastGrade(BigDecimal achieve, Integer pkCountry) {
         return baseMapper.getLastGrade(achieve, pkCountry);

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusCloudMapper.xml

@@ -2,28 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdBonusCloudMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdBonusCloud">
-        <id column="PK_ID" property="pkId" />
-    <result column="DEL_FLAG" property="delFlag" />
-    <result column="PK_COUNTRY" property="pkCountry" />
-    <result column="CREATION_TIME" property="creationTime" />
-    <result column="MODIFIED_TIME" property="modifiedTime" />
-    <result column="PK_CREATOR" property="pkCreator" />
-    <result column="PK_MODIFIED" property="pkModified" />
-        <result column="CLOUD_TYPE" property="cloudType" />
-        <result column="CLOUD_RATIO" property="cloudRatio" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_CREATOR,
-        PK_MODIFIED,
-        PK_ID, CLOUD_TYPE, CLOUD_RATIO
-    </sql>
-
 </mapper>

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusDirectLoopMapper.xml

@@ -21,12 +21,20 @@
     </resultMap>
 
     <select id="queryBonusDirectLoop" resultMap="BdBonusDirectLoopExt">
-        select bl.pk_id,bonus_type,first_order,second_order,third_order,fourth_order,bl.pk_country,
+        select bl.pk_id,
-               cal_type,bd.pk_grade from bd_bonus_direct_loop bl
+               bonus_type,
+               first_order,
+               second_order,
+               third_order,
+               fourth_order,
+               bl.pk_country,
+               cal_type,
+               bd.pk_grade
+        from bd_bonus_direct_loop bl
                  inner join BD_LOOP_DETAILS bd
                             on bl.pk_id = bd.pk_bonus_direct
-        where bl.del_flag=0 and bd.del_flag=0
+        where bl.del_flag = 0
+          and bd.del_flag = 0
     </select>
 
-
 </mapper>

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusExpandMapper.xml

@@ -2,28 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdBonusExpandMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdBonusExpand">
-        <id column="PK_ID" property="pkId" />
-    <result column="DEL_FLAG" property="delFlag" />
-    <result column="PK_COUNTRY" property="pkCountry" />
-    <result column="CREATION_TIME" property="creationTime" />
-    <result column="MODIFIED_TIME" property="modifiedTime" />
-    <result column="PK_CREATOR" property="pkCreator" />
-    <result column="PK_MODIFIED" property="pkModified" />
-        <result column="EXPAND_NUMBER" property="expandNumber" />
-        <result column="EXPAND_RATIO" property="expandRatio" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_CREATOR,
-        PK_MODIFIED,
-        PK_ID, EXPAND_NUMBER, EXPAND_RATIO
-    </sql>
 
 </mapper>

bd-business/bd-business-system/src/main/resources/mapper/system/config/BdBonusHiPinkMapper.xml

@@ -2,29 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.system.config.mapper.BdBonusHiPinkMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.system.config.BdBonusHiPink">
-        <id column="PK_ID" property="pkId" />
-    <result column="DEL_FLAG" property="delFlag" />
-    <result column="PK_COUNTRY" property="pkCountry" />
-    <result column="CREATION_TIME" property="creationTime" />
-    <result column="MODIFIED_TIME" property="modifiedTime" />
-    <result column="PK_CREATOR" property="pkCreator" />
-    <result column="PK_MODIFIED" property="pkModified" />
-        <result column="RANGE_TYPE" property="rangeType" />
-        <result column="PK_LEVEL" property="pkLevel" />
-        <result column="BONUS_VALUE" property="bonusValue" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_CREATOR,
-        PK_MODIFIED,
-        PK_ID, RANGE_TYPE, PK_LEVEL, BONUS_VALUE
-    </sql>
-
 </mapper>

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusCloud.java

@@ -14,13 +14,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 
 /**
- * <p>
  * 云代配置
-
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusDirectLoop.java

@@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 
 /**
- * <p>
  * 直推循环配置
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -77,5 +72,4 @@ public class BdBonusDirectLoop extends BaseEntity {
     private Integer takeValueType;
 
 
-
 }

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdBonusHiPink.java

@@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 
 /**
- * <p>
  * 嗨粉直推奖励配置
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdGrade.java

@@ -17,9 +17,6 @@ import java.math.BigDecimal;
 
 /**
  * 等级配置表
- *
- * @author zhangjing
- * @since 2022-09-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/ext/BdBonusDirectLoopExt.java

@@ -2,16 +2,14 @@ package com.hzs.common.domain.system.config.ext;
 
 import com.hzs.common.domain.system.config.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.List;
 
 /**
- * <p>
  * 直推循环配置
- * </p>
- *
- * @author zhangjing
- * @since 2022-11-03
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class BdBonusDirectLoopExt extends BdBonusDirectLoop {