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

@@ -118,7 +118,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         BigDecimal boxNum = BigDecimal.ZERO;
         for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
             if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) {
-                boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
+                boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
             }
         }
         saOrderExt.setBoxNum(boxNum);
@@ -256,7 +256,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
         BigDecimal boxNum = BigDecimal.ZERO;
         for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
             if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) {
-                boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
+                boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
             }
         }
         saOrderExt.setBoxNum(boxNum);
@@ -513,7 +513,7 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 BigDecimal boxNum = BigDecimal.ZERO;
                 for (SaOrderWaresExt saOrderItems : saOrderExt.getOrderWaresExtList()) {
                     if (RetailConstants.ALL_BOX_WARES_LIST.contains(saOrderItems.getWaresCode())) {
-                        boxNum = boxNum.add(saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
+                        boxNum = boxNum.add(saOrderItems.getBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity())));
                     }
                 }
                 // 个人累计消费pv

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

@@ -126,7 +126,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
             bonusSettleRangeHandle.calculateRetailBonusByDay(settleDate, cuMemberBonusMap, bonusConfigDTO, recordDetailVO,
                     period, yesterdayPeriod, isSameMonth);
 
-            // new 每月1号，需要计算4个月奖
+            // TODO new 每月1号，需要计算4个月奖
             if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) {
                 // 测试环境，每天都执行
                 // 计算新零售团队福利、福利分红等奖金
@@ -142,8 +142,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
             Date currentDate = DateUtils.afterDate(1, ChronoUnit.DAYS, DateUtils.parseStringToDate(settleDate));
             String afterDate = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, currentDate);
             if (afterDate.endsWith("01")) {
-                log.info("afterDate: {}", afterDate);
+                // TODO new 区域考核处理
-                log.info("settleDate: {}", settleDate);
                 // 计算完月奖，计算考核（区域6个月要达到蓝宝以上）
                 String rangeTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
                 cuRegionAssessService.assessRegionByEveryMonth(settleDate, rangeTableName);

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml

@@ -61,7 +61,7 @@
             <result column="WARES_PRICE" property="waresPrice"/>
             <result column="WARES_CODE" property="waresCode"/>
             <result column="AREA_INCOME" property="areaIncome"/>
-            <result column="WARES_BOX_NUM" property="waresBoxNum"/>
+            <result column="BOX_NUM" property="boxNum"/>
         </collection>
         <collection property="orderItemsExtList" ofType="com.hzs.common.domain.sale.ext.SaOrderItemsExt">
             <result column="SI_ITEMS_ID" property="pkId"/>
@@ -157,7 +157,7 @@
         nvl(bw.wares_code,'~') wares_code,
         nvl(st.wares_quantity,0) wares_quantity,
         nvl(bw.area_income, 0) area_income,
-        nvl(bw.box_num, 0) wares_box_num
+        nvl(bw.box_num, 0) box_num
         from sa_order so
         left join sa_order_wares st
         on so.pk_id = st.pk_order and st.wares_price > 0

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java

@@ -267,9 +267,6 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
      */
     private CuMemberRetailAchieveVO getMemberBigAndSmallAchieve(List<CuMemberRetailAchieveVO> memberAchieveList, BigDecimal rate) {
         //查询最大业绩
-        if(ObjectUtil.isEmpty(memberAchieveList)){
-            return null;
-        }
         CuMemberRetailAchieveVO maxAchieveVO = memberAchieveList.stream().max(Comparator.comparing(CuMemberRetailAchieveVO::getArealPv)).get();
         //查询小区业绩
         BigDecimal smallAreaPv = memberAchieveList.stream().filter(achieveVO -> !achieveVO.getPkMember().equals(maxAchieveVO.getPkMember())).map(vo -> null == vo.getArealPv() ? BigDecimal.ZERO : vo.getArealPv()).reduce(BigDecimal.ZERO, BigDecimal::add);

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/SaOrderWaresExt.java

@@ -23,6 +23,6 @@ public class SaOrderWaresExt extends SaOrderWares {
     /**
      * 商品上传盒数
      */
-    private BigDecimal waresBoxNum;
+    private BigDecimal boxNum;
 
 }