yujian
2020-04-02 0ec22dcf4fd9c4496e6f681e7fab89f56c6e4e8a
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;
@@ -166,6 +167,9 @@
   @Resource
   private HongBaoV2AddManager hongBaoV2AddManager;
   @Resource
   private OrderTeamRewardService orderTeamRewardService;
   /**
    * 是否是分享订单
    * 
@@ -214,11 +218,14 @@
            String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
                  list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {
               // 处理饿了么订单
               elmeOrderMap.put(orderId, list);
            }
            else {
               // 饿了么订单开始归入到淘宝订单
               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil
                     .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {
                  fanliOrderMap.put(orderId, list);
               } else {
                  elmeOrderMap.put(orderId, list);
               }
            } else {
               if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())
                     || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 设置渠道ID当做会员运营ID的位置ID
                  fanliOrderMap.put(orderId, list);
@@ -668,9 +675,16 @@
         if (oldOrder == null) {
            Long targetUid = null;
            if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)
                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {
                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理非返利商品库的商品
               targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
            } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)
                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理饿了么的订单
               UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService
                     .getByRelationId(orderList.get(0).getRelationId());
               if (extraInfo != null) {
                  targetUid = extraInfo.getUser().getId();
               }
            } else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {
               UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService
                     .getBySpecialId(orderList.get(0).getSpecialId());
@@ -1339,4 +1353,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);
   }
}