饿了么绘图，添加口碑

admin

2020-05-19 744594ef1a2f530fc3e86ea9dc48b62247f79420

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

@@ -30,10 +30,12 @@
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.dto.mq.UidDateDTO;

import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;

import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;

import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;

import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;

import com.yeshi.fanli.dto.order.HongBaoAddResult;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

@@ -51,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.elme.ElmeOrderException;

import com.yeshi.fanli.exception.money.OrderMoneySettleException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.CommonOrderException;

@@ -59,7 +62,9 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.log.OrderLogHelper;

import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderProcessService;

import com.yeshi.fanli.service.inter.elme.ElmeOrderService;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

@@ -71,20 +76,22 @@
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;

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

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

import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;

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

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

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.manger.HongBaoV2AddManager;

import com.yeshi.fanli.service.manger.order.HongBaoV2AddManager;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;

import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

@@ -126,6 +133,9 @@


   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Resource

   private UserOrderMsgNotificationService userOrderMsgNotificationService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

@@ -202,6 +212,7 @@
      Iterator<String> its = orders.keySet().iterator();

      Map<String, List<TaoBaoOrder>> fanliOrderMap = new HashMap<>();

      Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();

      Map<String, List<TaoBaoOrder>> elmeOrderMap = new HashMap<>();

      while (its.hasNext()) {

         String orderId = its.next();



@@ -209,26 +220,39 @@
            List<TaoBaoOrder> list = orders.get(orderId);

            String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),

                  list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());



            if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())

                  || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 设置渠道ID当做会员运营ID的位置ID

               fanliOrderMap.put(orderId, list);

            } else if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {

               shareOrderMap.put(orderId, list);

            } else {

               // 通过红包查询

               CommonOrder commonOrder = commonOrderService

                     .selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, list.get(0).getTradeId());



               if (commonOrder != null) {

                  HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

                  if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null

                        && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {

                     shareOrderMap.put(orderId, list);

                     continue;

                  }

            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())

                  && !pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {

               // 饿了么订单开始归入到淘宝订单

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),

                     "yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {

                  fanliOrderMap.put(orderId, list);

               } else {

                  elmeOrderMap.put(orderId, list);

               }

            } else if ("口碑".equalsIgnoreCase(list.get(0).getOrderType())

                  && pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_KOUBEI_PID)) {// 口碑自购

               fanliOrderMap.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);

               } else if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {

                  shareOrderMap.put(orderId, list);

               } else {

                  // 通过红包查询

                  CommonOrder commonOrder = commonOrderService

                        .selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, list.get(0).getTradeId());



                  if (commonOrder != null) {

                     HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

                     if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null

                           && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {

                        shareOrderMap.put(orderId, list);

                        continue;

                     }

                  }

                  fanliOrderMap.put(orderId, list);

               }

            }

         }

      }

@@ -237,6 +261,54 @@
      processShopingFanliOrder(fanliOrderMap);

      // 处理分享赚订单

      processShareGoodsOrder(shareOrderMap);

      // 处理饿了么订单

      processElemeOrder(elmeOrderMap);

   }



   private ElmeOrder createElmeOrder(TaoBaoOrder taoBaoOrder) {

      ElmeOrder elmeOrder = new ElmeOrder();

      elmeOrder.setChannelId("");

      elmeOrder.setCreateTime(new Date());

      elmeOrder

            .setOrderDate(new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));

      elmeOrder.setOrderId(taoBaoOrder.getOrderId());

      elmeOrder.setPayMoney(taoBaoOrder.getPayment());

      elmeOrder.setRid(taoBaoOrder.getRelationId());

      if (taoBaoOrder.getOrderState().equalsIgnoreCase("订单结算"))

         elmeOrder.setIsSettle(true);

      else

         elmeOrder.setIsSettle(false);



      if (!taoBaoOrder.getOrderState().equalsIgnoreCase("订单失效"))

         elmeOrder.setState(1);

      else {

         elmeOrder.setState(0);

         elmeOrder.setPayMoney(new BigDecimal(0));

      }

      elmeOrder.setTrackPid(

            String.format("mm_124933865_%s_%s", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));

      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {

         UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByRelationId(taoBaoOrder.getRelationId());

         if (extraInfo != null)

            elmeOrder.setUid(extraInfo.getUser().getId());

      }

      return elmeOrder;

   }



   private void processElemeOrder(Map<String, List<TaoBaoOrder>> orders) {

      for (Iterator<String> its = orders.keySet().iterator(); its.hasNext();) {

         String orderId = its.next();

         List<TaoBaoOrder> orderList = orders.get(orderId);

         for (TaoBaoOrder taoBaoOrder : orderList) {

            ElmeOrder elmeOrder = createElmeOrder(taoBaoOrder);

            try {

               elmeOrderProcessService.processOrder(elmeOrder);

            } catch (ElmeOrderException e) {

               e.printStackTrace();

            }



         }

      }

   }



   @Override

