From 7f943e54f259c7ff69c7591dbd6803171126b01e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 21 六月 2019 09:35:08 +0800
Subject: [PATCH] 发起提现增加统计，添加京东订单与商品，拼多多订单与商品

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
index 49872b9..1359d54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -214,6 +214,8 @@
 
 			// 閫�娆鹃噾棰�
 			BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee);
+			if (drawBackMoney.compareTo(userGetMoney) > 0)
+				drawBackMoney = userGetMoney;// 閫�娆鹃噾棰濅笉鑳芥瘮鑾峰緱鐨勯噾棰濆ぇ
 			// 璁＄畻璧勯噾鏄惁鍏呰冻
 			UserInfo user = userInfoMapper.selectByPKey(uid);
 			if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻

--
Gitblit v1.8.0