## 会员奖金明细福利分红返回字段调整；

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MemberFirstOrderDTO.java

@@ -1,10 +1,4 @@
-package com.hzs.sale.order.dto;/**
+package com.hzs.sale.order.dto;
- * @Description:
- * @Author: yuhui
- * @Time: 2023/11/25 16:41
- * @Classname: MemberFirstOrderDTO
- * @PackageName: com.hzs.sale.order.dto
- */
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,14 +7,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2023-11-25  16:41
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 @Builder
 @AllArgsConstructor

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/MyOrderItemsDTO.java

@@ -5,11 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * @Description: 我的订单明细返回VO
+ * 我的订单明细返回VO
- * @Author: zhangjing
- * @Time: 2023/11/16 16:13
- * @Classname: MyOrderItemsDTO
- * @PackageName: com.hzs.sale.order.vo
  */
 @Data
 public class MyOrderItemsDTO {

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/OrderGoalsDTO.java

@@ -1,46 +0,0 @@
-package com.hzs.sale.order.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 订单目标参数
- * @Description:
- * @Author: ljc
- * @Time: 2023/5/18 17:35
- * @Classname: OrderGoalsDTO
- * @Package_name: com.hzs.sale.order.dto
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderGoalsDTO  implements Serializable {
-
-    private static final long serialVersionUID = 7855859842385975078L;
-    /**
-     * 会员ID
-     */
-    private Long pkMember;
-    /**
-     * 国家ID
-     */
-    private Integer pkCountry;
-    /**
-     * 开始时间
-     */
-    private String startDate;
-    /**
-     * 结束时间
-     */
-    private String endDate;
-
-    /**
-     * 安置部门
-     */
-    private Integer placeDept;
-}

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SaOrderRangeDto.java

@@ -5,13 +5,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2022/12/30 17:14
- * @Classname: SaOrderRangeDto
- * @PackageName: com.hzs.sale.order.dto
- */
 @Data
 public class SaOrderRangeDto implements Serializable {
 

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatDTO.java

@@ -1,10 +1,4 @@
-package com.hzs.sale.order.dto;/**
+package com.hzs.sale.order.dto;
- * @Description:
- * @Author: yuhui
- * @Time: 2024/5/14 10:48
- * @Classname: SingleItemStatDTO
- * @PackageName: com.hzs.sale.order.dto
- */
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hzs.common.core.annotation.Excel;
@@ -13,14 +7,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2024-05-14  10:48
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 public class SingleItemStatDTO implements Serializable {
 

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/SingleItemStatParamDTO.java

@@ -1,24 +1,10 @@
-package com.hzs.sale.order.dto;/**
+package com.hzs.sale.order.dto;
- * @Description:
- * @Author: yuhui
- * @Time: 2024/5/14 14:16
- * @Classname: SingleItemStatParamDTO
- * @PackageName: com.hzs.sale.order.dto
- */
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.dto
- *@Author: yh
- *@CreateTime: 2024-05-14  14:16
- *@Description: TODO
- *@Version: 1.0
- */
 @Data
 public class SingleItemStatParamDTO implements Serializable {
 

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresItemsParamDTO.java

@@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 
 /**
- * @Description: 商品明细参数
+ * 商品明细参数
- * @Author: zhangjing
- * @Time: 2022/9/15 17:00
- * @Classname: WaresItemsParam
- * @PackageName: com.hzs.sale.order.param
  */
 @Data
 @Builder

bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/dto/WaresOrderDTO.java

@@ -9,13 +9,6 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-/**
- * @Description:
- * @Author: zhangjong
- * @Time: 2023/11/16 14:09
- * @Classname: WaresOrderDTO
- * @PackageName: com.hzs.sale.order.vo
- */
 @Data
 public class WaresOrderDTO implements Serializable {
 

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

@@ -13,7 +13,6 @@ import com.hzs.common.core.annotation.Log;
 import com.hzs.common.core.constant.BonusFieldConstants;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
 import com.hzs.common.core.enums.*;
-import com.hzs.common.core.utils.CommonUtil;
 import com.hzs.common.core.utils.ComputeUtil;
 import com.hzs.common.core.utils.DateUtils;
 import com.hzs.common.core.utils.StringUtils;
@@ -40,36 +39,21 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- * <p>
  * 会员奖金-会员奖金汇总表 前端控制器
- * </p>
- *
- * @author hzs
- * @since 2022-11-11
  */
 @RestController
 @RequestMapping("/manage/bonus")
 public class CuMemberBonusController extends BaseController {
 
-    private ICuMemberBonusService cuMemberBonusService;
+    @Autowired
-
+    private ICuMemberBonusService iCuMemberBonusService;
-    private ITransactionCommonService transactionCommonService;
+    @Autowired
+    private ITransactionCommonService iTransactionCommonService;
 
     @DubboReference
-    private IUserServiceApi userServiceApi;
+    IUserServiceApi iUserServiceApi;
-
     @DubboReference
-    private IMenuColumnServiceApi menuColumnServiceApi;
+    IMenuColumnServiceApi iMenuColumnServiceApi;
-
-    @Autowired
-    public void setTransactionCommonService(ITransactionCommonService transactionCommonService) {
-        this.transactionCommonService = transactionCommonService;
-    }
-
-    @Autowired
-    public void setCuMemberBonusService(ICuMemberBonusService cuMemberBonusService) {
-        this.cuMemberBonusService = cuMemberBonusService;
-    }
 
     /**
      * 分页查询会员某个时间段内的奖金汇总
@@ -89,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;
@@ -110,9 +94,9 @@ 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 = menuColumnServiceApi.queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData();
+        Map<String, Integer> sourceBonusList = iMenuColumnServiceApi.queryMenuColumn("totalBonus", SecurityUtils.getUserId()).getData();
         ExcelUtil<BonusTotalVO> util = new ExcelUtil<>(BonusTotalVO.class, sourceBonusList);
         util.exportExcel(response, bonusTotalVoList, "奖金汇总导出");
     }
@@ -153,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);
@@ -180,18 +164,18 @@ 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);
         List<CuMemberBonusVO> cuMemberBonusVoList = getBonusDetail(cuMemberBonusExtList);
-        Map<String, Integer> bonusDetail = menuColumnServiceApi.queryMenuColumn("BonusDetail", SecurityUtils.getUserId()).getData();
+        Map<String, Integer> bonusDetail = iMenuColumnServiceApi.queryMenuColumn("BonusDetail", SecurityUtils.getUserId()).getData();
         ExcelUtil<CuMemberBonusVO> util = new ExcelUtil<>(CuMemberBonusVO.class, bonusDetail);
         util.exportExcel(response, cuMemberBonusVoList, "奖金明细导出");
     }
@@ -222,7 +206,7 @@ public class CuMemberBonusController extends BaseController {
         bonusParam.setPkCountry(SecurityUtils.getPkCountry());
         packageBonusParam(bonusParam);
         startPage();
-        return cuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
+        return iCuMemberBonusService.queryMemberBonusDetailSerVoByCondition(bonusParam);
     }
 
 
@@ -234,18 +218,15 @@ 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<String, String> transactionMap = transactionCommonService.exportEnumTransaction(EOrderType.values(), EBonusIncomeStatus.values());
+        Map<Integer, String> transactionLongMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
-        Map<Integer, String> transactionLongMap = transactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, EnumsPrefixConstants.KEY_AWARD);
         for (MemberBonusDetailSerVO memberBonusDetailSerVO : memberBonusDetailSerVOList) {
-            if (transactionMap.containsKey(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType().toString())) {
+            memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getEnumLabelByValue(memberBonusDetailSerVO.getOrderType()));
-                memberBonusDetailSerVO.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + memberBonusDetailSerVO.getOrderType()));
+            memberBonusDetailSerVO.setIncomeStatusVal(EBonusIncomeStatus.getEnumLabelByValue(memberBonusDetailSerVO.getIncomeStatus()));
-            }
+
-            if (transactionMap.containsKey(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus())) {
-                memberBonusDetailSerVO.setIncomeStatusVal(transactionMap.get(EnumsPrefixConstants.BONUS_INCOME_STATUS + memberBonusDetailSerVO.getIncomeStatus()));
-            }
             if (transactionLongMap.containsKey(memberBonusDetailSerVO.getPkSettleGrade())) {
                 memberBonusDetailSerVO.setPkSettleGradeVal(transactionLongMap.get(memberBonusDetailSerVO.getPkSettleGrade()));
             }
@@ -253,12 +234,12 @@ public class CuMemberBonusController extends BaseController {
                 memberBonusDetailSerVO.setPkAwardsVal(transactionLongMap.get(memberBonusDetailSerVO.getPkAwards()));
             }
         }
-        ExcelUtil<MemberBonusDetailSerVO> util = new ExcelUtil<>(MemberBonusDetailSerVO.class, menuColumnServiceApi.queryMenuColumn("sourceBonus", SecurityUtils.getUserId()).getData());
+        ExcelUtil<MemberBonusDetailSerVO> util = new ExcelUtil<>(MemberBonusDetailSerVO.class, iMenuColumnServiceApi.queryMenuColumn("sourceBonus", SecurityUtils.getUserId()).getData());
         util.exportExcel(response, memberBonusDetailSerVOList, "奖金来源导出");
     }
 
     private void packageBonusParam(BonusParam bonusParam) {
-        UserAuthorityDTO userAuthorityDto = userServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
+        UserAuthorityDTO userAuthorityDto = iUserServiceApi.getUserAuthority(SecurityUtils.getUserId()).getData();
         bonusParam.setVertexList(userAuthorityDto.getUserVertexList());
         bonusParam.setTeamList(userAuthorityDto.getUserTeamList());
         bonusParam.setSystemType(SecurityUtils.getSystemType());

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();
@@ -194,6 +181,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                     cuMemberBonusExt.setRetailBenefitAvgIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailBenefitIncome(BigDecimal.ZERO);
                     cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
+                    cuMemberBonusExt.setRetailBenefitIncomeTotal(BigDecimal.ZERO);
                     memberBonusExtList.add(cuMemberBonusExt);
                 }
             }
@@ -243,6 +231,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             cuMemberBonusExt.setRetailBenefitAvgIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitAvgIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailBenefitIncome(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailBenefitIncome(), inExchangeRate));
             cuMemberBonusExt.setRetailRealSubtotal(ComputeUtil.computeMultiply(cuMemberBonusExt.getRetailRealSubtotal(), inExchangeRate));
+            // 福利分红总计
+            cuMemberBonusExt.setRetailBenefitIncomeTotal(cuMemberBonusExt.getRetailBenefitAvgIncome().add(cuMemberBonusExt.getRetailBenefitIncome()));
         }
         return cuMemberBonusExtList;
     }
@@ -261,20 +251,11 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
         cuMemberBonusExt.setRepurRangeIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRangeIncome(), memberBonusExt.getRepurRangeIncome()));
         cuMemberBonusExt.setRepurExpandIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurExpandIncome(), memberBonusExt.getRepurExpandIncome()));
         cuMemberBonusExt.setRepurRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurRealSubtotal(), memberBonusExt.getRepurRealSubtotal()));
-        cuMemberBonusExt.setCloudDirectIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCloudDirectIncome(), memberBonusExt.getCloudDirectIncome()));
-        cuMemberBonusExt.setCloudPurIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCloudPurIncome(), memberBonusExt.getCloudPurIncome()));
-        cuMemberBonusExt.setCloudRepurIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getCloudRepurIncome(), memberBonusExt.getCloudRepurIncome()));
-        cuMemberBonusExt.setCloudRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getCloudRealSubtotal(), memberBonusExt.getCloudRealSubtotal()));
         cuMemberBonusExt.setRepurCoupon(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCoupon(), memberBonusExt.getRepurCoupon()));
         cuMemberBonusExt.setRepurCouponShare(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponShare(), memberBonusExt.getRepurCouponShare()));
         cuMemberBonusExt.setRepurCouponSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRepurCouponSubtotal(), memberBonusExt.getRepurCouponSubtotal()));
-        cuMemberBonusExt.setMakerDirectIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getMakerDirectIncome(), memberBonusExt.getMakerDirectIncome()));
-        cuMemberBonusExt.setMakerShareIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getMakerShareIncome(), memberBonusExt.getMakerShareIncome()));
-        cuMemberBonusExt.setMakerRealSubtotal(ComputeUtil.computeAdd(cuMemberBonusExt.getMakerRealSubtotal(), memberBonusExt.getMakerRealSubtotal()));
         cuMemberBonusExt.setGlobalPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getGlobalPoints(), memberBonusExt.getGlobalPoints()));
         cuMemberBonusExt.setCarAwardPoints(ComputeUtil.computeAdd(cuMemberBonusExt.getCarAwardPoints(), memberBonusExt.getCarAwardPoints()));
-        cuMemberBonusExt.setHiFunIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getHiFunIncome(), memberBonusExt.getHiFunIncome()));
-        cuMemberBonusExt.setHaiFunIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getHaiFunIncome(), memberBonusExt.getHaiFunIncome()));
         cuMemberBonusExt.setRealIncomeTotal(ComputeUtil.computeAdd(cuMemberBonusExt.getRealIncomeTotal(), memberBonusExt.getRealIncomeTotal()));
         cuMemberBonusExt.setStoreIncome(ComputeUtil.computeAdd(cuMemberBonusExt.getStoreIncome(), memberBonusExt.getStoreIncome()));
     }
@@ -509,10 +490,10 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
             if (bonusItemsMap.containsKey(memberBonusDetailSerVO.getPkBonusItems())) {
                 memberBonusDetailSerVO.setBonusName(bonusItemsMap.get(memberBonusDetailSerVO.getPkBonusItems()).getBonusName());
             }
-            memberBonusDetailSerVO.setOrderAmountDollar(ComputeUtil.computeDivide(memberBonusDetailSerVO.getOrderAmount(), memberBonusDetailSerVO.getOutExchangeRate()));
+            memberBonusDetailSerVO.setOrderAmountDollar(memberBonusDetailSerVO.getOrderAmount());
-            memberBonusDetailSerVO.setOrderAchieveOri(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getOrderAchieve(), memberBonusDetailSerVO.getOutExchangeRate()));
+            memberBonusDetailSerVO.setOrderAchieveOri(memberBonusDetailSerVO.getOrderAchieve());
-            memberBonusDetailSerVO.setPretaxIncomeOri(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getPretaxIncome(), memberBonusDetailSerVO.getOutExchangeRate()));
+            memberBonusDetailSerVO.setPretaxIncomeOri(memberBonusDetailSerVO.getPretaxIncome());
-            memberBonusDetailSerVO.setRealIncomeOri(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getRealIncome(), memberBonusDetailSerVO.getOutExchangeRate()));
+            memberBonusDetailSerVO.setRealIncomeOri(memberBonusDetailSerVO.getRealIncome());
             memberBonusDetailSerVO.setIncomeRatio(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getIncomeRatio(), 100));
             memberBonusDetailSerVO.setIncomeDialRatio(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getIncomeDialRatio(), 100));
             memberBonusDetailSerVO.setOrderDialRatio(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getOrderDialRatio(), 100));
@@ -528,6 +509,8 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
                 memberBonusDetailSerVO.setCoachNormalHalfOri(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getCoachNormalHalf(), memberBonusDetailSerVO.getOutExchangeRate()));
                 memberBonusDetailSerVO.setCoachNormalRealOri(ComputeUtil.computeMultiply(memberBonusDetailSerVO.getCoachNormalReal(), memberBonusDetailSerVO.getOutExchangeRate()));
             }
+            memberBonusDetailSerVO.setOrderTypeVal(EOrderType.getEnumLabelByValue(memberBonusDetailSerVO.getOrderType()));
+            memberBonusDetailSerVO.setIncomeStatusVal(EBonusIncomeStatus.getEnumLabelByValue(memberBonusDetailSerVO.getIncomeStatus()));
         });
         dataTable.setRows(memberBonusDetailSerVoS);
         return dataTable;
@@ -571,16 +554,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;

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

@@ -26,21 +26,83 @@ public class BonusTotalVO implements Serializable {
     @Excel(name = "结算期数")
     private Integer period;
 
+    /**
+     * 结算日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd")
+    private Date settleDate;
+
     /**
      * 国家
      */
     private Integer pkCountry;
 
+
+    /**
+     * 新零售直推收益
+     */
+    @Excel(name = "直推收益", scale = 2)
+    private BigDecimal retailRangeIncome;
+
+    /**
+     * 新零售平级收益
+     */
+    @Excel(name = "平级收益", scale = 2)
+    private BigDecimal retailSameLevelIncome;
+
+    /**
+     * 新零售区域分红
+     */
+    @Excel(name = "区域分红", scale = 2)
+    private BigDecimal retailAreaIncome;
+
+    /**
+     * 新零售福利级差收益
+     */
+    @Excel(name = "福利级差收益", scale = 2)
+    private BigDecimal retailBenefitRangeIncome;
+
+    /**
+     * 新零售复购级差收益
+     */
+    @Excel(name = "复购级差收益", scale = 2)
+    private BigDecimal retailMonthRepurchaseIncome;
+
+    /**
+     * 福利分红平均收益
+     */
+    @Excel(name = "福利分红平均收益", scale = 2)
+    private BigDecimal retailBenefitAvgIncome;
+
+    /**
+     * 福利分红加权收益
+     */
+    @Excel(name = "福利分红加权收益", scale = 2)
+    private BigDecimal retailBenefitIncome;
+
+    /**
+     * 重消收益
+     */
+    @Excel(name = "重消收益", scale = 2)
+    private BigDecimal backPointsOri;
+
+    /**
+     * 实发收益总计
+     */
+    @Excel(name = "实发收益总计", scale = 2)
+    private BigDecimal realIncomeTotalOri;
+
+
+
     /**
      * 直推收益
      */
-    @Excel(name = "直推收益", scale = 2)
     private BigDecimal directIncomeOri;
 
     /**
      * 拓展收益
      */
-    @Excel(name = "拓展收益", scale = 2)
     private BigDecimal expandIncomeOri;
 
     /**
@@ -56,143 +118,109 @@ public class BonusTotalVO implements Serializable {
     /**
      * 辅导收益
      */
-    @Excel(name = "辅导收益", scale = 2)
     private BigDecimal coachIncomeOri;
 
     /**
      * 分红收益
      */
-    @Excel(name = "分红收益", scale = 2)
     private BigDecimal shareIncomeOri;
 
     /**
      * 报单收益
      */
-    @Excel(name = "报单收益", scale = 2)
     private BigDecimal serviceIncomeOri;
 
 
     /**
      * 云代直推收益
      */
-    @Excel(name = "云代直推收益", scale = 2)
     private BigDecimal cloudDirectIncomeOri;
 
     /**
      * 云代首购收益
      */
-    @Excel(name = "云代首购收益", scale = 2)
     private BigDecimal cloudPurIncomeOri;
 
     /**
      * 云代复购收益
      */
-    @Excel(name = "云代复购收益", scale = 2)
     private BigDecimal cloudRepurIncomeOri;
 
-    @Excel(name = "复购推荐收益", scale = 2)
     private BigDecimal repurPushIncomeOri;
 
     /**
      * 复购级差收益
      */
-    @Excel(name = "复购级差收益", scale = 2)
     private BigDecimal repurRangeIncomeOri;
 
     /**
      * 复购拓展收益
      */
-    @Excel(name = "复购拓展收益", scale = 2)
     private BigDecimal repurExpandIncomeOri;
 
     /**
      * 复购券
      */
-    @Excel(name = "复购券", scale = 2)
     private BigDecimal repurCouponOri;
 
     /**
      * 复购券均分收益
      */
-    @Excel(name = "复购券均分", scale = 2)
     private BigDecimal repurCouponShareOri;
 
-    /**
-     * 商城重消
-     */
-    @Excel(name = "商城重消", scale = 2)
-    private BigDecimal backPointsOri;
-
     /**
      * 平台服务费
      */
-    @Excel(name = "平台服务费", scale = 2)
     private BigDecimal serviceSpendOri;
 
     /**
      * 环球积分
      */
-    @Excel(name = "直推极差", scale = 2)
     private BigDecimal globalPointsOri;
 
     /**
      * 车奖积分
      */
-    @Excel(name = "车奖积分", scale = 2)
     private BigDecimal carAwardPointsOri;
 
     /**
      * 店铺收益
      */
-    @Excel(name = "店铺收益", scale = 2)
     private BigDecimal storeIncomeOri;
 
     /**
      * 嗨粉推荐收益
      */
-    @Excel(name = "嗨粉推荐收益", scale = 2)
     private BigDecimal hiFunIncomeOri;
 
     /**
      * 首购实发小计
      */
-    @Excel(name = "首购实发小计", scale = 2)
     private BigDecimal purRealSubtotalOri;
 
     /**
      * 云代实发小计
      */
-    @Excel(name = "云代实发小计", scale = 2)
     private BigDecimal cloudRealSubtotalOri;
 
     /**
      * 复购实发小计
      */
-    @Excel(name = "复购实发小计", scale = 2)
     private BigDecimal repurRealSubtotalOri;
 
     /**
      * 复购券小计
      */
-    @Excel(name = "复购券实发小计", scale = 2)
     private BigDecimal repurCouponSubtotalOri;
 
-    /**
-     * 实发收益总计
-     */
-    @Excel(name = "实发收益总计", scale = 2)
-    private BigDecimal realIncomeTotalOri;
-
     /**
      * 直推收益
      */
-    @Excel(name = "直推收益($)", scale = 2)
     private BigDecimal directIncome;
 
     /**
      * 拓展收益
      */
-    @Excel(name = "拓展收益($)", scale = 2)
     private BigDecimal expandIncome;
 
     /**
@@ -208,136 +236,109 @@ public class BonusTotalVO implements Serializable {
     /**
      * 辅导收益
      */
-    @Excel(name = "辅导收益($)", scale = 2)
     private BigDecimal coachIncome;
 
     /**
      * 分红收益
      */
-    @Excel(name = "分红收益($)", scale = 2)
     private BigDecimal shareIncome;
 
     /**
      * 报单收益
      */
-    @Excel(name = "报单收益($)", scale = 2)
     private BigDecimal serviceIncome;
 
     /**
      * 云代直推收益
      */
-    @Excel(name = "云代直推收益($)", scale = 2)
     private BigDecimal cloudDirectIncome;
 
     /**
      * 云代首购收益
      */
-    @Excel(name = "云代首购收益($)", scale = 2)
     private BigDecimal cloudPurIncome;
 
     /**
      * 云代复购收益
      */
-    @Excel(name = "云代复购收益($)", scale = 2)
     private BigDecimal cloudRepurIncome;
 
-    @Excel(name = "复购推荐($)", scale = 2)
     private BigDecimal repurPushIncome;
 
     /**
      * 复购级差收益
      */
-    @Excel(name = "复购级差收益($)", scale = 2)
     private BigDecimal repurRangeIncome;
 
     /**
      * 复购拓展收益
      */
-    @Excel(name = "复购拓展收益($)", scale = 2)
     private BigDecimal repurExpandIncome;
 
     /**
      * 复购券
      */
-    @Excel(name = "复购券($)", scale = 2)
     private BigDecimal repurCoupon;
 
     /**
      * 复购券均分收益
      */
-    @Excel(name = "复购券均分($)", scale = 2)
     private BigDecimal repurCouponShare;
 
     /**
      * 商城重消
      */
-    @Excel(name = "商城重消($)", scale = 2)
     private BigDecimal backPoints;
 
     /**
      * 平台服务费
      */
-    @Excel(name = "平台服务费($)", scale = 2)
     private BigDecimal serviceSpend;
 
     /**
      * 环球积分
      */
-    @Excel(name = "直推极差($)", scale = 2)
     private BigDecimal globalPoints;
 
     /**
      * 车奖积分
      */
-    @Excel(name = "车奖积分($)", scale = 2)
     private BigDecimal carAwardPoints;
 
     /**
      * 店铺收益
      */
-    @Excel(name = "店铺收益($)", scale = 2)
     private BigDecimal storeIncome;
 
     /**
      * 嗨粉推荐收益
      */
-    @Excel(name = "嗨粉推荐收益($)", scale = 2)
     private BigDecimal hiFunIncome;
 
     /**
      * 首购实发小计
      */
-    @Excel(name = "首购实发小计($)", scale = 2)
     private BigDecimal purRealSubtotal;
 
     /**
      * 云代实发小计
      */
-    @Excel(name = "云代实发小计($)", scale = 2)
     private BigDecimal cloudRealSubtotal;
 
     /**
      * 复购实发小计
      */
-    @Excel(name = "复购实发小计($)", scale = 2)
     private BigDecimal repurRealSubtotal;
 
     /**
      * 复购券小计
      */
-    @Excel(name = "复购券实发小计($)", scale = 2)
     private BigDecimal repurCouponSubtotal;
 
     /**
      * 实发收益总计
      */
-    @Excel(name = "实发收益总计($)", scale = 2)
     private BigDecimal realIncomeTotal;
 
-    /**
+
-     * 结算日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd")
-    private Date settleDate;
 }

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

@@ -3,7 +3,6 @@ package com.hzs.bonus.bonus.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.hzs.common.core.annotation.BigDecimalFormat;
 import com.hzs.common.core.annotation.Excel;
 import com.hzs.common.core.annotation.Transaction;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
@@ -35,7 +34,7 @@ public class MemberBonusDetailSerVO implements Serializable {
      * 结算日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd")
+    @Excel(name = "结算日期", dateFormat = "yyyy-MM-dd")
     private Date settleDate;
     /**
      * 订单主键
@@ -53,7 +52,6 @@ public class MemberBonusDetailSerVO implements Serializable {
      * 订单类型 来源于专区设置
      */
     @JsonIgnore
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_TYPE)
     private Integer orderType;
 
     @Excel(name = "订单类型")
@@ -62,7 +60,6 @@ public class MemberBonusDetailSerVO implements Serializable {
     /**
      * 来源国家名称
      */
-    @Excel(name = "来源国家")
     private String sourceCountryName;
 
     /**
@@ -103,19 +100,16 @@ public class MemberBonusDetailSerVO implements Serializable {
     /**
      * 订单金额
      */
-    @Excel(name = "来源金额($)", scale = 2)
     private BigDecimal orderAmountDollar;
 
     /**
      * 订单业绩
      */
-    @Excel(name = "来源业绩($)", scale = 2)
     private BigDecimal orderAchieve;
 
     /**
      * 结算国家
      */
-    @Excel(name = "结算国家")
     private String settleCountry;
 
     /**
@@ -141,37 +135,33 @@ public class MemberBonusDetailSerVO implements Serializable {
     private String pkSettleGradeVal;
 
     /**
-     * 真实奖衔
+     * 当月奖衔
      */
     @Transaction(transactionKey = EnumsPrefixConstants.KEY_AWARD)
     @JsonIgnore
     private Integer pkAwards;
 
-    @Excel(name = "真实奖衔")
+    @Excel(name = "当月奖衔")
     private String pkAwardsVal;
 
     /**
      * 轮
      */
-    @Excel(name = "直推轮数")
     private Integer round;
 
     /**
      * 次
      */
-    @Excel(name = "直推次数")
     private Integer second;
 
     /**
      * 当前碰次
      */
-    @Excel(name = "当前碰次")
     private Integer currentTouch;
 
     /**
      * 拓展碰次
      */
-    @Excel(name = "拓展碰次")
     private Integer expandTouch;
 
     /**
@@ -186,16 +176,12 @@ public class MemberBonusDetailSerVO implements Serializable {
     @Excel(name = "辅导代数")
     private Integer coachGeneration;
 
-    @Excel(name = "拓展无封", scale = 2)
     private BigDecimal expandNoCappingOri;
 
-    @Excel(name = "拓展封顶", scale = 2)
     private BigDecimal expandCappingOri;
 
-    @Excel(name = "拓展正常减半", scale = 2)
     private BigDecimal expandNormalHalfOri;
 
-    @Excel(name = "拓展实际减半", scale = 2)
     private BigDecimal expandNormalRealOri;
     /**
      * 税前收益
@@ -212,34 +198,28 @@ public class MemberBonusDetailSerVO implements Serializable {
     /**
      * 拓展无封 (拓展收益按等级正常比例结算，拓展收益按等级正常比例结算 无封顶)
      */
-    @Excel(name = "拓展无封($)", scale = 2)
     private BigDecimal expandNoCapping;
     /**
      * 拓展封顶 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益)
      */
-    @Excel(name = "拓展封顶($)", scale = 2)
     private BigDecimal expandCapping;
     /**
      * 拓展正常减半 (拓展收益按等级正常比例结算，不按4-N结算，根据配置的封顶值限制最大收益，拓展封顶（￥）/2)
      */
-    @Excel(name = "拓展正常减半($)", scale = 2)
     private BigDecimal expandNormalHalf;
     /**
      * 拓展实际减半 (拓展收益按4-结算，根据配置的封顶值限制最大收益，税前收益（￥）/2)
      */
-    @Excel(name = "拓展实际减半($)", scale = 2)
     private BigDecimal expandNormalReal;
 
     /**
      * 税前收益
      */
-    @Excel(name = "税前收益($)", scale = 2)
     private BigDecimal pretaxIncome;
 
     /**
      * 实际收益
      */
-    @Excel(name = "实际收益($)", scale = 2)
     private BigDecimal realIncome;
 
     /**
@@ -262,7 +242,6 @@ public class MemberBonusDetailSerVO implements Serializable {
     /**
      * 收益状态
      */
-    @Transaction(transactionKey = EnumsPrefixConstants.BONUS_INCOME_STATUS)
     @JsonIgnore
     private Integer incomeStatus;
 

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

@@ -108,10 +108,10 @@ public class MemberBonusFirstPurchaseVO extends PubMemberBonusVO {
     private BigDecimal retailMonthRepurchaseIncome;
 
     /**
-     * 福利分红收益
+     * 福利分红收益总计
      */
     @BigDecimalFormat
-    private BigDecimal retailBenefitIncome;
+    private BigDecimal retailBenefitIncomeTotal;
 
     /**
      * 新零售收益小计

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

@@ -257,14 +257,11 @@
         cu.member_code source_member_code,cu.member_name
         source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
-        tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction
+        tar.member_code,tar.member_name,
+        bg.pk_transaction pk_settle_grade,ba.pk_transaction
         pk_awards,bv.vertex_name,ct.team_name,
-        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
+        from (
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
-        ) so
-        inner join (
         select * from (
         select
         cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,cd.CAL_ACHIEVE,cd.pretax_income,cd.income_tax,cd.real_income,
@@ -366,12 +363,13 @@
             )
         </if>
         ) b
+        left join sa_order so
         on so.pk_id = b.pk_order
-        inner join cu_member tar
+        left join cu_member tar
         on b.pk_member = tar.pk_id
-        inner join cu_member cu
+        left join cu_member cu
         on so.pk_member = cu.pk_id
-        inner join cu_member_settle_period cp
+        left join cu_member_settle_period cp
         on b.period = cp.pk_id
         left join bd_vertex bv
         on bv.pk_id = tar.pk_vertex
@@ -392,9 +390,6 @@
             <if test="bonusParam.pkCountry != null">
                 and tar.pk_settle_country = #{bonusParam.pkCountry}
             </if>
-            <if test="bonusParam.systemType != null">
-                and cu.system_type = #{bonusParam.systemType}
-            </if>
             <if test="bonusParam.orderType != null">
                 and so.order_type = #{bonusParam.orderType}
             </if>
@@ -445,9 +440,12 @@
     <select id="queryMemberBonusDetailByBonusItemsForServer" resultMap="CuMemberBonusDetail">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,nvl(so.pk_rate,b.pk_rate) pk_rate,
-        nvl(bc.out_exchange_rate,0) out_exchange_rate,nvl(so.order_amount,0) order_amount,nvl(so.order_achieve,0) order_achieve,
+        nvl(bc.out_exchange_rate,0) out_exchange_rate,
+        nvl(so.order_amount,0) order_amount, nvl(so.order_achieve,0) order_achieve,
         b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
-        tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
+        tar.member_code,tar.member_name,
+        bg.pk_transaction pk_settle_grade, ba.pk_transaction pk_awards,
+        bv.vertex_name,ct.team_name,
         b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
         from (
         select cb.pk_member,cd.pk_order,cb.period,cb.pk_country,cd.pk_bonus_items,cd.income_status,
@@ -488,11 +486,14 @@
         ) b
         left join sa_order so
         on so.pk_id = b.pk_order
+        <if test="bonusParam.orderType != null">
+            and so.order_type = #{bonusParam.orderType}
+        </if>
         left join cu_member tar
         on b.pk_member = tar.pk_id
         left join cu_member cu
         on so.pk_member = cu.pk_id
-        inner join cu_member_settle_period cp
+        left join cu_member_settle_period cp
         on b.period = cp.pk_id
         left join bd_vertex bv
         on bv.pk_id = tar.pk_vertex
@@ -516,9 +517,6 @@
             <if test="bonusParam.systemType != null">
                 and cu.system_type = #{bonusParam.systemType}
             </if>
-            <if test="bonusParam.orderType != null">
-                and so.order_type = #{bonusParam.orderType}
-            </if>
             <if test="bonusParam.pkVertex != null">
                 and bv.pk_id = #{bonusParam.pkVertex}
             </if>

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

@@ -167,16 +167,16 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusExpandByBonusItemsForServer" resultMap="CuMemberBonusExpand">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
         b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,b.current_touch,b.expand_touch,
-        b.expand_no_capping,b.expand_capping,b.expand_normal_half,b.expand_normal_real,bct.short_name settle_country from (
+        b.expand_no_capping,b.expand_capping,b.expand_normal_half,b.expand_normal_real,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select cb.pk_member,ce.pk_order,cb.period,cb.pk_country,ce.pk_bonus_items,ce.income_status,ce.CAL_ACHIEVE,ce.pretax_income,ce.income_tax,ce.real_income,

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

@@ -62,6 +62,9 @@
         <result column="SERVICE_CODE" property="serviceCode"/>
         <result column="NICK_NAME" property="nickName"/>
 
+        <result column="RETAIL_RANGE_INCOME" property="retailRangeIncome"/>
+        <result column="RETAIL_SAME_LEVEL_INCOME" property="retailSameLevelIncome"/>
+        <result column="RETAIL_AREA_INCOME" property="retailAreaIncome"/>
         <result column="RETAIL_BENEFIT_RANGE_INCOME" property="retailBenefitRangeIncome"/>
         <result column="RETAIL_MONTH_REPURCHASE_INCOME" property="retailMonthRepurchaseIncome"/>
         <result column="RETAIL_BENEFIT_AVG_INCOME" property="retailBenefitAvgIncome"/>
@@ -503,23 +506,28 @@
     </select>
 
     <select id="queryBonusTotalVoByConditionForServer" resultMap="CuMemberBonus">
-        select cb.period,cp.settle_date,nvl(min(bc.out_exchange_rate),1) out_exchange_rate,sum(cb.direct_income) direct_income,sum(cb.expand_income) expand_income,
+        select cb.period,cp.settle_date,
-        sum(cb.expand_no_capping) expand_no_capping,sum(cb.expand_capping) expand_capping,sum(cb.coach_income) coach_income,
+        nvl(min(bc.out_exchange_rate),1) out_exchange_rate,sum(cb.direct_income) direct_income,
-        sum(cb.share_income) share_income,sum(cb.service_income) service_income,sum(cb.back_points) back_points,
+        sum(cb.expand_income) expand_income, sum(cb.expand_no_capping) expand_no_capping,
-        sum(cb.service_spend) service_spend,sum(cb.pur_real_subtotal) pur_real_subtotal,
+        sum(cb.expand_capping) expand_capping,sum(cb.coach_income) coach_income,
-        sum(cb.repur_push_income) repur_push_income,sum(cb.repur_range_income) repur_range_income,
+        sum(cb.share_income) share_income, sum(cb.service_spend) service_spend,
-        sum(cb.repur_expand_income) repur_expand_income,sum(cb.repur_real_subtotal) repur_real_subtotal,sum(cb.cloud_direct_income) cloud_direct_income,
+        sum(cb.service_income) service_income, sum(cb.back_points) back_points,
-        sum(cb.cloud_pur_income) cloud_pur_income,sum(cb.cloud_repur_income) cloud_repur_income,sum(cb.cloud_real_subtotal) cloud_real_subtotal,
+        sum(cb.pur_real_subtotal) pur_real_subtotal,
-        sum(cb.repur_coupon) repur_coupon,sum(repur_coupon_share) repur_coupon_share,
+        sum(cb.repur_push_income) repur_push_income, sum(cb.repur_range_income) repur_range_income,
-        sum(cb.repur_coupon_subtotal) repur_coupon_subtotal,sum(cb.global_points) global_points,
+        sum(cb.repur_expand_income) repur_expand_income, sum(cb.repur_real_subtotal) repur_real_subtotal,
-        sum(cb.car_award_points) car_award_points,sum(cb.hi_fun_income) hi_fun_income,
+        sum(cb.repur_coupon) repur_coupon, sum(repur_coupon_share) repur_coupon_share,
-        sum(store_income) store_income,sum(cb.maker_direct_income) maker_direct_income,
+        sum(cb.repur_coupon_subtotal) repur_coupon_subtotal,
-        sum(cb.maker_share_income) maker_share_income,sum(cb.maker_real_subtotal) maker_real_subtotal,
+        sum(cb.global_points) global_points, sum(cb.car_award_points) car_award_points,
-        sum(cb.retail_range_income) retail_range_income,sum(cb.retail_same_level_income) retail_same_level_income,
+        sum(cb.retail_range_income) retail_range_income,
+        sum(cb.retail_same_level_income) retail_same_level_income,
         sum(cb.retail_area_income) retail_area_income,
-        sum(cb.retail_benefit_range_income) retail_benefit_range_income,sum(cb.retail_benefit_avg_income) retail_benefit_avg_income,
+        sum(cb.retail_benefit_range_income) retail_benefit_range_income,
-        sum(cb.retail_benefit_income) retail_benefit_income,sum(cb.retail_real_subtotal) retail_real_subtotal,
+        sum(cb.retail_month_repurchase_income) retail_month_repurchase_income,
-        sum(cb.real_income_total) real_income_total from cu_member_bonus cb
+        sum(cb.retail_benefit_avg_income) retail_benefit_avg_income,
+        sum(cb.retail_benefit_income) retail_benefit_income,
+        sum(cb.retail_real_subtotal) retail_real_subtotal,
+        sum(cb.real_income_total) real_income_total
+        from cu_member_bonus cb
         inner join cu_member_settle_period cp
         on cb.period = cp.pk_id
         left join bd_currency bc
@@ -572,6 +580,7 @@
         group by cb.period,cp.settle_date
         order by cb.period desc
     </select>
+
     <select id="batchQueryCuMemberBonusSeq" resultType="java.lang.Long">
         select cu_member_bonus_seq.nextval
         from dual connect by rownum &lt;= #{rowNum}

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

@@ -158,15 +158,15 @@
         </where>
         order by b.period,b.pk_bonus_items,b.real_income desc
     </select>
+
     <select id="queryMemberBonusPushByBonusItemsFoServer" resultMap="CuMemberBonusPush">
         select b.period,cp.settle_date,so.order_code,so.order_type,bt.short_name source_country_name,
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
-        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,(b.round+1) round,b.second,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,(b.round+1) round,b.second,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select cb.pk_member,cp.pk_order,cb.period,cb.pk_country,cp.pk_bonus_items,cp.income_status,cp.CAL_ACHIEVE,cp.pretax_income,cp.income_tax,cp.real_income,

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

@@ -154,10 +154,9 @@
         cu.member_code source_member_code,cu.member_name source_member_name,so.pk_rate,bc.out_exchange_rate,so.order_amount,
         so.order_achieve,b.pk_country,b.pk_bonus_items,b.pretax_income,b.income_tax,b.real_income,b.income_status,
         tar.member_code,tar.member_name,bg.pk_transaction pk_settle_grade,ba.pk_transaction pk_awards,bv.vertex_name,ct.team_name,
-        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country from (
+        b.remark,b.income_ratio,b.income_dial_ratio,b.order_dial_ratio,bct.short_name settle_country
+        from (
         select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_order
-        union
-        select pk_id,pk_member,order_code,order_type,pk_rate,pk_country,order_amount,order_achieve from sa_t_order
         ) so
         inner join (
         select

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessDetailMapper.xml

@@ -4,29 +4,20 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.detail.CuMemberAssessDetail">
-        <id column="PK_ID" property="pkId" />
+        <id column="PK_ID" property="pkId"/>
-        <result column="DEL_FLAG" property="delFlag" />
+        <result column="DEL_FLAG" property="delFlag"/>
-        <result column="PK_COUNTRY" property="pkCountry" />
+        <result column="PK_COUNTRY" property="pkCountry"/>
-        <result column="CREATION_TIME" property="creationTime" />
+        <result column="CREATION_TIME" property="creationTime"/>
-        <result column="MODIFIED_TIME" property="modifiedTime" />
+        <result column="MODIFIED_TIME" property="modifiedTime"/>
-        <result column="PK_ASSESS" property="pkAssess" />
+        <result column="PK_ASSESS" property="pkAssess"/>
-        <result column="PK_MEMBER" property="pkMember" />
+        <result column="PK_MEMBER" property="pkMember"/>
-        <result column="PK_ORDER" property="pkOrder" />
+        <result column="PK_ORDER" property="pkOrder"/>
-        <result column="CHANGE_TYPE" property="changeType" />
+        <result column="CHANGE_TYPE" property="changeType"/>
-        <result column="TRADE_TIME" property="tradeTime" />
+        <result column="TRADE_TIME" property="tradeTime"/>
-        <result column="PK_CREATOR" property="pkCreator" />
+        <result column="PK_CREATOR" property="pkCreator"/>
-        <result column="PK_MODIFIED" property="pkModified" />
+        <result column="PK_MODIFIED" property="pkModified"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        DEL_FLAG,
-        PK_COUNTRY,
-        CREATION_TIME,
-        MODIFIED_TIME,
-        PK_ID, PK_ASSESS, PK_MEMBER, PK_ORDER, CHANGE_TYPE, TRADE_TIME, CREATOR, MODIFIED
-    </sql>
-
     <insert id="insertCuMemberAssessDetailByPeriod">
         merge into cu_member_assess_detail a
         using (select ca.pk_id,ca.pk_member,(case when ca.assess_type=0 then 1 else 3 end) change_type,
@@ -40,53 +31,65 @@
         on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type=b.change_type)
         when not matched then
         insert (pk_assess,pk_member,change_type,trade_achieve, pk_creator,pk_country)
-            values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
+        values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
     </insert>
 
     <insert id="insertCuMemberAssesDetailByOrder">
-        insert into cu_member_assess_detail (pk_assess,pk_member,PK_ORDER,change_type,trade_achieve,TRADE_TIME, pk_creator,pk_country)
+        insert into cu_member_assess_detail (pk_assess, pk_member, PK_ORDER, change_type, trade_achieve, TRADE_TIME, pk_creator, pk_country)
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
+        select nvl(ca.pk_id, 0) PK_ASSESS,
-        0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
+               so.PK_MEMBER,
-        pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so
+               so.pk_id         pk_order,
-        left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
+               0                CHANGE_TYPE,
-        on so.pk_member = ca.pk_member
+               order_achieve    TRADE_ACHIEVE,
-        where so.del_flag=0 and so.order_status=1 and order_type in(3,12,14,22,26,31)
+               pay_time         TRADE_TIME,
-        and so.order_achieve >0
+               so.PK_MEMBER,
-        and pay_time >=#{startDate, jdbcType=DATE}
+               so.pk_country
-        and pay_time &lt; #{endDate, jdbcType=DATE}
+        from sa_order so
-        union
+                 left join (select * from ${tableName} where period = #{period} and ASSESS_TYPE = 0) ca
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
+                           on so.pk_member = ca.pk_member
-               0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
+        where so.del_flag = 0
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_t_order so
+          and so.order_status = 1
-       left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
+          and order_type in (3, 12, 14, 22, 26, 31)
-                    on so.pk_member = ca.pk_member
+          and so.order_achieve > 0
-        where so.del_flag=0 and so.order_status=1 and order_type in (21)
+          and pay_time >= #{startDate, jdbcType=DATE}
-          and so.order_achieve >0
-          and pay_time >=#{startDate, jdbcType=DATE}
           and pay_time &lt; #{endDate, jdbcType=DATE}
         union
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
+        select nvl(ca.pk_id, 0)  PK_ASSESS,
-               2 CHANGE_TYPE,order_ass_achieve TRADE_ACHIEVE,
+               so.PK_MEMBER,
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so
+               so.pk_id          pk_order,
-        left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=1) ca
+               2                 CHANGE_TYPE,
-                   on so.pk_member = ca.pk_member
+               order_ass_achieve TRADE_ACHIEVE,
-        where so.del_flag=0 and so.order_status=1 and order_type =13
+               pay_time          TRADE_TIME,
-          and pay_time >=#{startDate, jdbcType=DATE}
+               so.PK_MEMBER,
+               so.pk_country
+        from sa_order so
+                 left join (select * from ${tableName} where period = #{period} and ASSESS_TYPE = 1) ca
+                           on so.pk_member = ca.pk_member
+        where so.del_flag = 0
+          and so.order_status = 1
+          and order_type = 13
+          and pay_time >= #{startDate, jdbcType=DATE}
           and pay_time &lt; #{endDate, jdbcType=DATE}
     </insert>
 
     <update id="updateCuMemberAssessDetailByPeriod">
         merge into cu_member_assess_detail a
-        using (select pk_id,pk_member,(case when assess_type=0 then 1 else 3 end)change_type,
+            using (select pk_id,
-        assess_target trade_achieve,pk_creator,pk_country from ${tableName}
+                          pk_member,
-        where assess_status=2 and period = #{period}
+                          (case when assess_type = 0 then 1 else 3 end) change_type,
-        and assess_target &lt;= month_balance+month_add) b
+                          assess_target                                 trade_achieve,
-        on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type=b.change_type)
+                          pk_creator,
-        when matched then
+                          pk_country
-        update set a.trade_achieve = b.trade_achieve
+                   from ${tableName}
-        when not matched then
+                   where assess_status = 2
-        insert (pk_assess,pk_member,change_type,trade_achieve, pk_creator,pk_country)
+                     and period = #{period}
-            values(b.pk_id,b.pk_member,b.change_type,b.trade_achieve, b.pk_creator,b.pk_country)
+                     and assess_target &lt;= month_balance + month_add) b
+            on (a.pk_assess = b.pk_id and a.pk_member = b.pk_member and a.change_type = b.change_type)
+            when matched then
+                update set a.trade_achieve = b.trade_achieve
+            when not matched then
+                insert (pk_assess, pk_member, change_type, trade_achieve, pk_creator, pk_country)
+                    values (b.pk_id, b.pk_member, b.change_type, b.trade_achieve, b.pk_creator, b.pk_country)
     </update>
 
     <update id="updateCuMemberAssessDetailByRevoke">
@@ -99,9 +102,14 @@
         when matched then
         update set a.del_flag=1
     </update>
+
     <delete id="deleteCuMemberAssessDetailByPeriod">
-        DELETE  FROM  cu_member_assess_detail  WHERE  pk_assess  IN  (
+        DELETE
-        SELECT  pk_id  FROM  ${tableName}  WHERE  period= #{period})
+        FROM cu_member_assess_detail
+        WHERE pk_assess IN (
+            SELECT pk_id
+            FROM ${tableName}
+            WHERE period = #{period})
     </delete>
 
 </mapper>

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml

@@ -155,12 +155,6 @@
             #{item}
         </foreach>
         and pay_time >= #{startDate, jdbcType=DATE} and pay_time &lt; #{endDate, jdbcType=DATE}
-       <!-- <if test="assessType == 0">
-            union all
-            select pk_member,order_achieve order_achieve from sa_t_order
-            where del_flag = 0 and order_status = 1 and order_type =21
-            and pay_time >= #{startDate, jdbcType=DATE} and pay_time &lt; #{endDate, jdbcType=DATE}
-        </if>-->
         )
         group by pk_member
         ) b

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -1623,8 +1623,6 @@
         where 1 = 1 and cm.DEL_FLAG = 0 and cm.pay_status=1 and cm.PK_SETTLE_GRADE = 1
         and (
         (select count(so.PK_ID) from sa_order so where so.PK_MEMBER = cm.pk_id and so.DEL_FLAG = 0 and so.ORDER_STATUS = 1) > 0
-        or
-        (select count(sto.PK_ID) from sa_t_order sto where sto.PK_MEMBER = cm.pk_id and sto.DEL_FLAG = 0 and sto.ORDER_STATUS = 1) > 0
         )
         <if test="memberInfo != null and memberInfo != ''">
             and (cm.member_code=#{memberInfo} or cm.member_name=#{memberInfo})

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberShareMapper.xml

@@ -14,8 +14,6 @@
         and
         (
         (select count(so.PK_ID) from sa_order so where so.PK_CREATOR = ms.pk_id and so.del_flag = 0 and so.ORDER_STATUS = 1) = 0
-        and
-        (select count(sto.PK_ID) from sa_t_order sto where sto.PK_CREATOR = ms.pk_id and sto.del_flag = 0 and sto.ORDER_STATUS = 1) = 0
         )
         <if test="pkMember != null">
             and ms.PK_PARENT = #{pkMember}

bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberAssessDetailMapper.xml

@@ -55,16 +55,6 @@
         and pay_time >=#{startDate, jdbcType=DATE}
         and pay_time < #{endDate, jdbcType=DATE}
         union
-        select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
-               0 CHANGE_TYPE,order_achieve TRADE_ACHIEVE,
-               pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_t_order so
-       left join  (select * from ${tableName} where period = #{period} and ASSESS_TYPE=0) ca
-                    on so.pk_member = ca.pk_member
-        where so.del_flag=0 and so.order_status=1 and order_type in (21)
-          and so.order_achieve >0
-          and pay_time >=#{startDate, jdbcType=DATE}
-          and pay_time < #{endDate, jdbcType=DATE}
-        union
         select nvl(ca.pk_id,0) PK_ASSESS,so.PK_MEMBER,so.pk_id pk_order,
                2 CHANGE_TYPE,order_ass_achieve TRADE_ACHIEVE,
                pay_time TRADE_TIME,so.PK_MEMBER,so.pk_country from sa_order so

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/BlankRegistrationParam.java

@@ -1,56 +0,0 @@
-package com.hzs.sale.order.param;/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/4/7 9:54
- * @Classname: BlankRegistrationParam
- * @PackageName: com.hzs.sale.order.param
- */
-
-import lombok.Data;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- *@BelongsProject: hzs_cloud
- *@BelongsPackage: com.hzs.sale.order.param
- *@Author: yh
- *@CreateTime: 2023-04-07  09:54
- *@Description: TODO
- *@Version: 1.0
- */
-@Data
-public class BlankRegistrationParam {
-
-    /**
-     * 空单注册基本参数
-     */
-    private  OrderBlankRegParams orderBlankRegParams;
-
-
-
-    /**
-     * 提交方式 （对应枚举EsubmitType）
-     */
-    private Integer processType;
-    /**
-     * 签呈类型
-     */
-    private Integer signType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-    /**
-     * 签呈附件
-     */
-    private List<String> fileList;
-    /**
-     * 业务涨及会员ID列表 --提交审核必传
-     */
-    private Set<Long> pkMemberList;
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/CuMemberAccountParam.java

@@ -6,13 +6,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-/**
- * @Description:
- * @Author: sui q
- * @Time: 2022/9/21 17:56
- * @Classname: CuMemberAccountParam
- * @PackageName: com.hzs.sale.order.param
- */
 @Data
 public class CuMemberAccountParam implements Serializable {
 

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java

@@ -1,72 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description: 海粉确认订单入参
- * @Author: jiang chao
- * @Time: 2023/9/7 16:56
- * @Classname: FansConfirmOrder
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderParam {
-
-    /***
-     * 自然国
-     */
-    private Integer pkCountry;
-
-    /**
-     * 会员姓名
-     */
-    private String memberName;
-
-    /**
-     * 联系方式
-     */
-    private String phone;
-
-    /**
-     * 收货人
-     */
-    private String recName;
-
-    /**
-     * 收货电话
-     */
-    private String recPhone;
-
-    /**
-     * 收货省
-     */
-    private Integer recProvince;
-
-    /**
-     * 收货市
-     */
-    private Integer recCity;
-
-    /**
-     * 收货县
-     */
-    private Integer recCounty;
-
-    /**
-     * 收货地址
-     */
-    private String recAddress;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 商品列表
-     */
-    private List<FansConfirmOrderWaresParam> waresList;
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java

@@ -1,25 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-/**
- * @Description: 海粉确认订单产品入参
- * @Author: jiang chao
- * @Time: 2023/9/7 19:37
- * @Classname: FansConfirmOrderSkuParam
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderSkuParam {
-
-    /**
-     * SKU ID
-     */
-    private Long pkWaresSku;
-
-    /**
-     * 产品数量
-     */
-    private Integer quantity;
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java

@@ -1,32 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description: 海粉确认订单商品入参
- * @Author: jiang chao
- * @Time: 2023/9/7 17:32
- * @Classname: FansConfirmOrderProductParam
- * @PackageName: com.hzs.sale.order.param
- */
-@Data
-public class FansConfirmOrderWaresParam {
-
-    /**
-     * 商品ID
-     */
-    private Integer pkWares;
-
-    /**
-     * 商品数量
-     */
-    private Integer quantity;
-
-    /**
-     * 产品列表
-     */
-    private List<FansConfirmOrderSkuParam> skuList;
-
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/OrderGoalsParam.java

@@ -1,44 +0,0 @@
-package com.hzs.sale.order.param;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 订单目标参数
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/5/18 15:37
- * @Classname: OrderGoalsParam
- * @Package_name: com.hzs.sale.order.param
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class OrderGoalsParam implements Serializable {
-    private static final long serialVersionUID = -5753816382872744078L;
-    /**
-     * 会员ID
-     */
-    private Long pkMember;
-    /**
-     * 国家ID
-     */
-    private Integer pkCountry;
-    /**
-     * 开始时间
-     */
-    private String startDate;
-    /**
-     * 结束时间
-     */
-    private String endDate;
-
-    /**
-     * 安置部门
-     */
-    private Integer placeDept;
-}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/SelfPickUpParam.java

@@ -10,12 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * @description: 会员端自提
+ * 会员端自提
- * @author: sui q
- * @time: 2023/4/19 17:32
- * @classname: SelfPickUpVO
- * @package_name: com.hzs.sale.order.param
- * version 1.0.0
  */
 @Data
 @Builder

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/SaTOrderQueryVO.java

@@ -1,184 +0,0 @@
-package com.hzs.sale.order.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.hzs.common.core.annotation.Excel;
-import com.hzs.common.core.annotation.Transaction;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Description: 查询商品订单VO
- * @Author: jiang chao
- * @Time: 2023/5/29 17:48
- * @Classname: SaTOrderQueryVO
- * @PackageName: com.hzs.sale.order.vo
- */
-@Data
-public class SaTOrderQueryVO {
-
-    /**
-     * 订单ID
-     */
-    private Long pkOrder;
-    /**
-     * 订单明细ID
-     */
-    private Long pkOrderItems;
-
-    /**
-     * 产品名称
-     */
-    @Excel(name = "产品名称")
-    private String productName;
-    /**
-     * 产品规格
-     */
-    @Excel(name = "产品规格")
-    private String specsName;
-    /**
-     * 产品单价
-     */
-    @Excel(name = "产品单价(¥)")
-    private BigDecimal price;
-    /**
-     * 产品业绩
-     */
-    @Excel(name = "产品业绩($)")
-    private BigDecimal achievement;
-
-    /**
-     * 订单状态 (0=待付款,1=已付款,2=已合单,3=待收货,4=已撤单,5=已收货)
-     */
-    @Transaction(transactionKey = EnumsPrefixConstants.ORDER_STATUS)
-    private Integer orderStatus;
-    /**
-     * 订单状态显示
-     */
-    @Excel(name = "发货状态")
-    private String orderStatusVal;
-
-    /**
-     * 物流单号
-     */
-    @Excel(name = "物流单号")
-    private String logisticsCode;
-    /**
-     * 物流公司
-     */
-    @Excel(name = "物流公司")
-    private String logisticsCompany;
-    /**
-     * 产品数量
-     */
-    @Excel(name = "产品数量")
-    private Integer quantity;
-
-    /**
-     * 订单编号
-     */
-    @Excel(name = "订单编号")
-    private String orderCode;
-
-    /**
-     * 会员编号
-     */
-    @Excel(name = "会员编号")
-    private String memberCode;
-
-    /**
-     * 会员名称
-     */
-    @Excel(name = "会员姓名")
-    private String memberName;
-
-    /**
-     * 收货人
-     */
-    @Excel(name = "收货人")
-    private String recName;
-
-    /**
-     * 收货电话
-     */
-    @Excel(name = "联系方式")
-    private String recPhone;
-
-    /**
-     * 省
-     */
-    private Integer recProvince;
-    /**
-     * 省显示
-     */
-    @Excel(name = "省")
-    private String recProvinceVal;
-
-    /**
-     * 市
-     */
-    private Integer recCity;
-    /**
-     * 市显示
-     */
-    @Excel(name = "市")
-    private String recCityVal;
-
-    /**
-     * 县
-     */
-    private Integer recCounty;
-    /**
-     * 县显示
-     */
-    @Excel(name = "区/县")
-    private String recCountyVal;
-
-    /**
-     * 收货地址
-     */
-    @Excel(name = "详细地址")
-    private String recAddress;
-
-    /**
-     * 订单金额
-     */
-    @Excel(name = "订单金额(¥)")
-    private BigDecimal orderAmount;
-
-    /**
-     * 订单业绩
-     */
-    @Excel(name = "订单业绩($)")
-    private BigDecimal orderAchieve;
-
-    /**
-     * 邮费
-     */
-    @Excel(name = "邮费(¥)")
-    private BigDecimal postage;
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date creationTime;
-
-    /**
-     * 支付时间
-     */
-    @Excel(name = "支付时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date payTime;
-
-
-}

bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java

@@ -22,21 +22,6 @@ public class BonusFieldConstants {
      */
     public static final String INCOME_RATIO= "incomeRatio";
 
-    /**
-     * 首购实发小计
-     */
-    public static final String PUR_REAL_SUBTOTAL= "purRealSubtotal";
-
-    /**
-     * 复购实发小计
-     */
-    public static final String REPUR_REAL_SUBTOTAL= "repurRealSubtotal";
-
-    /**
-     * 云代实发小计
-     */
-    public static final String CLOUD_REAL_SUBTOTAL= "cloudRealSubtotal";
-
     /**
      * 实发收益总计
      */
@@ -52,10 +37,6 @@ public class BonusFieldConstants {
      */
     public static final String SETTLE_DATE = "SETTLE_DATE";
 
-    public static final String IS_SETTLE = "IS_SETTLE";
-
-    public static final String IS_PUBLISH = "IS_PUBLISH";
-
     public static final String PUBLISH_DATE = "PUBLISH_DATE";
 
     public static final String IS_GRANT = "IS_GRANT";
@@ -63,10 +44,6 @@ public class BonusFieldConstants {
 
     public static final String IS_WITHDRAWAL = "IS_WITHDRAWAL";
 
-    public static final String WITHDRAWAL_DATE = "WITHDRAWAL_DATE";
-
-    public static final String IS_RETRY = "IS_RETRY";
-
     /**
      * 人民币收益后缀
      */

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

@@ -48,4 +48,17 @@ public enum EBonusIncomeStatus {
      * 国际化翻译key值
      */
     private final String key;
+
+    public static String getEnumLabelByValue(Integer value) {
+        if (null == value) {
+            return "";
+        }
+        for (EBonusIncomeStatus enums : EBonusIncomeStatus.values()) {
+            if (enums.getValue() == value) {
+                return enums.getLabel();
+            }
+        }
+        return "";
+    }
+
 }

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

@@ -106,7 +106,10 @@ public enum EOrderType {
      * @param value
      * @return
      */
-    public static EOrderType getEnumByValue(int value) {
+    public static EOrderType getEnumByValue(Integer value) {
+        if (null == value) {
+            return null;
+        }
         for (EOrderType eOrderType : EOrderType.values()) {
             if (eOrderType.getValue() == value) {
                 return eOrderType;
@@ -121,7 +124,10 @@ public enum EOrderType {
      * @param value
      * @return
      */
-    public static String getEnumLabelByValue(int value) {
+    public static String getEnumLabelByValue(Integer value) {
+        if (null == value) {
+            return "";
+        }
         for (EOrderType eOrderType : EOrderType.values()) {
             if (eOrderType.getValue() == value) {
                 return eOrderType.getLabel();

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberBonusExt.java

@@ -78,4 +78,9 @@ public class CuMemberBonusExt extends CuMemberBonus {
      */
     private String nickName;
 
+    /**
+     * 福利分红收益总计
+     */
+    private BigDecimal retailBenefitIncomeTotal;
+
 }