From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 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 9ae4489..5553bbf 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,12 +6,14 @@
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.suning.SuningOrderInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.vipshop.VipShopOrderDetail;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
public class CommonOrderFactory {
@@ -133,11 +135,15 @@
CommonOrder commonOrder = new CommonOrder();
commonOrder.setCount(taoBaoOrder.getCount());
commonOrder.setCreateTime(new Date());
+
+ // 濡傛灉relationId涓嶄负绌�
+
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());
@@ -164,6 +170,13 @@
commonOrder.setUpdateTime(new Date());
commonOrder.setTradeId(taoBaoOrder.getTradeId());
commonOrder.setChildSourceType(taoBaoOrder.getOrderType());
+
+ if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {
+ commonOrder.setEstimate(
+ TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.getEstimate()));
+ commonOrder.seteIncome(
+ TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.geteIncome()));
+ }
return commonOrder;
}
@@ -200,4 +213,41 @@
commonOrder.setChildSourceType("鍞搧浼�");
return commonOrder;
}
+
+ public static CommonOrder create(SuningOrderInfo order) {
+ CommonOrder commonOrder = new CommonOrder();
+ commonOrder.setCount(Integer.parseInt(order.getSaleNum()));
+ commonOrder.setCreateTime(new Date());
+ if ("纭鏀惰揣".equalsIgnoreCase(order.getOrderLineStatusDesc())) {
+ commonOrder.seteIncome(new BigDecimal(order.getPrePayCommission()));
+ commonOrder.setSettlement(new BigDecimal(order.getPayAmount()));
+ commonOrder.setSettleTime(
+ new Date(TimeUtil.convertToTimeTemp(order.getOrderLineStatusChangeTime(), "yyyy-MM-dd HH:mm:ss")));
+ }
+ commonOrder.setOrderNo(order.getOrderCode() + "");
+ commonOrder.setPayment(new BigDecimal(order.getPayAmount()));
+ commonOrder.setSourcePosition(order.getPositionId());
+ commonOrder.setSourceType(Constant.SOURCE_TYPE_SUNING);
+ int state = 0;
+ if ("绛夊緟浠樻".equalsIgnoreCase(order.getOrderLineStatusDesc()))
+ state = CommonOrder.STATE_FK;
+ else if ("鏀粯瀹屾垚".equalsIgnoreCase(order.getOrderLineStatusDesc()))
+ state = CommonOrder.STATE_FK;
+ else if ("閫�娆�".equalsIgnoreCase(order.getOrderLineStatusDesc()))
+ state = CommonOrder.STATE_SX;
+ else if ("璁㈠崟宸插彇娑�".equalsIgnoreCase(order.getOrderLineStatusDesc()))
+ state = CommonOrder.STATE_SX;
+ else if ("纭鏀惰揣".equalsIgnoreCase(order.getOrderLineStatusDesc()))
+ state = CommonOrder.STATE_JS;
+
+ commonOrder.setOrderBy(1);
+ commonOrder.setState(state);
+ commonOrder.setThirdCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(order.getOrderSubmitTime(), "yyyy-MM-dd HH:mm:ss")));
+ commonOrder.setUpdateTime(new Date());
+ commonOrder.setTradeId(order.getOrderLineNumber());
+ commonOrder.setEstimate(new BigDecimal(order.getPrePayCommission()));
+ commonOrder.setChildSourceType("鑻忓畞");
+ return commonOrder;
+ }
}
--
Gitblit v1.8.0