From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
index bc53c80..87b6e7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDebtServiceImpl.java
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -18,6 +19,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
 import com.yeshi.fanli.exception.money.UserMoneyDebtException;
 import com.yeshi.fanli.exception.money.UserMoneyDetailException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
 import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;
 import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
@@ -144,7 +146,7 @@
 
 				// 鏂扮増閫氱煡
 				userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(), money,
-						userInfoService.getMyHB(uid));
+						userInfoService.getBalance(uid));
 
 				break;
 			case HongBaoV2.TYPE_SHARE_GOODS:
@@ -156,7 +158,7 @@
 					userMoneyService.subUserMoney(uid, money, userMoneyDetail);
 
 					userMoneyMsgNotificationService.shareOrderWeiQuan(debt.getUid(), weiQuanDrawBack.getOrderId(),
-							money, userInfoService.getMyHB(uid));
+							money, userInfoService.getBalance(uid));
 
 				} catch (UserMoneyDetailException e) {
 					throw new UserMoneyDebtException(12, "鎻掑叆璧勯噾璇︽儏鍑洪敊");
@@ -178,12 +180,41 @@
 
 				// 鏂扮増閫氱煡
 				userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, weiQuanDrawBack.getOrderId(), money,
-						userInfoService.getMyHB(uid));
+						userInfoService.getBalance(uid));
 				break;
-
 			}
-
 		}
 	}
 
+	@Transactional
+	@Override
+	public void repayDebt(Long uid) {
+		// 鏌ヨ鏄惁鏈夋瑺鍊�
+		List<UserMoneyDebt> list = userMoneyDebtMapper.listByUidWithHasLeftMoney(uid, 0, 50);
+		if (list != null && list.size() > 0) {// 鏈夋瑺鍊�
+			for (UserMoneyDebt debt : list) {
+				BigDecimal leftMoney = userInfoService.getBalance(uid);
+				if (leftMoney.compareTo(debt.getLeftMoney()) >= 0) {// 鏈夎冻澶熺殑璧勯噾鍋胯繕鍊哄姟
+					try {
+						repayDebt(debt, debt.getLeftMoney());
+					} catch (UserMoneyDebtException e) {
+						try {
+							LogHelper.errorDetailInfo(e, "uid:" + uid + " debtId:" + debt.getId(), null);
+						} catch (Exception e1) {
+							e1.printStackTrace();
+						}
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public boolean isHaveDebtToRepay(Long uid) {
+		List<UserMoneyDebt> debtList = userMoneyDebtMapper.listByUidWithHasLeftMoney(uid, 0, 1);
+		if (debtList != null && debtList.size() > 0)
+			return true;
+		return false;
+	}
+
 }

--
Gitblit v1.8.0