From eda5d0e998204c7a49ab84d8528569b765bec2f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 20 十二月 2019 10:05:10 +0800
Subject: [PATCH] 品牌日志

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
index 3c7012e..d4da58d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/UserOrderWeiQuanRecordServiceImpl.java
@@ -78,7 +78,7 @@
 						// (缁存潈閲戦/缁撶畻閲戦) * 杩斿埄閲戦
 						BigDecimal wqmoney = weiQuanOrder.getMoney();
 						money = wqmoney.multiply(hongBaoV2.getMoney()).divide(hongBaoV2.getSettlement(), 2,
-								BigDecimal.ROUND_DOWN);
+								BigDecimal.ROUND_UP);
 
 						// 澶т簬杩斿埄閲戦 鍒欑瓑浜庤繑鍒╅噾棰�
 						if (money.compareTo(hongBaoV2.getMoney()) > 0)
@@ -125,6 +125,10 @@
 			record.setState(0);
 			record.setTradeId(order.getOrderItemId());
 			record.setUid(hongBaoOrder.getHongBaoV2().getUserInfo().getId());
+
+			if (record.getMoney().compareTo(hongBaoOrder.getHongBaoV2().getMoney()) > 0)
+				record.setMoney(hongBaoOrder.getHongBaoV2().getMoney());
+
 			userOrderWeiQuanRecordMapper.insertSelective(record);
 		}
 		List<HongBaoV2> children = hongBaoV2Service.listChildrenById(mainHongBao.getId());
@@ -139,6 +143,10 @@
 				record.setState(0);
 				record.setTradeId(order.getOrderItemId());
 				record.setUid(v2.getUserInfo().getId());
+
+				if (record.getMoney().compareTo(v2.getMoney()) > 0)
+					record.setMoney(v2.getMoney());
+
 				userOrderWeiQuanRecordMapper.insertSelective(record);
 			}
 		}

--
Gitblit v1.8.0