## 秒杀订单按复购走业绩和奖金处理；秒杀订单拨比算在复购里面；

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

@@ -9,20 +9,13 @@ import org.springframework.stereotype.Component;
 import java.util.*;
 
 /**
- * @Description: 计算商城订单
+ * 计算商城订单
- * @Author: sui q
- * @Time: 2023/2/10 17:56
- * @Classname: BonusSettleMallHandle
- * @PackageName: com.hzs.member.bonus.service.impl
  */
 @Component
 public class BonusSettleMallHandle extends BonusSettleHandle {
 
     /**
-     * @Description: 计算商城业绩，用于计算商城业绩
+     * 计算商城业绩，用于计算商城业绩
-     * @return: void
-     * @Author: sui q
-     * @Date: 2022/11/10 14:17
      */
     void calculateMallBonus(Map<Long, CuMemberSettleExt> cuMemberSettleExtMap, String settleTableName, List<SaOrderExt> mallSaOrderList, BonusConfigDTO bonusConfigDTO) {
         List<SaOrderExt> queryMallSaOrderList = new ArrayList<>();

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

@@ -992,10 +992,11 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
             firPurchaseOrderList.add(saOrderExt);
         } else if (Objects.equals(EOrderType.FICTITIOUS_ORDER.getValue(), saOrderExt.getOrderType())) {
             firPurchaseOrderList.add(saOrderExt);
-        } else if (Objects.equals(EOrderType.REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())) {
+        } else if (Objects.equals(EOrderType.REPURCHASE_ORDER.getValue(), saOrderExt.getOrderType())
+                || Objects.equals(EOrderType.MALL_ORDER.getValue(), saOrderExt.getOrderType())) {
             repurchaseOrderList.add(saOrderExt);
         } else {
-            mallOrderList.add(saOrderExt);
+//            mallOrderList.add(saOrderExt);
             // 商城订单也计算复购量奖
             repurchaseOrderList.add(saOrderExt);
         }

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java

@@ -138,7 +138,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
                     // 复购
                     case REPURCHASE_ORDER:
                     case CONSUME_ORDER:
-                        // 复购订单、重消订单
+                    case MALL_ORDER:
+                        // 复购订单、重消订单、秒杀订单
                         oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
                         break;

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java

@@ -273,7 +273,8 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
                     // 复购
                     case REPURCHASE_ORDER:
                     case CONSUME_ORDER:
-                        // 复购订单、重消订单
+                    case MALL_ORDER:
+                        // 复购订单、重消订单、秒杀订单
                         oldSo.setMainRepurAmount(addOrInitializeAmount(oldSo.getMainRepurAmount(), newSo.getOrderAmount(), type));
                         oldSo.setMainRepurPv(addOrInitializeAmount(oldSo.getMainRepurPv(), newSo.getOrderAchieve(), type));
                         break;

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

@@ -682,7 +682,7 @@
         so.MODIFIED_TIME modifiedTime
         from sa_order so
         inner JOIN CU_MEMBER cm on so.PK_MEMBER = cm.pk_id
-        where so.ORDER_TYPE in (1, 2, 3, 20, 24, 25, 26) and cm.DEL_FLAG = 0
+        where so.ORDER_TYPE in (1, 2, 3, 14, 20, 24, 25, 26) and cm.DEL_FLAG = 0
         <if test="pkCountry != null">
             and so.pk_country = #{pkCountry}
         </if>

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

@@ -774,7 +774,7 @@
         connect by pk_place_parent = prior pk_member
         ) cm
         INNER JOIN SA_ORDER so on so.pk_member = cm.pk_member
-        where so.ORDER_TYPE in (1, 2, 3, 20, 24, 25, 26)
+        where so.ORDER_TYPE in (1, 2, 3, 14, 20, 24, 25, 26)
         <if test="pkCountry != null">
             and so.pk_country = #{pkCountry}
         </if>