## 秒结报错语句处理；下单成功暂时不推送MQ秒结处理；

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

@@ -412,7 +412,7 @@ public class CuMemberTreeServiceImpl extends ServiceImpl<CuMemberTreeMapper, CuM
 
     @Override
     public void updateCuMemberSecondPlaceParent(String secondTableName, String settleTableName, String yesSettleTableName, Long pkMember, List<?> cuMemberTreeList, Integer isPlace) {
-        if (DateUtils.getCurrentHour() < 2) {
+        if (DateUtils.getCurrentHour() < 1) {
             settleTableName = yesSettleTableName;
         }
         baseMapper.updateCuMemberSecondPlaceParent(secondTableName, settleTableName, pkMember, cuMemberTreeList, isPlace);

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

@@ -420,6 +420,8 @@ public abstract class BonusSettleHandle {
                 cuMemberSettleExt.setRepurchaseBloNewPv(BigDecimal.ZERO);
                 cuMemberSettleExt.setHiFunBloNewPv(BigDecimal.ZERO);
                 cuMemberSettleExt.setMallBloNewPv(BigDecimal.ZERO);
+                cuMemberSettleExt.setANewBox(0);
+                cuMemberSettleExt.setBNewBox(0);
                 cuMemberSettleExtMap.put(cuMemberSettleExt.getPkMember(), cuMemberSettleExt);
             }
         });

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/listener/SaOrderSecondListener.java

@@ -33,7 +33,7 @@ public class SaOrderSecondListener {
         channel.basicAck(deliveryTag, false);
         try {
             Thread.sleep(500);
-            // 乐享订单当日订单只计算奖衔
+            // 订单当日订单只计算奖衔
             bonusSettleService.calculateCumberBonusBySecond(saOrderExt.getOrderCode());
         } catch (Exception e) {
             e.printStackTrace();

bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml

@@ -517,7 +517,7 @@
             #{item.hiFunAmount} hi_fun_amount, #{item.hiFunPv} hi_fun_pv, #{item.hiFunNewPv} hi_fun_new_pv,
             #{item.mallAmount} mall_amount, #{item.mallPv} mall_pv, #{item.mallNewPv} mall_new_pv,
             #{item.minAchieve} min_achieve, #{item.round} round, #{item.second} second ,
-            #{item.aNewBox} a_new_box, #{item.bNewBox} b_new_box,
+            #{item.aNewBox} a_new_box, #{item.bNewBox} b_new_box
             from dual
         </foreach>
         ) b
@@ -1070,11 +1070,13 @@
         st.repurchase_amount,st.repurchase_pv,st.repurchase_new_amount,st.repurchase_new_pv,
         st.hi_fun_amount,st.hi_fun_pv,st.hi_fun_new_amount,st.hi_fun_new_pv,
         st.mall_amount,st.mall_pv,st.mall_new_amount,st.mall_new_pv,
-        st.round,st.second,st.min_achieve,st.expire_status from
+        st.round,st.second,st.min_achieve,st.expire_status
+        from
         (
         select pk_id,pk_parent,pk_place_parent,place_dept,member_code,member_name,pk_center_code,pk_settle_grade
         pk_grade,pk_awards,account_status,register_authority,customer_type,
-        income_status,pk_settle_country,purchase_status,share_status,category,is_maker_space from cu_member
+        income_status,pk_settle_country,purchase_status,share_status,category,is_maker_space
+        from cu_member
         where del_flag= 0 and pk_id in
         <foreach collection="cuMemberTreeList" item="item" open="(" close=")" separator=",">
             #{item}

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java

@@ -912,9 +912,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             sendMessage(newCuMember);
             log.info("生产活动消息，activity.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
             rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
-            //计算奖金，通过mq分发消息，异步处理
+//            //计算奖金，通过mq分发消息，异步处理
-            log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
+//            log.info("生产秒结消息，order.second.exchange：{}", JSONUtil.toJsonStr(saOrderExt));
-            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
+//            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
 
             if (EOrderType.REGISTER_ORDER.getValue() == saOrderExt.getOrderType()) {
                 // 推送会员续约处理MQ
@@ -1066,7 +1066,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
             throw new RuntimeException("保存会员失败!!!");
         }
         try {
-            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
+//            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
             rabbitTemplate.convertAndSend(RabbitMqConstants.ACTIVITY_EXCHANGE, RabbitMqConstants.ACTIVITY_KEY, saOrderExt);
 
             if (EOrderType.UPGRADE_ORDER.getValue() == saOrderExt.getOrderType()) {
@@ -1173,8 +1173,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                                 .eMemberContinue(EMemberContinue.BUY_GIFT)
                                 .build());
             }
-            // 推送秒结数据
+//            // 推送秒结数据
-            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
+//            rabbitTemplate.convertAndSend(RabbitMqConstants.ORDER_SECOND_EXCHANGE, RabbitMqConstants.ORDER_SECOND_KEY, saOrderExt);
         } catch (Exception e) {
             e.printStackTrace();
         }