From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 2276c83..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
@@ -17,8 +17,8 @@
 import org.springframework.stereotype.Component;
 import org.yeshi.utils.HttpUtil;
 
+import com.yeshi.fanli.dto.order.OrderItem;
 import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
@@ -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());
@@ -736,6 +739,7 @@
 		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