双12活动添加,邀请码发布修改，爬单新规则添加

admin

2019-12-06 cd637932a970e7935b17d41568fe89c92775bccc

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

@@ -20,7 +20,6 @@


import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

import com.aliyun.openservices.ons.api.SendResult;

import com.aliyun.openservices.ons.api.transaction.LocalTransactionExecuter;

import com.aliyun.openservices.ons.api.transaction.TransactionProducer;

import com.aliyun.openservices.ons.api.transaction.TransactionStatus;

@@ -78,6 +77,7 @@
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.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -89,7 +89,6 @@
import com.yeshi.fanli.util.jd.JDApiUtil;

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

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTagConstant;

import com.yeshi.fanli.util.rocketmq.MQTopicName;



@Service

@@ -160,6 +159,9 @@


   @Resource

   private OrderMoneySettleService orderMoneySettleService;



   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;



   /**

    * 是否是分享订单

@@ -740,7 +742,11 @@
      if (order.getValidCode() == 2)

         return;



      // 根据ext1与subUnionId跟单

      String uidStr = order.getExt1();

      if (StringUtil.isNullOrEmpty(uidStr))

         uidStr = order.getOrderItemList().get(0).getSubUnionId();



      Long uid = null;

      if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))

         uid = Long.parseLong(uidStr);

@@ -1207,7 +1213,14 @@
      final List<CommonOrder> coList = convertCommonOrder(commonOrderList);

      int resultCode = 0;

      try {

         resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);

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

         if (!Constant.IS_TEST)

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



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

            resultCode = hongBaoV2Service.addHongBao(coList, hongBaoType);

         else

            resultCode = hongBaoV2AddManager.addHongBao(coList, hongBaoType);

      } catch (HongBaoException e) {

         try {

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