@@ -345,7 +417,8 @@
               || hb.getPreGetTime().getTime() > System.currentTimeMillis())

            continue;

         try {

            CMQManager.getInstance().addFanLiMsgNew(hb);

            if (Constant.ENABLE_MQ)

               CMQManager.getInstance().addFanLiMsgNew(hb);

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

@@ -360,10 +433,15 @@
   private HongBaoOrderMapper hongBaoOrderMapper;



   @Override

   @Transactional

   @Transactional(rollbackFor = Exception.class)

   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());



      if (hb1 == null || hb1.getState() != HongBaoV2.STATE_KELINGQU || hb1.getPreGetTime() == null

            || hb1.getPreGetTime().getTime() > System.currentTimeMillis())

         return;



      // 正常用户才能到账

      UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());

      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {

@@ -427,18 +505,27 @@
      String key = mainUser.getId() + "-" + UUID.randomUUID().toString();

      msg.setKey(key);

      try {

         orderTransactionProducer.send(msg, new LocalTransactionExecuter() {

            @Override

            public TransactionStatus execute(Message arg0, Object arg1) {

               try {

                  orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),

                        hongBaoOrder.getCommonOrder().getSourceType(), key);

                  return TransactionStatus.CommitTransaction;

               } catch (Exception e) {

                  return TransactionStatus.RollbackTransaction;

         if (!Constant.IS_TEST)

            orderTransactionProducer.send(msg, new LocalTransactionExecuter() {

               @Override

               public TransactionStatus execute(Message arg0, Object arg1) {

                  try {

                     orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),

                           hongBaoOrder.getCommonOrder().getSourceType(), key);

                     return TransactionStatus.CommitTransaction;

                  } catch (Exception e) {

                     e.printStackTrace();

                     return TransactionStatus.RollbackTransaction;

                  }

               }

            }, null);

         else {

            try {

               orderMoneySettleService.ziGouSettle(hongBaoOrder.getCommonOrder().getOrderNo(),

                     hongBaoOrder.getCommonOrder().getSourceType(), key);

            } catch (Exception e) {

            }

         }, null);

         }

      } catch (Exception e) {

         LogHelper.mqError(e.getMessage(), msg.getTopic(), msg.getTag(), new Gson().toJson(mqMsg));

      }

@@ -450,7 +537,8 @@
         for (TaoBaoWeiQuanOrder order : orderList) {

            try {

               if (order.getState().contains("维权成功")) {

                  CMQManager.getInstance().addWeiQuanOrderMsg(order);

                  if (Constant.ENABLE_MQ)

                     CMQManager.getInstance().addWeiQuanOrderMsg(order);

               }

            } catch (Exception e) {

               LogHelper.error("维权订单加入到队列出错:" + order != null ? new Gson().toJson(order) : null);

@@ -467,13 +555,8 @@
      if (orderList != null && orderList.size() > 0 & !StringUtil.isNullOrEmpty(orderList.get(0).getSettlementTime()))

         order.setJieSuanTime(

               new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getSettlementTime(), "yyyy-MM-dd HH:mm:ss")));

      // if (order.getJieSuanTime().getTime() >=

      // TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

      // return;

      // }



      // TODO 处理维权成功但是已到账的订单



      // 处理维权成功但是已到账的订单

      if (order.getJieSuanTime().getTime() > TimeUtil.convertToTimeTemp("2019-01-01", "yyyy-MM-dd")) {// 结算时间在2月1号的开始处理已到账但是维权的

         CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

               order.getOrderItemId());

