## 去掉奖金查询不需要的方法；

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

@@ -46,9 +46,9 @@ import java.util.stream.Collectors;
 public class CuMemberBonusController extends BaseController {
 
     @Autowired
-    private ICuMemberBonusService cuMemberBonusService;
+    private ICuMemberBonusService iCuMemberBonusService;
     @Autowired
-    private ITransactionCommonService transactionCommonService;
+    private ITransactionCommonService iTransactionCommonService;
 
     @DubboReference
     IUserServiceApi iUserServiceApi;
@@ -73,7 +73,7 @@ public class CuMemberBonusController extends BaseController {
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
         startPage();
-        List<CuMemberBonusExt> cuMemberBonusList = cuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam);
         TableDataInfo dataTable = getDataTable(cuMemberBonusList);
         dataTable.setRows(getBonusTotalVoS(cuMemberBonusList));
         return dataTable;
@@ -94,7 +94,7 @@ public class CuMemberBonusController extends BaseController {
         bonusParam.setPkVertexList(pkVertex);
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
-        List<CuMemberBonusExt> cuMemberBonusList = cuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.queryBonusTotalVoByConditionForServer(bonusParam);
         List<BonusTotalVO> bonusTotalVoList = getBonusTotalVoS(cuMemberBonusList);
         Map<String, Integer> sourceBonusList = iMenuColumnServiceApi.queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData();
         ExcelUtil<BonusTotalVO> util = new ExcelUtil<>(BonusTotalVO.class, sourceBonusList);
@@ -137,8 +137,8 @@ public class CuMemberBonusController extends BaseController {
         packageBonusParam(bonusParam);
 
         startPage();
-        List<CuMemberBonusExt> cuMemberBonusExtList = cuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusExtList = iCuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam);
-        CuMemberBonusExt cmb = cuMemberBonusService.queryMemberBonusByConditionForServerSum(bonusParam);
+        CuMemberBonusExt cmb = iCuMemberBonusService.queryMemberBonusByConditionForServerSum(bonusParam);
         if (cmb != null) {
             cmb.setMemberCode("合计");
             cuMemberBonusExtList.add(cmb);
@@ -164,13 +164,13 @@ public class CuMemberBonusController extends BaseController {
         bonusParam.setPkVertexList(pkVertex);
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
-        List<CuMemberBonusExt> cuMemberBonusExtList = cuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam);
+        List<CuMemberBonusExt> cuMemberBonusExtList = iCuMemberBonusService.queryMemberBonusVoByConditionForServer(bonusParam);
-        CuMemberBonusExt cuMemberBonusExt = cuMemberBonusService.initCuMemberBonus();
+        CuMemberBonusExt cuMemberBonusExt = iCuMemberBonusService.initCuMemberBonus();
         cuMemberBonusExt.setMemberCode("小计：");
         if (CollectionUtil.isNotEmpty(cuMemberBonusExtList)) {
             cuMemberBonusExt.setOutExchangeRate(cuMemberBonusExtList.get(0).getOutExchangeRate());
             for (CuMemberBonusExt memberBonusExt : cuMemberBonusExtList) {
-                cuMemberBonusService.calculateBonusTotal(cuMemberBonusExt, memberBonusExt);
+                iCuMemberBonusService.calculateBonusTotal(cuMemberBonusExt, memberBonusExt);
             }
         }
         cuMemberBonusExtList.add(cuMemberBonusExt);
@@ -206,7 +206,7 @@ public class CuMemberBonusController extends BaseController {
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
         startPage();
-        return cuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
+        return iCuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
     }
 
 
@@ -218,11 +218,11 @@ public class CuMemberBonusController extends BaseController {
     public void exportBonusSource(HttpServletResponse response, BonusParam bonusParam) {
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
-        TableDataInfo tableDataInfo = cuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
+        TableDataInfo tableDataInfo = iCuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
         List<MemberBonusDetailSerVO> memberBonusDetailSerVOList = (List<MemberBonusDetailSerVO>) tableDataInfo.getRows();
 
         // 获取需要翻译的枚举翻译
-        Map<Integer, String> transactionLongMap = transactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
+        Map<Integer, String> transactionLongMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
         for (MemberBonusDetailSerVO memberBonusDetailSerVO : memberBonusDetailSerVOList) {
             memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getEnumLabelByValue(memberBonusDetailSerVO.getOrderType()));
             memberBonusDetailSerVO.setIncomeStatusVal(EBonusIncomeStatus.getEnumLabelByValue(memberBonusDetailSerVO.getIncomeStatus()));

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

@@ -2,7 +2,6 @@ package com.hzs.bonus.bonus.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hzs.bonus.bonus.param.BonusParam;
-import com.hzs.bonus.bonus.vo.MemberBonusVO;
 import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.bonus.CuMemberBonus;
 import com.hzs.common.domain.member.ext.CuMemberBonusExt;
@@ -24,13 +23,6 @@ public interface ICuMemberBonusService extends IService<CuMemberBonus> {
      */
     List<Long> batchQueryCuMemberBonusSeq(Integer rowNum);
 
-    /**
-     * 根据查询条件查询每日奖金汇总
-     *
-     * @param bonusParam 查询条件
-     */
-    List<MemberBonusVO> queryMemberBonusTotalVoByCondition(BonusParam bonusParam);
-
     /**
      * 根据查询条件查询会员奖金
      *
@@ -111,14 +103,6 @@ public interface ICuMemberBonusService extends IService<CuMemberBonus> {
      */
     List<CuMemberBonus> queryCuMemberBonus(int period, List<CuMemberBonus> cuMemberBonusList);
 
-    /**
-     * 根据国家、期间查询存在首购奖金的会员
-     *
-     * @param period        期间
-     * @param pkCountryList 国家
-     */
-    List<CuMemberBonus> queryExistsPurchaseBonusMember(Integer period, List<Integer> pkCountryList);
-
     /**
      * 更新奖金状态
      *

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

@@ -15,7 +15,6 @@ import com.hzs.bonus.bonus.service.IBonusSettleService;
 import com.hzs.bonus.bonus.service.ICuMemberBonusService;
 import com.hzs.bonus.bonus.vo.MemberBonusDetailSerVO;
 import com.hzs.bonus.bonus.vo.MemberBonusDetailVO;
-import com.hzs.bonus.bonus.vo.MemberBonusVO;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
@@ -120,18 +119,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         return baseMapper.batchQueryCuMemberBonusSeq(rowNum);
     }
 
-    @Override
-    public List<MemberBonusVO> queryMemberBonusTotalVoByCondition(BonusParam bonusParam) {
-        List<MemberBonusVO> memberBonusVoList = new ArrayList<>();
-        List<CuMemberBonus> cuMemberBonusList = baseMapper.queryMemberBonusTotalByCondition(bonusParam);
-        cuMemberBonusList.forEach(cuMemberBonus -> {
-            MemberBonusVO memberBonusVO = BeanUtil.copyProperties(cuMemberBonus, MemberBonusVO.class);
-            memberBonusVoList.add(memberBonusVO);
-        });
-        return memberBonusVoList;
-    }
-
-
     @Override
     public List<CuMemberBonusExt> queryMemberBonusVoByCondition(BonusParam bonusParam) {
 //        String value = iSystemConfigServiceApi.getBonusSystemConfig(bonusParam.getPkCountry(), ESystemConfig.EXPAND_CAP_METHOD.getKey()).getData();
@@ -564,16 +551,6 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         return baseMapper.selectList(queryWrapper);
     }
 
-    @Override
-    public List<CuMemberBonus> queryExistsPurchaseBonusMember(Integer period, List<Integer> pkCountryList) {
-        QueryWrapper<CuMemberBonus> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("pk_member,pk_country,direct_income,expand_income,coach_income,share_income,pur_real_subtotal");
-        queryWrapper.eq(MemberFieldConstants.PERIOD, period);
-        queryWrapper.in(SystemFieldConstants.PK_COUNTRY, pkCountryList);
-        queryWrapper.gt("PUR_REAL_SUBTOTAL", 0);
-        return baseMapper.selectList(queryWrapper);
-    }
-
     @Override
     public Boolean updateCuMemberBonusStatus(Integer pkCountry, Integer grantStatus, Integer oldGrantStatus, Integer startPeriod, Integer endPeriod) {
         return baseMapper.updateCuMemberBonusStatus(pkCountry, grantStatus, oldGrantStatus, startPeriod, endPeriod) > 0 ? Boolean.TRUE : Boolean.FALSE;