yujian
2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -763,45 +763,6 @@
      return TimeUtil.convertToTimeTemp(time, "yyyy-M-dd HH:mm:ss");
   }
   public static CommonOrder convert(TaoBaoOrder taoBaoOrder) {
      CommonOrder commonOrder = new CommonOrder();
      commonOrder.setCount(taoBaoOrder.getCount());
      commonOrder.setCreateTime(new Date());
      if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null)
         commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy()));
      else
         commonOrder.seteIncome(taoBaoOrder.geteIncome());
      commonOrder.setEstimate(taoBaoOrder.getEstimate());
      commonOrder.setOrderNo(taoBaoOrder.getOrderId());
      commonOrder.setPayment(taoBaoOrder.getPayment());
      commonOrder.setSettlement(taoBaoOrder.getSettlement());
      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.setSourceType(Constant.SOURCE_TYPE_TAOBAO);
      int state = 0;
      if ("订单付款".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
         state = CommonOrder.STATE_FK;
      } else if ("订单成功".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
         state = CommonOrder.STATE_FK;
      } else if ("订单失效".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
         state = CommonOrder.STATE_SX;
      } else if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState())) {
         state = CommonOrder.STATE_JS;
      }
      commonOrder.setOrderBy(taoBaoOrder.getOrderBy());
      commonOrder.setState(state);
      commonOrder.setThirdCreateTime(
            new Date(TimeUtil.convertToTimeTemp(taoBaoOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
      commonOrder.setUpdateTime(new Date());
      commonOrder.setTradeId(taoBaoOrder.getTradeId());
      return commonOrder;
   }
   /**
    * 获取一组订单的hash值
    *