@@ -484,15 +567,34 @@
               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService

                     .selectByOrderItemId(order.getOrderItemId());

               if (drawBack == null) {// 还未扣款

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

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());

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

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

                     try {

                        LogHelper.errorDetailInfo(e, null, "订单号:" + order.getOrderId());

                        LogHelper.errorDetailInfo(e, "到账后处理维权扣款出错", "订单号:" + order.getOrderId());

                     } catch (Exception e1) {

                        e1.printStackTrace();

                     }

                  }

               } else {

                  // 查询子红包是否已到账

                  List<HongBaoV2> children = hongBaoV2Service

                        .listChildrenById(hongBaoOrder.getHongBaoV2().getId());

                  for (HongBaoV2 hongBaoV2 : children) {

                     if (hongBaoV2.getState() == HongBaoV2.STATE_YILINGQU) {

                        try {

                           taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                        } catch (TaoBaoWeiQuanException e) {

                           try {

                              LogHelper.errorDetailInfo(e, "到账后处理维权扣款出错", "订单号:" + order.getOrderId());

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                        }

                        break;

                     }

                  }

               }

@@ -502,67 +604,117 @@
   }



   @Override

   public void fanliInvaiteAndShare() {

      // 查出邀请赚与分享赚该返利的用户ID

      List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceShareAndInvite(1000);

   public void fanliPreInvaite(Date maxTime) {

      // 查出邀请赚的用户ID

      List<Integer> typeList = new ArrayList<>();

      typeList.add(HongBaoV2.TYPE_YIJI);

      typeList.add(HongBaoV2.TYPE_ERJI);

      typeList.add(HongBaoV2.TYPE_SHARE_YIJI);

      typeList.add(HongBaoV2.TYPE_SHARE_ERJI);



      long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);

      int pageSize = 1000;

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

      Set<Long> uidSets = new HashSet<>();

      if (inviteAndShareUids != null)

         for (Long uid : inviteAndShareUids) {

            if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)

               uidSets.add(uid);

         }

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

         List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,

               i * pageSize, pageSize);

         if (inviteAndShareUids != null)

            for (Long uid : inviteAndShareUids) {

               if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)

                  uidSets.add(uid);

            }

      }

      // 根据用户ID

      Iterator<Long> its = uidSets.iterator();

      while (its.hasNext()) {

         Long uid = its.next();

         try {

            CMQManager.getInstance().addFanLiTiChengMsg(uid);

            if (Constant.ENABLE_MQ)

               TeamOrderCMQManager.getInstance().addFanLiTeamIncomePreMsg(new UidDateDTO(uid, maxTime));

         } catch (Exception e) {

            e.printStackTrace();

            LogHelper.error(e);

         }

      }



   }



   @Override

   @Transactional(rollbackFor=Exception.class)

   public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {

   public void fanliShare(Date maxTime) {

      // 查出邀请赚的用户ID

      List<Integer> typeList = new ArrayList<>();

      typeList.add(HongBaoV2.TYPE_SHARE_GOODS);



      long count = hongBaoV2Mapper.countUidCanBanlanceByTypeAndMaxTime(typeList, maxTime);

      int pageSize = 1000;

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

      Set<Long> uidSets = new HashSet<>();

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

         List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceByTypeAndMaxTime(typeList, maxTime,

               i * pageSize, pageSize);

         if (inviteAndShareUids != null)

            for (Long uid : inviteAndShareUids) {

               if (userInfoMapper.selectAvailableByPrimaryKey(uid) != null)

                  uidSets.add(uid);

            }

      }

      // 根据用户ID

      Iterator<Long> its = uidSets.iterator();

      while (its.hasNext()) {

         Long uid = its.next();

         try {

            if (Constant.ENABLE_MQ)

               CMQManager.getInstance().addFanLiShareMsg(new UidDateDTO(uid, maxTime));

         } catch (Exception e) {

            e.printStackTrace();

            LogHelper.error(e);

         }

      }



   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fanliPreInvaite(Long uid, Date maxPreGetTime) {

      // 邀请赚到账

      try {

         orderMoneySettleService.inviteSettleTB(uid);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      if(1>0)

         return;

      //

      try {

         orderMoneySettleService.inviteSettleJD(uid);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      //

      try {

         orderMoneySettleService.inviteSettlePDD(uid);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      // 分享赚到账

      try {

         orderMoneySettleService.shareSettleTB(uid);

         orderMoneySettleService.inviteSettleTB(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.shareSettleJD(uid);

         orderMoneySettleService.inviteSettleJD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      //



      try {

         orderMoneySettleService.shareSettlePDD(uid);

         orderMoneySettleService.inviteSettlePDD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fanliShare(Long uid, Date maxPreGetTime) {

      // 邀请赚到账

      try {

         orderMoneySettleService.shareSettleTB(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.shareSettleJD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.shareSettlePDD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

@@ -589,9 +741,17 @@
         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)

                  || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_KOUBEI_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());

@@ -660,7 +820,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (Constant.ENABLE_MQ)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

@@ -710,7 +871,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (Constant.ENABLE_MQ)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

@@ -832,7 +994,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_JD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -863,7 +1026,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_JD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -972,7 +1136,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_PDD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -1005,7 +1170,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_PDD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -1089,6 +1255,23 @@
   @Transactional(rollbackFor = Exception.class)

   public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,

         String beiZhu) throws Exception {

      HongBaoOrder hongbaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBaoId);

      if (hongbaoOrder != null) {

         CommonOrder commonOrder = commonOrderService.selectByPrimaryKey(hongbaoOrder.getCommonOrder().getId());

         if (commonOrder != null) {

            if (commonOrder.getState() == CommonOrder.STATE_FK) {

               CommonOrder updateOrder = new CommonOrder(commonOrder.getId());

               updateOrder.setState(CommonOrder.STATE_SX);

               updateOrder.setUpdateTime(new Date());

               commonOrderService.updateByPrimaryKeySelective(updateOrder);

            }

         }

      }



      HongBaoV2 hongBao = hongBaoV2Service.selectByPrimaryKey(hongBaoId);

      if (hongBao == null || hongBao.getState() == HongBaoV2.STATE_SHIXIAO)

         return;



      HongBaoV2 v2 = new HongBaoV2(hongBaoId);

      v2.setState(HongBaoV2.STATE_SHIXIAO);

      v2.setBeizhu(beiZhu);

@@ -1103,7 +1286,10 @@
            update.setUpdateTime(new Date());

            hongBaoV2Service.updateByPrimaryKeySelective(update);

         }

      userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "因商家违约未能结算返利或商家已经关店");



      if (hongBao.getType() == HongBaoV2.TYPE_ZIGOU || hongBao.getType() == HongBaoV2.TYPE_SHARE_GOODS) {

         userOrderMsgNotificationService.orderInvalidToBusinessRunning(uid, orderId, sourceType, hongBao.getType());

      }

   }



   @Transactional

@@ -1120,7 +1306,7 @@
            // 查询主红包

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

            if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {

            if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {

            if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU || hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO) {

            // 订单失效,赠送金币

            try {

            invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "订单成功，商家未打款");

@@ -1146,6 +1332,9 @@
   @Resource

   private ElmeOrderService elmeOrderService;



   @Resource

   private ElmeOrderProcessService elmeOrderProcessService;



   /**

    * 获取饿了么可以返利的红包

    * 

@@ -1155,7 +1344,7 @@
   public List<HongBaoV2> getCanBalanceElmeFanliHongBao() {

      List<Integer> list = new ArrayList<>();

      list.add(HongBaoV2.TYPE_ELME);

      return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, 0, 1000);

      return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, new Date(), 0, 1000);

   }



   @Override

@@ -1192,9 +1381,6 @@
         }

         userMoneyService.addUserMoney(hongBao.getUserInfo().getId(), hongBao.getMoney(), detail);

         BigDecimal balance = userInfoMapper.selectByPrimaryKey(hongBao.getUserInfo().getId()).getMyHongBao();

         // 添加消息

         userMoneyMsgNotificationService.elmeFanli(hongBao.getUserInfo().getId(), order.getOrderId(),

               hongBao.getMoney(), balance);

      }

      // 返利到账

   }

@@ -1211,18 +1397,17 @@
   @Transactional

   private void addHongBaoWithMQ(List<CommonOrderAddResultDTO> commonOrderList, String orderId, Long uid,

         int sourceType, int hongBaoType) {



      final List<CommonOrder> coList = convertCommonOrder(commonOrderList);

      int resultCode = 0;

      HongBaoAddResult result = null;

      try {

         long time = TimeUtil.convertToTimeTemp("2019-12-06", "yyyy-MM-dd");

         if (!Constant.IS_TEST)

            time = TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd");

            time = TimeUtil.convertToTimeTemp("2019-12-20", "yyyy-MM-dd");



         if (coList.get(0).getThirdCreateTime().getTime() < time)

            resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);

            result = hongBaoV2Service.addHongBao(coList, hongBaoType);

         else

            resultCode = hongBaoV2AddManager.addHongBao(coList, hongBaoType);

            result = hongBaoV2AddManager.addHongBao(coList, hongBaoType);

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + orderId);

@@ -1232,12 +1417,13 @@
      } catch (UserAccountException e) {



      }

      if (resultCode == 1) {// 只发送新增消息

         OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,

               isCommonOrderValid(coList), 0, new Date());

         Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);

         producer.send(msg);

      }

      if (!Constant.IS_TEST)

         if (result.getResultCode() == HongBaoAddResult.CODE_ADD) {// 只发送新增消息

            OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,

                  isCommonOrderValid(coList), 0, new Date(), result.isMiandan());

            Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);

            producer.send(msg);

         }

   }



   /**