From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
index c6e20fa..af730f7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -6,8 +6,11 @@
import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.pdd.PDDOrder;
+import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
public class CommonOrderFactory {
@@ -123,4 +126,41 @@
return commonOrder;
}
+ public static CommonOrder create(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