From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 45 ++-------------------------------------------
1 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
index 7d809c6..5195211 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java
@@ -23,16 +23,14 @@
import com.yeshi.fanli.dto.order.OrderItem;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.TaoBaoOrderException;
import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import jxl.Sheet;
import jxl.Workbook;
@@ -761,45 +759,6 @@
time += " 00:00:00";
// TimeUtil.getGernalTime(balanceTime, "HH:mm:ss");
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;
-
}
/**
--
Gitblit v1.8.0