From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 894a4bd..6f0d7c0 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
@@ -674,8 +674,15 @@
orderItem.setSettlementTime(0L);
String createTime = tbo.getCreateTime();
orderItem.setCreateTime(TimeUtil.convertDateToTemp2(createTime));
- orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));
- orderItem.setPayMoney(tbo.getPayment());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(tbo.getOrderState()))
+ orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.geteIncome()));
+ else
+ orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(tbo.getOrderState()))
+ orderItem.setPayMoney(tbo.getSettlement());
+ else
+ orderItem.setPayMoney(tbo.getPayment());
+
orderItem.setOrder(order);
orderItem.setOrderId(tbo.getOrderId());
@@ -809,7 +816,10 @@
pidOrder.setOrderType(taoBaoOrder.getOrderType());
pidOrder.setRate(taoBaoOrder.getiRatio());
pidOrder.setPayMoney(taoBaoOrder.getPayment());
- pidOrder.setPreMoney(taoBaoOrder.getEstimate());
+ if ("璁㈠崟缁撶畻".equalsIgnoreCase(taoBaoOrder.getOrderState()))
+ pidOrder.setPreMoney(taoBaoOrder.geteIncome());
+ else
+ pidOrder.setPreMoney(taoBaoOrder.getEstimate());
pidOrder.setFinalMoney(taoBaoOrder.getSettlement());
if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))
pidOrder.setBalanceTime(new Date(TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime())));
--
Gitblit v1.8.0