From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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 654d68b..199b249 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
@@ -710,7 +710,10 @@
 		CommonOrder commonOrder = new CommonOrder();
 		commonOrder.setCount(taoBaoOrder.getCount());
 		commonOrder.setCreateTime(new Date());
-		commonOrder.seteIncome(taoBaoOrder.geteIncome());
+		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());

--
Gitblit v1.8.0