订单修改

admin

2019-12-13 a3e7322a0aa6b5b13a84bc76923d0c6b68b13276

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

@@ -24,6 +24,8 @@
import com.aliyun.openservices.ons.api.transaction.TransactionProducer;

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

import com.google.gson.Gson;

import com.opensymphony.xwork2.util.Element;

import com.sun.org.apache.xml.internal.serializer.ElemDesc;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

@@ -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;

@@ -77,6 +80,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;

@@ -159,6 +163,9 @@
   @Resource

   private OrderMoneySettleService orderMoneySettleService;



   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;



   /**

    * 是否是分享订单

    * 

@@ -198,6 +205,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();



@@ -205,26 +213,32 @@
            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 ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {

               // 处理饿了么订单

               elmeOrderMap.put(orderId, list);

            }



            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());

            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;

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

               }

               fanliOrderMap.put(orderId, list);

            }

         }

      }

@@ -233,6 +247,46 @@
      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);

      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 {

               elmeOrderService.addOrder(elmeOrder);

            } catch (ElmeOrderException e) {

               e.printStackTrace();

            }

         }

      }

   }



   @Override

@@ -521,7 +575,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor = Exception.class)

   public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {

      // 邀请赚到账

      try {

@@ -529,6 +583,8 @@
      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      if (1 > 0)

         return;

      //

      try {

         orderMoneySettleService.inviteSettleJD(uid);

@@ -1209,7 +1265,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);