## 顶点奖金拨比列表统计处理；

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisController.java

@@ -1,16 +1,13 @@
 package com.hzs.member.statis.controller.manager;
 
-import cn.hutool.core.bean.BeanUtil;
  import cn.hutool.core.collection.CollectionUtil;
 import com.hzs.common.core.annotation.AccessPermissions;
 import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.constant.CountryConstants;
 import com.hzs.common.core.constant.msg.FinanceMsgConstants;
 import com.hzs.common.core.domain.R;
 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.enums.EOrderType;
 import com.hzs.common.core.utils.DateUtils;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.poi.ExcelUtil;
@@ -33,9 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,629 +60,106 @@ public class CuBonusVertexStatisController extends BaseController {
     }
 
     /**
-     * 奖金拨比列表
+     * 顶点奖金拨比列表统计
      **/
     @AccessPermissions("TopPerformance")
     @GetMapping("/list")
     @Log(module = EOperationModule.BONUS_DIAL_RATIO, business = EOperationBusiness.BONUS_DIAL_VERTEX_RATIO_LIST, method = EOperationMethod.SELECT)
     public TableDataInfo list(CuBonusVertexStatisVO cuBonusVertexStatisVO) {
         Integer pkCountry = SecurityUtils.getPkCountry();
-        List<CuBonusVertexStatisVO> slList;
         R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(pkCountry);
-        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
-        R<CurrencyDTO> chCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
-        BigDecimal chRate = chCurrency.getData().getInExchangeRate() == null ? BigDecimal.ONE : chCurrency.getData().getInExchangeRate();
-        cuBonusVertexStatisVO.setRate(exchangeRate);
         BigDecimal cent = new BigDecimal(100);
+        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
+        cuBonusVertexStatisVO.setRate(exchangeRate);
         cuBonusVertexStatisVO.setPerCent(exchangeRate.multiply(cent));
         cuBonusVertexStatisVO.setPkCountry(pkCountry);
+
         //默认查询当前日期的前一天
         Date date = DateUtils.currentDate();
-        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate()) ||
+        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate())
-                StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
+                || StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
             cuBonusVertexStatisVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
             cuBonusVertexStatisVO.setEndDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
         }
 
-        //查询奖金扣项配置参数 0.8
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            List<CuBonusVertexStatisVO> bonus = iCuBonusVertexStatisService.bonusDeductlist(cuBonusVertexStatisVO);
-            if (CollectionUtil.isNotEmpty(bonus)) {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE.subtract(bonus.get(0).getBackRatio()));
-            } else {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-            }
-        } else {
-            cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-        }
-
-        List<Integer> orderTypeList = new ArrayList<>();
-        orderTypeList.add(EOrderType.REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.UPGRADE_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_UPGRADE_ORDER.getValue());
-        cuBonusVertexStatisVO.setOrderTypeList(orderTypeList);
-        //查询分红比例配置
-        cuBonusVertexStatisVO.setDividendRatio(BigDecimal.ZERO);
-        //查询顶点会员
-        List<CuBonusVertexStatisVO> vertexList = iCuBonusVertexStatisService.vertexList(cuBonusVertexStatisVO.getPkVertex());
-        CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStatisVO, CuBonusVertexStatisVO.class);
-        for (CuBonusVertexStatisVO ve : vertexList) {
-            cvs.setPkVertex(ve.getPkVertex());
-        }
         startPage();
         //查询中国奖金拨比列表
