Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -73,6 +73,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

@@ -165,6 +166,9 @@


   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;



   @Resource

   private OrderTeamRewardService orderTeamRewardService;



   /**

    * 是否是分享订单

@@ -494,6 +498,7 @@
                           hongBaoOrder.getCommonOrder().getSourceType(), key);

                     return TransactionStatus.CommitTransaction;

                  } catch (Exception e) {

                     e.printStackTrace();

                     return TransactionStatus.RollbackTransaction;

                  }

               }

@@ -547,7 +552,7 @@
               if (drawBack == null) {// 还未扣款

                  OrderLogHelper.taoBaoWeiQuan("已到账未扣款处理:子订单号:" + order.getOrderItemId());

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(),true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

@@ -738,7 +743,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (!Constant.IS_TEST)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

@@ -1337,4 +1343,28 @@
      return false;

   }



   @Override

   public void fanliOrderTeamReward() {

      Date time = new Date();

      long count = orderTeamRewardService.countCanSettleUid(time);

      int pageSize = 500;

      int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

      List<Long> uidList = new ArrayList<>();

      for (int i = 0; i < page; i++) {

         List<Long> list = orderTeamRewardService.listCanSettleUid(time, i + 1, pageSize);

         if (list != null && list.size() > 0)

            uidList.addAll(list);

      }

      // 添加到队列

      if (uidList != null)

         for (Long uid : uidList)

            if (!Constant.IS_TEST)

               CMQManager.getInstance().addFanLiOrderTeamRewardMsg(uid);

   }



   @Override

   public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException {

      orderMoneySettleService.orderTeamRewardSettle(uid);

   }



}