From 47b369e9e644373ca0e6c011a9093868f57e5d92 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 02 六月 2020 09:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java | 12 ++++++++++++
1 files changed, 12 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 f132889..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
@@ -13,6 +13,7 @@
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 {
@@ -134,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());
@@ -166,6 +171,13 @@
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;
}
--
Gitblit v1.8.0