-        slList = iCuBonusVertexStatisService.queryCuBonusStatis(cuBonusVertexStatisVO);
+        List<CuBonusVertexStatisVO> slList = iCuBonusVertexStatisService.queryCuBonusStatis(cuBonusVertexStatisVO);
         if (CollectionUtil.isNotEmpty(slList)) {
-
+            slList.forEach(item -> {
-            slList.forEach(itm -> {
+                item.setMainRegAmount(item.getMainRegAmount().add(item.getSpecialRegisterAmount()));
-                if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
+                item.setMainUpAmount(item.getMainUpAmount().add(item.getSpecialUpgradeAmount()));
-                    //重新算首购拨比
+                item.setMainRepurAmount(item.getMainRepurAmount().add(item.getSpecialRepurchaseAmount()));
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
-                        BigDecimal mainBonusRate = cent.multiply((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
-                        mainBonusRate = mainBonusRate.divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP);
-                        itm.setMainBonusRate(mainBonusRate);
-                        itm.setMainBonusPvRate(itm.getMainBonusPvRate().divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP));
-                    }
-                    //重新算总拨比
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0 ||
-                            itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        BigDecimal totalBonusRate = cent.multiply((itm.getTotalBonus()).multiply(currency.getData().getInExchangeRate()));
-                        totalBonusRate = totalBonusRate.divide(itm.getFirstPurchaseAll().add(itm.getRepurchaseAllAmount()), 4, RoundingMode.HALF_UP);
-                        itm.setTotalBonusRate(totalBonusRate);
-                    }
-                    //首购拨出金额
-                    itm.setMainBonus((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
-                    itm.setTotalBonus((itm.getTotalBonus()).multiply(currency.getData().getInExchangeRate()));
-                    //奖金
-                    if (itm.getIntroduceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setIntroduceBonus(itm.getIntroduceBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setOrgBonus(itm.getOrgBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getLeaderBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setLeaderBonus(itm.getLeaderBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-
-                    if (itm.getServiceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setServiceBonus(itm.getServiceBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getHiFunIncome().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setHiFunIncome(itm.getHiFunIncome().multiply(currency.getData().getInExchangeRate()));
-                    }
-
-                    if (itm.getRepurRangeBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurRangeBonus(itm.getRepurRangeBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getRepurOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurOrgBonus(itm.getRepurOrgBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    itm.setRepurBonus(itm.getRepurBonus().multiply(currency.getData().getInExchangeRate()));
-                }
-                //国外转为人民币
-                if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-                    //订单金额
-                    if (itm.getMainRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainRegAmount(itm.getMainRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getMainUpAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainUpAmount(itm.getMainUpAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getAgentRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setAgentRegAmount(itm.getAgentRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getAgentUpAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setAgentUpAmount(itm.getAgentUpAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setFirstPurchaseAll(itm.getFirstPurchaseAll().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getMainRepurAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainRepurAmount(itm.getMainRepurAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getHifansRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setHifansRegAmount(itm.getHifansRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurchaseAllAmount(itm.getRepurchaseAllAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    //奖金
-                    if (itm.getIntroduceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setIntroduceBonus(itm.getIntroduceBonus().multiply(chRate));
-                    }
-                    if (itm.getOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setOrgBonus(itm.getOrgBonus().multiply(chRate));
-                    }
-                    if (itm.getLeaderBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setLeaderBonus(itm.getLeaderBonus().multiply(chRate));
-                    }
-                    if (itm.getShareBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setShareBonus(itm.getShareBonus().multiply(chRate));
-                    }
-                    if (itm.getServiceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setServiceBonus(itm.getServiceBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurRangeBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurRangeBonus(itm.getRepurRangeBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurOrgBonus(itm.getRepurOrgBonus().multiply(chRate));
-                    }
-                    if (itm.getMainBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainBonus(itm.getMainBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurBonus(itm.getRepurBonus().multiply(chRate));
-                    }
-                    if (itm.getTotalBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setTotalBonus(itm.getTotalBonus().multiply(chRate));
-                    }
-                }
             });
         }
         return getDataTable(slList);
     }
 
     /**
-     * 导出奖金拨比列表
+     * 顶点奖金拨比列表统计导出
      **/
     @Log(module = EOperationModule.BONUS_DIAL_RATIO, business = EOperationBusiness.BONUS_DIAL_RATIO_LIST, method = EOperationMethod.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CuBonusVertexStatisVO cuBonusVertexStatisVO) {
         Integer pkCountry = SecurityUtils.getPkCountry();
-        List<CuBonusVertexStatisVO> slList = null;
-        CuBonusVertexStatisVO subtotal = null;
         R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(pkCountry);
-        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
-        R<CurrencyDTO> chCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
-        BigDecimal chRate = chCurrency.getData().getInExchangeRate() == null ? BigDecimal.ONE : chCurrency.getData().getInExchangeRate();
-        cuBonusVertexStatisVO.setRate(exchangeRate);
         BigDecimal cent = new BigDecimal(100);
+        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
+        cuBonusVertexStatisVO.setRate(exchangeRate);
         cuBonusVertexStatisVO.setPerCent(exchangeRate.multiply(cent));
         cuBonusVertexStatisVO.setPkCountry(pkCountry);
+
         // 默认查询当前日期的前一天
         Date date = DateUtils.currentDate();
-        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate()) ||
+        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate())
-                StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
+                || StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
             cuBonusVertexStatisVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
             cuBonusVertexStatisVO.setEndDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
         }
 
-        //查询奖金扣项配置参数 0.8
+        List<CuBonusVertexStatisVO> slList = iCuBonusVertexStatisService.queryCuBonusStatis(cuBonusVertexStatisVO);
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            List<CuBonusVertexStatisVO> bonus = iCuBonusVertexStatisService.bonusDeductlist(cuBonusVertexStatisVO);
-            if (CollectionUtil.isNotEmpty(bonus)) {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE.subtract(bonus.get(0).getBackRatio()));
-            } else {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-            }
-        } else {
-            cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-        }
-//        //查询天数
-//        Integer days = DateUtils.betweenDay(DateUtils.parseDate(cuBonusVertexStatisVO.getStartDate()), DateUtils.parseDate(cuBonusVertexStatisVO.getEndDate()));
-//        if (days == 0) {
-//            days = 1;
-//        }
-        List<Integer> orderTypeList = new ArrayList<>();
-        orderTypeList.add(EOrderType.REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.UPGRADE_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_UPGRADE_ORDER.getValue());
-        cuBonusVertexStatisVO.setOrderTypeList(orderTypeList);
-        //查询分红比例配置
-        cuBonusVertexStatisVO.setDividendRatio(BigDecimal.ZERO);
-        //查询顶点会员
-        List<CuBonusVertexStatisVO> vertexList = iCuBonusVertexStatisService.vertexList(cuBonusVertexStatisVO.getPkVertex());
-        for (CuBonusVertexStatisVO ve : vertexList) {
-            CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStatisVO, CuBonusVertexStatisVO.class);
-            cvs.setPkVertex(ve.getPkVertex());
-        }
-
-        startPage();
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            slList = iCuBonusVertexStatisService.queryCuBonusStatis(cuBonusVertexStatisVO);
-            //合计
-            subtotal = iCuBonusVertexStatisService.queryCuBonusSumStatis(cuBonusVertexStatisVO);
-            subtotal.setShareBonusSum(cuBonusVertexStatisVO.getOrderAchieve());
-        }
         if (CollectionUtil.isNotEmpty(slList)) {
-            slList.forEach(itm -> {
+            slList.forEach(item -> {
-                if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
+                item.setMainRegAmount(item.getMainRegAmount().add(item.getSpecialRegisterAmount()));
-                    if (itm.getIntroduceBonus().compareTo(BigDecimal.ZERO) > 0) {
+                item.setMainUpAmount(item.getMainUpAmount().add(item.getSpecialUpgradeAmount()));
-                        itm.setIntroduceBonus(itm.getIntroduceBonus().multiply(currency.getData().getInExchangeRate()));
+                item.setMainRepurAmount(item.getMainRepurAmount().add(item.getSpecialRepurchaseAmount()));
-                    }
-                    if (itm.getOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setOrgBonus(itm.getOrgBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getLeaderBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setLeaderBonus(itm.getLeaderBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    String creationTime = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, itm.getCreationTime());
-                    //重新算首购拨比
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
-                        BigDecimal mainBonusRate = cent.multiply((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
-                        mainBonusRate = mainBonusRate.divide(itm.getFirstPurchaseAll(), 4, RoundingMode.HALF_UP);
-                        itm.setMainBonusRate(mainBonusRate);
-                    }
-                    //重新算总拨比
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0 ||
-                            itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        BigDecimal totalBonusRate = cent.multiply((itm.getTotalBonus()).multiply(currency.getData().getInExchangeRate()));
-                        totalBonusRate = totalBonusRate.divide(itm.getFirstPurchaseAll().add(itm.getRepurchaseAllAmount()), 4, RoundingMode.HALF_UP);
-                        itm.setTotalBonusRate(totalBonusRate);
-                    }
-                    //首购拨出金额
-                    itm.setMainBonus((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
-                    itm.setTotalBonus((itm.getTotalBonus()).multiply(currency.getData().getInExchangeRate()));
-
-                    if (itm.getServiceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setServiceBonus(itm.getServiceBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getHiFunIncome().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setHiFunIncome(itm.getHiFunIncome().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getRepurRangeBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurRangeBonus(itm.getRepurRangeBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getRepurOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurOrgBonus(itm.getRepurOrgBonus().multiply(currency.getData().getInExchangeRate()));
-                    }
-                    if (itm.getRepurBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurBonus(itm.getRepurBonus().multiply(chRate));
-                    }
-
-                }
-                //国外转为人民币
-                if (pkCountry != CountryConstants.CHINA_COUNTRY) {
-                    //订单金额
-                    if (itm.getMainRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainRegAmount(itm.getMainRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getMainUpAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainUpAmount(itm.getMainUpAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getAgentRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setAgentRegAmount(itm.getAgentRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getAgentUpAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setAgentUpAmount(itm.getAgentUpAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setFirstPurchaseAll(itm.getFirstPurchaseAll().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getMainRepurAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainRepurAmount(itm.getMainRepurAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getHifansRegAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setHifansRegAmount(itm.getHifansRegAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    if (itm.getRepurchaseAllAmount().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurchaseAllAmount(itm.getRepurchaseAllAmount().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                    }
-                    //奖金
-                    if (itm.getIntroduceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setIntroduceBonus(itm.getIntroduceBonus().multiply(chRate));
-                    }
-                    if (itm.getOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setOrgBonus(itm.getOrgBonus().multiply(chRate));
-                    }
-                    if (itm.getLeaderBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setLeaderBonus(itm.getLeaderBonus().multiply(chRate));
-                    }
-                    if (itm.getShareBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setShareBonus(itm.getShareBonus().multiply(chRate));
-                    }
-                    if (itm.getServiceBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setServiceBonus(itm.getServiceBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurRangeBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurRangeBonus(itm.getRepurRangeBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurOrgBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurOrgBonus(itm.getRepurOrgBonus().multiply(chRate));
-                    }
-                    if (itm.getMainBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setMainBonus(itm.getMainBonus().multiply(chRate));
-                    }
-                    if (itm.getRepurBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setRepurBonus(itm.getRepurBonus().multiply(chRate));
-                    }
-                    if (itm.getTotalBonus().compareTo(BigDecimal.ZERO) > 0) {
-                        itm.setTotalBonus(itm.getTotalBonus().multiply(chRate));
-                    }
-                }
             });
         }
 
         // 合计
-        if (subtotal == null) {
+        CuBonusVertexStatisVO subtotal = iCuBonusVertexStatisService.queryCuBonusSumStatis(cuBonusVertexStatisVO);
-            subtotal = new CuBonusVertexStatisVO();
-        }
         subtotal.setMemberCode("合计");
-        if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-                if (subtotal.getIntroduceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setIntroduceBonus(subtotal.getIntroduceBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                if (subtotal.getOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setOrgBonus(subtotal.getOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                if (subtotal.getLeaderBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setLeaderBonus(subtotal.getLeaderBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                if (subtotal.getShareBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setShareBonus(subtotal.getShareBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                if (subtotal.getServiceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setServiceBonus(subtotal.getServiceBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-
-                if (subtotal.getRepurRangeBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurRangeBonus(subtotal.getRepurRangeBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                if (subtotal.getRepurOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurOrgBonus(subtotal.getRepurOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-                }
-                subtotal.setMainBonusSum(subtotal.getMainBonusSum().multiply(currency.getData().getInExchangeRate()));
-                subtotal.setRepurBonus(subtotal.getRepurBonusSum().multiply(currency.getData().getInExchangeRate()));
-                subtotal.setTotalBonus((subtotal.getTotalBonusSum().add(subtotal.getShareBonusSum())).multiply(currency.getData().getInExchangeRate()));
-            }
-            //国外转为人民币
-            if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-                //订单金额
-                if (subtotal.getMainRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setMainRegAmountSum(subtotal.getMainRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getMainUpAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setMainUpAmountSum(subtotal.getMainUpAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getAgentRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setAgentRegAmountSum(subtotal.getAgentRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getAgentUpAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setAgentUpAmountSum(subtotal.getAgentUpAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getFirstPurchaseAllSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setFirstPurchaseAllSum(subtotal.getFirstPurchaseAllSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getMainRepurAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setMainRepurAmountSum(subtotal.getMainRepurAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getHifansRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setHifansRegAmountSum(subtotal.getHifansRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                if (subtotal.getRepurchaseAllAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurchaseAllAmountSum(subtotal.getRepurchaseAllAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-                }
-                //奖金
-                if (subtotal.getIntroduceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setIntroduceBonusSum(subtotal.getIntroduceBonusSum().multiply(chRate));
-                }
-                if (subtotal.getOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setOrgBonusSum(subtotal.getOrgBonusSum().multiply(chRate));
-                }
-                if (subtotal.getLeaderBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setLeaderBonusSum(subtotal.getLeaderBonusSum().multiply(chRate));
-                }
-                if (subtotal.getShareBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setShareBonusSum(subtotal.getShareBonusSum().multiply(chRate));
-                }
-                if (subtotal.getServiceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setServiceBonusSum(subtotal.getServiceBonusSum().multiply(chRate));
-                }
-                if (subtotal.getRepurRangeBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurRangeBonusSum(subtotal.getRepurRangeBonusSum().multiply(chRate));
-                }
-                if (subtotal.getRepurOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurOrgBonusSum(subtotal.getRepurOrgBonusSum().multiply(chRate));
-                }
-                if (subtotal.getMainBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setMainBonusSum(subtotal.getMainBonusSum().multiply(chRate));
-                }
-                if (subtotal.getRepurBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setRepurBonusSum(subtotal.getRepurBonusSum().multiply(chRate));
-                }
-                if (subtotal.getTotalBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                    subtotal.setTotalBonusSum((subtotal.getTotalBonusSum().add(subtotal.getShareBonusSum())).multiply(chRate));
-                }
-            }
-            subtotal.setIntroduceBonus(subtotal.getIntroduceBonusSum());
-            subtotal.setOrgBonus(subtotal.getOrgBonusSum());
-            subtotal.setLeaderBonus(subtotal.getLeaderBonusSum());
-            subtotal.setShareBonus(subtotal.getShareBonusSum());
-            subtotal.setServiceBonus(subtotal.getServiceBonusSum());
-            subtotal.setRepurRangeBonus(subtotal.getRepurRangeBonusSum());
-            subtotal.setRepurOrgBonus(subtotal.getRepurOrgBonusSum());
-            subtotal.setMainBonus(subtotal.getMainBonusSum());
-            subtotal.setMainBonusRate(subtotal.getMainBonusRateSum());
-            subtotal.setRepurBonus(subtotal.getRepurBonusSum());
-            subtotal.setRepurBonusRate(subtotal.getRepurBonusRateSum());
-            subtotal.setTotalBonus(subtotal.getTotalBonusSum());
-            subtotal.setMainRegAmount(subtotal.getMainRegAmountSum());
-            subtotal.setMainUpAmount(subtotal.getMainUpAmountSum());
-            subtotal.setAgentRegAmount(subtotal.getAgentRegAmountSum());
-            subtotal.setAgentUpAmount(subtotal.getAgentUpAmountSum());
-            subtotal.setFirstPurchaseAll(subtotal.getFirstPurchaseAllSum());
-            subtotal.setMainRepurAmount(subtotal.getMainRepurAmountSum());
-            subtotal.setHifansRegAmount(subtotal.getHifansRegAmountSum());
-            subtotal.setRepurchaseAllAmount(subtotal.getRepurchaseAllAmountSum());
-            subtotal.setTotalBonusRate(subtotal.getTotalBonusRateSum());
-            subtotal.setMainBonusPvRate(subtotal.getMainBonusPvRateSum());
-            subtotal.setRepurBonusPvRate(subtotal.getRepurBonusPvRateSum());
-        } else {
-            subtotal.setMainBonusRate(subtotal.getMainBonusRateSum());
-            subtotal.setRepurBonusRate(subtotal.getRepurBonusRateSum());
-            subtotal.setIntroduceBonus(subtotal.getIntroduceBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setOrgBonus(subtotal.getOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setLeaderBonus(subtotal.getLeaderBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setShareBonus(subtotal.getShareBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setServiceBonus(subtotal.getServiceBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setRepurRangeBonus(subtotal.getRepurRangeBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setRepurOrgBonus(subtotal.getRepurOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setMainBonus(subtotal.getMainBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setRepurBonus(subtotal.getRepurBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setTotalBonus((subtotal.getTotalBonusSum()).multiply(currency.getData().getInExchangeRate()));
-            subtotal.setMainRegAmount(subtotal.getMainRegAmountSum());
-            subtotal.setMainUpAmount(subtotal.getMainUpAmountSum());
-            subtotal.setAgentRegAmount(subtotal.getAgentRegAmountSum());
-            subtotal.setAgentUpAmount(subtotal.getAgentUpAmountSum());
-            subtotal.setFirstPurchaseAll(subtotal.getFirstPurchaseAllSum());
-            subtotal.setMainRepurAmount(subtotal.getMainRepurAmountSum());
-            subtotal.setHifansRegAmount(subtotal.getHifansRegAmountSum());
-            subtotal.setRepurchaseAllAmount(subtotal.getRepurchaseAllAmountSum());
-            subtotal.setTotalBonusRate(subtotal.getTotalBonusRateSum());
-            subtotal.setMainBonusPvRate(subtotal.getMainBonusPvRateSum());
-            subtotal.setRepurBonusPvRate(subtotal.getRepurBonusPvRateSum());
-        }
         slList.add(subtotal);
+
         ExcelUtil<CuBonusVertexStatisVO> util = new ExcelUtil<>(CuBonusVertexStatisVO.class);
         util.exportExcel(response, slList, "拨比列表");
     }
 
     /**
-     * 奖金拨比列表合计
+     * 顶点奖金拨比列表统计合计
      **/
     @AccessPermissions("TopPerformance")
     @GetMapping("/subtotal")
     @Log(module = EOperationModule.BONUS_DIAL_RATIO, business = EOperationBusiness.BONUS_DIAL_RATIO_LIST, method = EOperationMethod.SELECT)
     public AjaxResult subtotal(CuBonusVertexStatisVO cuBonusVertexStatisVO) {
         Integer pkCountry = SecurityUtils.getPkCountry();
-        CuBonusVertexStatisVO subtotal;
         R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(pkCountry);
-        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
-        R<CurrencyDTO> chCurrency = iCurrencyServiceApi.getCurrency(CountryConstants.CHINA_COUNTRY);
-        BigDecimal chRate = chCurrency.getData().getInExchangeRate() == null ? BigDecimal.ONE : chCurrency.getData().getInExchangeRate();
-        cuBonusVertexStatisVO.setRate(exchangeRate);
         BigDecimal cent = new BigDecimal(100);
+        BigDecimal exchangeRate = currency.getData().getInExchangeRate() == null ? BigDecimal.ONE : currency.getData().getInExchangeRate();
+        cuBonusVertexStatisVO.setRate(exchangeRate);
         cuBonusVertexStatisVO.setPerCent(exchangeRate.multiply(cent));
         cuBonusVertexStatisVO.setPkCountry(pkCountry);
-        Date date = DateUtils.currentDate();
+
         // 默认查询当前日期的前一天
-        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate()) ||
+        Date date = DateUtils.currentDate();
-                StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
+        if (StringUtils.isEmpty(cuBonusVertexStatisVO.getStartDate())
+                || StringUtils.isEmpty(cuBonusVertexStatisVO.getEndDate())) {
             cuBonusVertexStatisVO.setStartDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
             cuBonusVertexStatisVO.setEndDate(DateUtils.beforeDateStr(1, ChronoUnit.DAYS, DateUtils.YYYY_MM_DD, date));
         }
 
-        //查询奖金扣项配置参数 0.8
-        if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            List<CuBonusVertexStatisVO> bonus = iCuBonusVertexStatisService.bonusDeductlist(cuBonusVertexStatisVO);
-            if (CollectionUtil.isNotEmpty(bonus)) {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE.subtract(bonus.get(0).getBackRatio()));
-            } else {
-                cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-            }
-        } else {
-            cuBonusVertexStatisVO.setBackRatio(BigDecimal.ONE);
-        }
-        //查询所有顶点会员
-        List<CuBonusVertexStatisVO> vertexList = iCuBonusVertexStatisService.vertexList(cuBonusVertexStatisVO.getPkVertex());
-        //查询体系订单分红业绩
-        List<Integer> orderTypeList = new ArrayList<>();
-        orderTypeList.add(EOrderType.REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.UPGRADE_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_REGISTER_ORDER.getValue());
-        orderTypeList.add(EOrderType.SPECIAL_UPGRADE_ORDER.getValue());
-        cuBonusVertexStatisVO.setOrderTypeList(orderTypeList);
-        if (CollectionUtil.isNotEmpty(vertexList)) {
-            for (CuBonusVertexStatisVO ve : vertexList) {
-                CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStatisVO, CuBonusVertexStatisVO.class);
-                cvs.setPkVertex(ve.getPkVertex());
-            }
-        }
-
-        cuBonusVertexStatisVO.setDividendRatio(BigDecimal.ZERO);
-        startPage();
         //查询合计
-        subtotal = iCuBonusVertexStatisService.queryCuBonusSumStatis(cuBonusVertexStatisVO);
+        CuBonusVertexStatisVO subtotal = iCuBonusVertexStatisService.queryCuBonusSumStatis(cuBonusVertexStatisVO);
-        if (subtotal != null && pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            if (subtotal.getIntroduceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setIntroduceBonusSum(subtotal.getIntroduceBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-            if (subtotal.getOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setOrgBonusSum(subtotal.getOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-            if (subtotal.getLeaderBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setLeaderBonusSum(subtotal.getLeaderBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-            if (cuBonusVertexStatisVO.getOrderAchieve().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setShareBonusSum(cuBonusVertexStatisVO.getOrderAchieve().multiply(currency.getData().getInExchangeRate()));
-            }
-            if (subtotal.getServiceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setServiceBonusSum(subtotal.getServiceBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-
-            if (subtotal.getRepurRangeBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurRangeBonusSum(subtotal.getRepurRangeBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-            if (subtotal.getRepurOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurOrgBonusSum(subtotal.getRepurOrgBonusSum().multiply(currency.getData().getInExchangeRate()));
-            }
-            subtotal.setMainBonusSum(subtotal.getMainBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setRepurBonusSum(subtotal.getRepurBonusSum().multiply(currency.getData().getInExchangeRate()));
-            subtotal.setTotalBonusSum(subtotal.getTotalBonusSum().multiply(currency.getData().getInExchangeRate()));
-        }
-        //国外转为人民币
-        if (subtotal != null && !pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
-            //订单金额
-            if (subtotal.getMainRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setMainRegAmountSum(subtotal.getMainRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getMainUpAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setMainUpAmountSum(subtotal.getMainUpAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getAgentRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setAgentRegAmountSum(subtotal.getAgentRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getAgentUpAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setAgentUpAmountSum(subtotal.getAgentUpAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getFirstPurchaseAllSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setFirstPurchaseAllSum(subtotal.getFirstPurchaseAllSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getMainRepurAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setMainRepurAmountSum(subtotal.getMainRepurAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getHifansRegAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setHifansRegAmountSum(subtotal.getHifansRegAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            if (subtotal.getRepurchaseAllAmountSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurchaseAllAmountSum(subtotal.getRepurchaseAllAmountSum().divide(currency.getData().getInExchangeRate(), 4, RoundingMode.HALF_UP).multiply(chRate));
-            }
-            //奖金
-            if (subtotal.getIntroduceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setIntroduceBonusSum(subtotal.getIntroduceBonusSum().multiply(chRate));
-            }
-            if (subtotal.getOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setOrgBonusSum(subtotal.getOrgBonusSum().multiply(chRate));
-            }
-            if (subtotal.getLeaderBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setLeaderBonusSum(subtotal.getLeaderBonusSum().multiply(chRate));
-            }
-            if (subtotal.getShareBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setShareBonusSum(subtotal.getShareBonusSum().multiply(chRate));
-            }
-            if (subtotal.getServiceBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setServiceBonusSum(subtotal.getServiceBonusSum().multiply(chRate));
-            }
-            if (subtotal.getRepurRangeBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurRangeBonusSum(subtotal.getRepurRangeBonusSum().multiply(chRate));
-            }
-            if (subtotal.getRepurOrgBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurOrgBonusSum(subtotal.getRepurOrgBonusSum().multiply(chRate));
-            }
-            if (subtotal.getMainBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setMainBonusSum(subtotal.getMainBonusSum().multiply(chRate));
-            }
-            if (subtotal.getRepurBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setRepurBonusSum(subtotal.getRepurBonusSum().multiply(chRate));
-            }
-            if (subtotal.getTotalBonusSum().compareTo(BigDecimal.ZERO) > 0) {
-                subtotal.setTotalBonusSum(subtotal.getTotalBonusSum().multiply(chRate));
-            }
-        }
         return AjaxResult.success(subtotal);
     }
 

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java

@@ -87,6 +87,12 @@ public class CuBonusVertexStatisVO implements Serializable {
      */
     @BigDecimalFormat
     private BigDecimal specialUpgradeAmount = BigDecimal.ZERO;
+    /**
+     * 特殊复购
+     */
+    @BigDecimalFormat
+    private BigDecimal specialRepurchaseAmount = BigDecimal.ZERO;
+
     /**
      * 虚拟订单金额（￥）
      */
@@ -96,14 +102,12 @@ public class CuBonusVertexStatisVO implements Serializable {
     /**
      * 云代理注册金额
      */
-    @Excel(name = "云代注册(￥)", scale = 2)
     @BigDecimalFormat
     private BigDecimal agentRegAmount = BigDecimal.ZERO;
 
     /**
      * 云代理升级新增金额
      */
-    @Excel(name = "云代升级(￥)", scale = 2)
     @BigDecimalFormat
     private BigDecimal agentUpAmount = BigDecimal.ZERO;
 
@@ -135,7 +139,6 @@ public class CuBonusVertexStatisVO implements Serializable {
     /**
      * 分红收益（￥）
      */
-    @Excel(name = "分红收益(￥)", scale = 2)
     @BigDecimalFormat
     private BigDecimal shareBonus = BigDecimal.ZERO;
     /**
@@ -169,22 +172,15 @@ public class CuBonusVertexStatisVO implements Serializable {
     @BigDecimalFormat
     private BigDecimal cooperateAmount = BigDecimal.ZERO;
 
-    /**
-     * 特殊复购
-     */
-    @BigDecimalFormat
-    private BigDecimal specialRepurchaseAmount = BigDecimal.ZERO;
     /**
      * 福利订单
      */
     @BigDecimalFormat
     private BigDecimal welfareOrder = BigDecimal.ZERO;
 
-
     /**
      * 海粉注册金额（￥）
      */
-    @Excel(name = "海粉专区(￥)", scale = 2)
     @BigDecimalFormat
     private BigDecimal hifansRegAmount = BigDecimal.ZERO;
     /**
@@ -303,13 +299,23 @@ public class CuBonusVertexStatisVO implements Serializable {
      */
     @BigDecimalFormat
     private BigDecimal mainRegAmountSum = BigDecimal.ZERO;
-
     /**
      * 升级新增金额（￥）小计
      */
     @BigDecimalFormat
     private BigDecimal mainUpAmountSum = BigDecimal.ZERO;
 
+    /**
+     * 特殊注册新增金额（￥）小计
+     */
+    @BigDecimalFormat
+    private BigDecimal specialRegisterAmountSum = BigDecimal.ZERO;
+    /**
+     * 特殊升级新增金额（￥）小计
+     */
+    @BigDecimalFormat
+    private BigDecimal specialUpgradeAmountSum = BigDecimal.ZERO;
+
     /**
      * 云代理注册金额小计
      */
@@ -358,6 +364,12 @@ public class CuBonusVertexStatisVO implements Serializable {
      */
     @BigDecimalFormat
     private BigDecimal mainRepurAmountSum = BigDecimal.ZERO;
+    /**
+     * 特殊复购新增金额小计（￥）(复购专区)
+     */
+    @BigDecimalFormat
+    private BigDecimal specialRepurchaseAmountSum = BigDecimal.ZERO;
+
     /**
      * 嗨粉注册金额小计（￥）
      */
@@ -378,6 +390,11 @@ public class CuBonusVertexStatisVO implements Serializable {
      */
     @BigDecimalFormat
     private BigDecimal repurOrgBonusSum = BigDecimal.ZERO;
+    /**
+     * 复购辅导收益（￥）小计
+     */
+    @BigDecimalFormat
+    private BigDecimal repurLeaderBonusSum = BigDecimal.ZERO;
 
     /**
      * 首购拨出金额合计
@@ -398,8 +415,7 @@ public class CuBonusVertexStatisVO implements Serializable {
     private BigDecimal mainBonusPvRateSum = BigDecimal.ZERO;
 
     /**
-     * 小计
+     * 小计 （复购直推收益+复购级差收益+复购拓展收益）*80% +海粉直推
-     * （复购直推收益+复购级差收益+复购拓展收益）*80% +海粉直推
      * (复购级差+复购拓展 ) *0.8 +海粉直推
      */
     @BigDecimalFormat
@@ -452,7 +468,6 @@ public class CuBonusVertexStatisVO implements Serializable {
      */
     private Long pkTeamCode;
 
-
     /**
      * 注册新增PV MAIN_REG_PV
      */

bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml

@@ -64,58 +64,47 @@
         <result column="WELFARE_ORDER_PV" property="welfareOrderPv"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        CREATION_TIME
-        ,
-        PK_COUNTRY,
-        DEL_FLAG,
-        PK_ID, STATIS_TYPE, PERIOD, START_DATE, END_DATE, MAIN_REG_AMOUNT, MAIN_UP_AMOUNT, MAIN_REPUR_AMOUNT, HIFANS_REG_AMOUNT, INTRODUCE_BONUS, ORG_BONUS, LEADER_BONUS, SHARE_BONUS, SERVICE_BONUS, HI_FUN_INCOME, REPUR_RANGE_BONUS, REPUR_ORG_BONUS, MAIN_BONUS, REPUR_BONUS, PK_BD_VERTEX, PK_TEAM_CODE, HAI_FUN_INCOME, GIFT_ORDER, SPECIAL_REGISTER_AMOUNT, SPECIAL_UPGRADE_AMOUNT, CLOUD_COLLEGE_AMOUNT, MALL_AMOUNT, MAKER_GIFT_AMOUNT, EMPOWERMENT_GIFT_AMOUNT, COOPERATE_AMOUNT, SPECIAL_REPURCHASE_AMOUNT, HAI_FUN_UPGRADE_AMOUNT, REPUR_PUSH_INCOME, MAKER_DIRECT, MAKER_SHARE, THIRD_ORDER, FICTITIOUS_AMOUNT, MAKER_ORDER, WELFARE_ORDER, MAIN_REG_PV, MAIN_UP_PV, MAIN_REPUR_PV, SPECIAL_REGISTER_PV, SPECIAL_UPGRADE_PV, SPECIAL_REPURCHASE_PV, FICTITIOUS_PV, HIFANS_REG_PV, HAI_FUN_UPGRADE_PV, CLOUD_COLLEGE_PV, MALL_PV, EMPOWERMENT_GIFT_PV, COOPERATE_PV, MAKER_ORDER_PV, MAKER_GIFT_PV, WELFARE_ORDER_PV
-    </sql>
-
     <!-- 奖金拨比列表-->
     <select id="queryCuBonusStatis" parameterType="com.hzs.member.statis.vo.CuBonusVertexStatisVO"
             resultType="com.hzs.member.statis.vo.CuBonusVertexStatisVO">
         SELECT
-        cbs.MAIN_REG_PV mainRegPv,
-        cbs.MAIN_UP_PV mainUpPv,
-        cbs.SPECIAL_REGISTER_PV specialRegisterPv,
-        cbs.SPECIAL_UPGRADE_PV specialUpgradePv,
-        cbs.FICTITIOUS_PV fictitiousPv,
-        cbs.MAIN_REPUR_PV mainRepurPv,
-        cbs.HIFANS_REG_PV hifansRegPv,
-        cbs.HAI_FUN_UPGRADE_PV haiFunUpgradePv,
-        cbs.CLOUD_COLLEGE_PV cloudCollegePv,
-        cbs.MALL_PV mallPv,
-        cbs.EMPOWERMENT_GIFT_PV empowermentGiftPv,
-        cbs.COOPERATE_PV cooperatePv,
-        cbs.SPECIAL_REPURCHASE_PV specialRepurchasePv,
-        cbs.MAKER_ORDER_PV makerOrderPv,
-        cbs.MAKER_GIFT_PV makerGiftPv,
-        cbs.WELFARE_ORDER_PV welfareOrderPv,
         cbs.PK_BD_VERTEX pkVertex,
         cbs.PK_TEAM_CODE pkTeamCode,
         cm.MEMBER_CODE as memberCode,
         cm.MEMBER_NAME as memberName,
         cbs.PK_ID pkId,
         cbs.PERIOD period,
-        cbs.MAIN_REG_AMOUNT mainRegAmount,
-        cbs.MAIN_UP_AMOUNT mainUpAmount,
-        cbs.MAIN_REPUR_AMOUNT mainRepurAmount,
-        cbs.HIFANS_REG_AMOUNT hifansRegAmount,
-        cbs.INTRODUCE_BONUS introduceBonus,
-        cbs.ORG_BONUS orgBonus,
-        cbs.LEADER_BONUS leaderBonus,
-        #{orderAchieve} shareBonus,
-        cbs.SERVICE_BONUS serviceBonus,
-        cbs.HI_FUN_INCOME hiFunIncome,
-        cbs.REPUR_RANGE_BONUS repurRangeBonus,
-        cbs.REPUR_ORG_BONUS repurOrgBonus,
-        cbs.gift_order giftOrder,
         cbs.CREATION_TIME creationTime,
-        cbs.MAKER_DIRECT makerDirect,
-        cbs.MAKER_SHARE makerShare,
         cbs.PK_COUNTRY pkCountry,
+        <!-- PV字段 -->
+        cbs.MAIN_REG_PV mainRegPv,
+        cbs.MAIN_UP_PV mainUpPv,
+        cbs.MAIN_REPUR_PV mainRepurPv,
+        cbs.SPECIAL_REGISTER_PV specialRegisterPv,
+        cbs.SPECIAL_UPGRADE_PV specialUpgradePv,
+        cbs.SPECIAL_REPURCHASE_PV specialRepurchasePv,
+        cbs.FICTITIOUS_PV fictitiousPv,
+        cbs.HIFANS_REG_PV hifansRegPv,
+        cbs.HAI_FUN_UPGRADE_PV haiFunUpgradePv,
+        cbs.MALL_PV mallPv,
+        cbs.COOPERATE_PV cooperatePv,
+        cbs.WELFARE_ORDER_PV welfareOrderPv,
+        <!-- 金额字段 -->
+        cbs.main_reg_amount mainRegAmount,
+        cbs.main_up_amount mainUpAmount,
+        cbs.main_repur_amount mainRepurAmount,
+        cbs.special_register_amount,
+        cbs.special_upgrade_amount,
+        cbs.special_repurchase_amount,
+        <!-- 奖金字段 -->
+        cbs.introduce_bonus introduceBonus,
+        cbs.org_bonus orgBonus,
+        cbs.leader_bonus leaderBonus,
+        cbs.service_bonus serviceBonus,
+        cbs.repur_range_bonus repurRangeBonus,
+        cbs.repur_org_bonus repurOrgBonus,
+        cbs.repur_leader_bonus repurLeaderBonus,
+        <!-- 首购相关收益占比，页面未使用
         CASE WHEN (cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)=0 THEN 0 ELSE
         ROUND(#{perCent}*cbs.INTRODUCE_BONUS/(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT),4) end as introduceBonusRate,
         CASE WHEN (cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)=0 THEN 0 ELSE
@@ -126,91 +115,68 @@
         ROUND(#{perCent}*cbs.SHARE_BONUS/(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT),4) end shareBonusRate,
         CASE WHEN (cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)=0 THEN 0 ELSE
         ROUND(#{perCent}*cbs.SERVICE_BONUS/(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT),4) end serviceBonusRate,
-        ( cbs.MAIN_REG_AMOUNT +
+        -->
-        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT ) AS
+        <!-- 首购金额 = 注册 + 升级 + 特殊注册 + 特殊升级 + 虚拟订单（空单） -->
-        firstPurchaseAll,
-        ( cbs.MAIN_REPUR_AMOUNT +
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT+cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER
-        ) AS repurchaseAllAmount,
-        (cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE) AS mainBonus,
-
-        CASE WHEN
         (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT)
-        = 0
+        AS firstPurchaseAll,
-        THEN 0 ELSE ROUND((#{perCent}*(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
+        <!-- 复购金额 = 复购 + 直播 + 合作 + 特殊复购 + 福利订单 -->
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE))
+        (cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER)
+        AS repurchaseAllAmount,
+        <!-- 首购拨出金额 = 直推收益 + 拓展收益 + 辅导收益 + 服务补贴  -->
+        (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS) AS mainBonus,
+        <!-- 首购拨出比例 = 首购金额为0，首购拨出比例 = 0；否则，首购拨出比例 = 100 * 首购拨出金额 / 首购金额 -->
+        case
+        WHEN (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) = 0
+        THEN 0
+        ELSE ROUND((#{perCent} * (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS))
         / (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4)
         end AS mainBonusRate,
-
+        <!-- 首购PV拨出比例 = 首购PV为0，首购PV拨出比例 = 0；否则，首购PV拨出比例 = 100 * 首购拨出金额 / 汇率 / 首购PV -->
-        CASE WHEN
+        case
-        (cbs.MAIN_REG_PV+cbs.MAIN_UP_PV+cbs.SPECIAL_REGISTER_PV+cbs.SPECIAL_UPGRADE_PV+cbs.FICTITIOUS_PV)
+        WHEN (cbs.MAIN_REG_PV + cbs.MAIN_UP_PV + cbs.SPECIAL_REGISTER_PV + cbs.SPECIAL_UPGRADE_PV + cbs.FICTITIOUS_PV) = 0
-        = 0
+        THEN 0
-        THEN 0 ELSE ROUND((#{perCent}*(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
+        ELSE ROUND((#{perCent} * (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS))
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE)+#{orderAchieve})
         / #{rate} / (cbs.MAIN_REG_PV + cbs.MAIN_UP_PV + cbs.SPECIAL_REGISTER_PV + cbs.SPECIAL_UPGRADE_PV + cbs.FICTITIOUS_PV), 4)
         end AS mainBonusPvRate,
-
+        <!-- 复购拨出金额 = 复购级差收益 + 复购拓展收益 + 复购推荐收益 + 复购辅导收益 -->
-        (cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME
+        (cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS) AS repurBonus,
-        +cbs.HI_FUN_INCOME) AS repurBonus,
+        <!-- 复购拨出比例 = 复购金额为0，复购拨出比例 = 0；否则，复购拨出比例 = 100 * 复购拨出金额 / 复购金额 -->
-
+        case
-        CASE WHEN (cbs.MAIN_REPUR_AMOUNT +
+        WHEN (cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER) = 0
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
+        THEN 0
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
+        ELSE ROUND(#{perCent} * (cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)=0 THEN 0
+        / (cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER), 4)
-        ELSE ROUND(#{perCent}*(((cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME))+cbs.HI_FUN_INCOME) /
+        end AS repurBonusRate,
-        (cbs.MAIN_REPUR_AMOUNT +
+        <!-- 复购PV拨出比例 = 复购PV为0，复购PV拨出比例 = 0；否则，复购PV拨出比例 = 100 * 首购拨出金额 / 汇率 / 首购PV -->
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
+        case
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
+        WHEN (cbs.MAIN_REPUR_PV + cbs.MALL_PV + cbs.COOPERATE_PV + cbs.SPECIAL_REPURCHASE_PV + cbs.WELFARE_ORDER_PV) = 0
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER),4) end AS repurBonusRate,
+        THEN 0
-
+        ELSE ROUND(#{perCent} * (cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        CASE WHEN (cbs.MAIN_REPUR_PV +
+        / #{rate} / (cbs.MAIN_REPUR_PV + cbs.MALL_PV +cbs.COOPERATE_PV + cbs.SPECIAL_REPURCHASE_PV + cbs.WELFARE_ORDER_PV), 4)
-        cbs.HIFANS_REG_PV+cbs.HAI_FUN_UPGRADE_PV+cbs.CLOUD_COLLEGE_PV+cbs.MALL_PV
+        end AS repurBonusPvRate,
-        +cbs.EMPOWERMENT_GIFT_PV+cbs.COOPERATE_PV+cbs.SPECIAL_REPURCHASE_PV
+        <!-- 总拨出金额 = 直推收益 + 拓展收益 + 辅导收益 + 服务补贴 + 复购级差收益 + 复购拓展收益 + 复购推荐收益 + 复购辅导收益 -->
-        +cbs.MAKER_ORDER_PV+cbs.MAKER_GIFT_PV+cbs.WELFARE_ORDER_PV)=0 THEN 0
+        (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS
-        ELSE ROUND(#{perCent}*(((cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME))+cbs.HI_FUN_INCOME) /
+        + cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        #{rate}/(cbs.MAIN_REPUR_PV +
+        AS totalBonus,
-        cbs.HIFANS_REG_PV+cbs.HAI_FUN_UPGRADE_PV+cbs.CLOUD_COLLEGE_PV+cbs.MALL_PV
+        <!-- 总拨出比例 = 首购 + 复购金额为0，总拨出比例 = 0；否则，总拨出比例 = 100 * 首购 + 复购拨出金额 / 首购 + 复购金额 -->
-        +cbs.EMPOWERMENT_GIFT_PV+cbs.COOPERATE_PV+cbs.SPECIAL_REPURCHASE_PV
+        CASE
-        +cbs.MAKER_ORDER_PV+cbs.MAKER_GIFT_PV+cbs.WELFARE_ORDER_PV),4) end AS repurBonusPvRate,
+        WHEN (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT
-
+        + cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT +cbs.WELFARE_ORDER) = 0
-        (cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
+        THEN 0
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE+
+        ELSE ROUND (#{perCent} * (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS
-        cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME
+        + cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        +cbs.HI_FUN_INCOME) AS totalBonus,
+        / (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT
-
+        + cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER), 4)
-        CASE WHEN
+        end AS totalBonusRate
-        (cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
+        FROM CU_BONUS_VERTEX_STATIS cbs
-        cbs.MAIN_REPUR_AMOUNT +
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)=0 THEN 0
-        ELSE ROUND ((#{perCent}*(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE+
-        cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME+cbs.HI_FUN_INCOME)) /
-        (cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
-        cbs.MAIN_REPUR_AMOUNT +
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER),4) end AS totalBonusRate
-        FROM
-        CU_BONUS_VERTEX_STATIS cbs
         LEFT JOIN CU_MEMBER cm ON cm.PK_ID = cbs.PK_BD_VERTEX AND cm.DEL_FLAG = 0
         WHERE 1 = 1
         <if test="pkCountry != null">
             and cbs.PK_COUNTRY = #{pkCountry}
         </if>
-        <if test="pkTeamCodeList != null ">
-            and cbs.PK_TEAM_CODE in
-            <foreach collection="pkTeamCodeList" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
         <if test="pkVertex != null ">
             and cbs.PK_BD_VERTEX =#{pkVertex}
         </if>
-
         <if test="startDate != null and startDate != '' ">
             and cbs.CREATION_TIME >= to_date(#{startDate}, 'yyyy-mm-dd')
         </if>
@@ -224,23 +190,24 @@
     <select id="queryCuBonusSumStatis" parameterType="com.hzs.member.statis.vo.CuBonusVertexStatisVO"
             resultType="com.hzs.member.statis.vo.CuBonusVertexStatisVO">
         SELECT
-        sum (cbs.MAIN_REG_AMOUNT) mainRegAmountSum,
+        <!-- 金额字段 -->
-        sum (cbs.MAIN_UP_AMOUNT) mainUpAmountSum,
+        sum (cbs.main_reg_amount) mainRegAmountSum,
-        sum (cbs.MAIN_REPUR_AMOUNT) mainRepurAmountSum,
+        sum (cbs.main_up_amount) mainUpAmountSum,
-        sum (cbs.HIFANS_REG_AMOUNT) hifansRegAmountSum,
+        sum (cbs.main_repur_amount) mainRepurAmountSum,
+        sum (cbs.special_register_amount) specialRegisterAmountSum,
+        sum (cbs.special_upgrade_amount) specialUpgradeAmountSum,
+        sum (cbs.special_repurchase_amount) specialRepurchaseAmountSum,
+        <!-- 奖金字段 -->
         sum (cbs.INTRODUCE_BONUS) introduceBonusSum,
         sum (cbs.ORG_BONUS) orgBonusSum,
         sum (cbs.LEADER_BONUS) leaderBonusSum,
-        #{orderAchieve} shareBonusSum,
         sum (cbs.SERVICE_BONUS) serviceBonusSum,
-        sum (cbs.HI_FUN_INCOME) hiFunIncomeSum,
         sum (cbs.REPUR_RANGE_BONUS) repurRangeBonusSum,
         sum (cbs.REPUR_ORG_BONUS) repurOrgBonusSum,
-        sum (cbs.MAKER_DIRECT) makerDirectSum,
+        sum (cbs.REPUR_LEADER_BONUS) repurLeaderBonusSum,
-        sum (cbs.MAKER_SHARE) makerShareSum,
+        <!-- 首购相关收益占比，页面未使用
         CASE WHEN (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT))=0 THEN 0 ELSE
-        ROUND(sum(#{perCent}*cbs.INTRODUCE_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end as
+        ROUND(sum(#{perCent}*cbs.INTRODUCE_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end as introduceBonusRateSum,
-        introduceBonusRateSum,
         CASE WHEN (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT))=0 THEN 0 ELSE
         ROUND(sum(#{perCent}*cbs.ORG_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end as orgBonusRateSum,
         CASE WHEN (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT))=0 THEN 0 ELSE
@@ -248,83 +215,57 @@
         CASE WHEN (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT))=0 THEN 0 ELSE
         ROUND(sum(#{perCent}*cbs.SHARE_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end shareBonusRateSum,
         CASE WHEN (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT))=0 THEN 0 ELSE
-        ROUND(sum(#{perCent}*cbs.SERVICE_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end
+        ROUND(sum(#{perCent}*cbs.SERVICE_BONUS)/(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT)),4) end serviceBonusRateSum,
-        serviceBonusRateSum,
+        -->
-        ((sum(cbs.MAIN_REG_AMOUNT +
-        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)))
-        AS
-        firstPurchaseAllSum,
-        ( sum(cbs.MAIN_REPUR_AMOUNT +
-        cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER) ) AS repurchaseAllAmountSum,
-        sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
-        +cbs.MAKER_DIRECT+cbs.MAKER_SHARE)+(#{orderAchieve}) AS mainBonusSum,
-
-        CASE WHEN
         sum (cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT)
-        = 0
+        AS firstPurchaseAllSum,
-        THEN 0 ELSE ROUND(((#{perCent}*sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
+        sum (cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER)
-        +cbs.MAKER_DIRECT+cbs.MAKER_SHARE))+(#{perCent}*#{orderAchieve}))
+        AS repurchaseAllAmountSum,
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
+        sum (cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS)
+        AS mainBonusSum,
+        case
+        WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) = 0
+        THEN 0
+        ELSE ROUND(#{perCent} * sum(cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS)
+        / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4)
         end AS mainBonusRateSum,
-
+        case
-        CASE WHEN
+        WHEN sum(cbs.MAIN_REG_PV + cbs.MAIN_UP_PV + cbs.SPECIAL_REGISTER_PV + cbs.SPECIAL_UPGRADE_PV + cbs.FICTITIOUS_PV) = 0
-        sum(cbs.MAIN_REG_PV+cbs.MAIN_UP_PV+cbs.SPECIAL_REGISTER_PV+cbs.SPECIAL_UPGRADE_PV+cbs.FICTITIOUS_PV)
+        THEN 0
-        = 0
+        ELSE ROUND(#{perCent} * sum(cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS)
-        THEN 0 ELSE ROUND(((#{perCent}*sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
-        +cbs.MAKER_DIRECT+cbs.MAKER_SHARE))+(#{orderAchieve}))
         / #{rate} / sum(cbs.MAIN_REG_PV + cbs.MAIN_UP_PV + cbs.SPECIAL_REGISTER_PV + cbs.SPECIAL_UPGRADE_PV + cbs.FICTITIOUS_PV), 4)
         end AS mainBonusPvRateSum,
-
+        sum(cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS) AS repurBonusSum,
-        sum(cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME
+        case
-        +cbs.HI_FUN_INCOME) AS repurBonusSum,
+        WHEN sum(cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER) = 0
-
+        THEN 0
-        CASE WHEN
+        ELSE ROUND(#{perCent} * sum(cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        sum(cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
+        / sum(cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER), 4)
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
+        end AS repurBonusRateSum,
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)=0 THEN 0
+        case
-        ELSE ROUND(#{perCent}*sum(((cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME))+cbs.HI_FUN_INCOME)
+        WHEN sum(cbs.MAIN_REPUR_PV + cbs.MALL_PV + cbs.COOPERATE_PV + cbs.SPECIAL_REPURCHASE_PV + cbs.WELFARE_ORDER_PV) = 0
-        /
+        THEN 0
-        sum(cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
+        ELSE ROUND(#{perCent} * sum(cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
+        / #{rate} / sum(cbs.MAIN_REPUR_PV + cbs.MALL_PV +cbs.COOPERATE_PV + cbs.SPECIAL_REPURCHASE_PV + cbs.WELFARE_ORDER_PV), 4)
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER),4) end AS repurBonusRateSum,
+        end AS repurBonusPvRateSum,
-
+        sum(cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS
-        CASE WHEN
+        + cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        sum(cbs.MAIN_REPUR_PV+cbs.HIFANS_REG_PV+cbs.HAI_FUN_UPGRADE_PV+cbs.CLOUD_COLLEGE_PV+cbs.MALL_PV
+        AS totalBonusSum,
-        +cbs.EMPOWERMENT_GIFT_PV+cbs.COOPERATE_PV+cbs.SPECIAL_REPURCHASE_PV
+        CASE
-        +cbs.MAKER_ORDER_PV+cbs.MAKER_GIFT_PV+cbs.WELFARE_ORDER_PV)=0 THEN 0
+        WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT
-        ELSE ROUND(#{perCent}*sum(((cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME))+cbs.HI_FUN_INCOME)
+        + cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT +cbs.WELFARE_ORDER) = 0
-        /#{rate}/
+        THEN 0
-        sum(cbs.MAIN_REPUR_PV+cbs.HIFANS_REG_PV+cbs.HAI_FUN_UPGRADE_PV+cbs.CLOUD_COLLEGE_PV+cbs.MALL_PV
+        ELSE ROUND (#{perCent} * sum(cbs.INTRODUCE_BONUS + cbs.ORG_BONUS + cbs.LEADER_BONUS + cbs.SERVICE_BONUS
-        +cbs.EMPOWERMENT_GIFT_PV+cbs.COOPERATE_PV+cbs.SPECIAL_REPURCHASE_PV
+        + cbs.REPUR_RANGE_BONUS + cbs.REPUR_ORG_BONUS + cbs.REPUR_PUSH_INCOME + cbs.REPUR_LEADER_BONUS)
-        +cbs.MAKER_ORDER_PV+cbs.MAKER_GIFT_PV+cbs.WELFARE_ORDER_PV),4) end AS repurBonusPvRateSum,
+        / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT
-
+        + cbs.MAIN_REPUR_AMOUNT + cbs.MALL_AMOUNT + cbs.COOPERATE_AMOUNT + cbs.SPECIAL_REPURCHASE_AMOUNT + cbs.WELFARE_ORDER), 4)
-        sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS+
+        end AS totalBonusRateSum
-        cbs.MAKER_DIRECT+cbs.MAKER_SHARE+
+        FROM CU_BONUS_VERTEX_STATIS cbs
-        cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME
+        LEFT JOIN CU_MEMBER cm ON cm.PK_ID = cbs.PK_BD_VERTEX AND cm.DEL_FLAG = 0
-        +cbs.HI_FUN_INCOME)+(#{orderAchieve}) AS totalBonusSum,
-        CASE WHEN
-        sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
-        cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)=0 THEN 0
-        ELSE ROUND ((#{perCent}*sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
-        +cbs.MAKER_DIRECT+cbs.MAKER_SHARE+
-        cbs.REPUR_RANGE_BONUS+cbs.REPUR_ORG_BONUS+cbs.REPUR_PUSH_INCOME+cbs.HI_FUN_INCOME)+(#{perCent}*#{orderAchieve}))
-        /
-        (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
-        cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
-        +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)),4) end AS totalBonusRateSum
-        FROM
-        CU_BONUS_VERTEX_STATIS cbs
-        LEFT JOIN CU_MEMBER cm ON cm.PK_ID = cbs.PK_BD_VERTEX
         WHERE 1 = 1
         <if test="pkCountry != null">
             and cbs.PK_COUNTRY = #{pkCountry}
         </if>
-
         <if test="pkVertex != null ">
             and cbs.PK_BD_VERTEX = #{pkVertex}
         </if>
@@ -334,7 +275,6 @@
         <if test="endDate!=null and endDate!='' ">
             and cbs.CREATION_TIME &lt;= to_date(#{endDate} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
         </if>
-
     </select>
 
     <!-- 查询顶点奖金拨比汇总-->