券推送插入

yujian

2019-04-22 b6c37e4bc38db88a360d0f2c6099183f9bb75bdc

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -11,17 +11,14 @@
import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;



import javax.annotation.PostConstruct;

import javax.annotation.Resource;



import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.HttpException;

import org.apache.commons.httpclient.methods.GetMethod;

import org.springframework.stereotype.Component;

import org.yeshi.utils.HttpUtil;



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

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

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

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

import com.yeshi.fanli.entity.order.CommonOrder;

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

@@ -29,12 +26,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.TaoBaoOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -47,40 +38,10 @@
@Component

public class TaoBaoOrderUtil {



   private final static String CACHENAME = "tbCookie";



   private static final String ORDERFAILURE = "订单失效";

   private static final String ORDERPAYMENT = "订单付款";

   private static final String ORDERSETTLEMENT = "订单结算";

   private static final String ORDERSUCCESS = "订单成功";



   @Resource

   private OrderService orderService;

   @Resource

   private HongBaoService hongBaoService;

   @Resource

   private ConfigService configService;



   @Resource

   private OrderItemServcie orderItemServcie;



   @Resource

   private HongBaoManageService hongBaoManageService;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   private static TaoBaoOrderUtil taoBaoOrderUtil;



   @PostConstruct

   public void init() {

      taoBaoOrderUtil = this;

      taoBaoOrderUtil.orderService = this.orderService;

      taoBaoOrderUtil.hongBaoService = this.hongBaoService;

      taoBaoOrderUtil.configService = this.configService;

      taoBaoOrderUtil.hongBaoManageService = this.hongBaoManageService;

      taoBaoOrderUtil.orderItemServcie = this.orderItemServcie;

   }



   /**

    * 获取淘宝联盟的Cookie

@@ -595,7 +556,6 @@


   }





   /**

    * 解析维权订单

    * 

@@ -758,8 +718,8 @@
      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))

         commonOrder.setSettleTime(

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

      commonOrder.setSourcePosition(

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

      commonOrder.setSourcePosition(String.format("mm_%s_%s_%s", "124933865", taoBaoOrder.getSourceMediaId(),

            taoBaoOrder.getAdPositionId()));

      commonOrder.setSourceType(Constant.SOURCE_TYPE_TAOBAO);

      int state = 0;

      if ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState())) {

@@ -776,6 +736,7 @@
      commonOrder.setThirdCreateTime(

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

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(taoBaoOrder.getTradeId());



      return commonOrder;