From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 25 七月 2019 12:20:01 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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 7f1b1d4..91cafcd 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
@@ -498,36 +498,41 @@
weiQuanDrawBack.setUser(child.getUserInfo());
taoBaoWeiQuanDrawBackMapper.insertSelective(weiQuanDrawBack);// 鍔犲叆杩旇繕璁板綍
- // 鍒ゆ柇璧勯噾鏄惁瓒冲鎵ｆ
- UserInfo user = userInfoMapper.selectByPKey(uid);
- if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
- {
- try {
- addDebt(uid, child.getId(), drawBackMoney);
- } catch (UserMoneyDebtException e) {
- throw new TaoBaoWeiQuanException(101, "璧勯噾鍊熻捶寮傚父");
+ // 濡傛灉璧勯噾澶т簬0鎵嶆墸闄�
+
+ if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {
+
+ // 鍒ゆ柇璧勯噾鏄惁瓒冲鎵ｆ
+ UserInfo user = userInfoMapper.selectByPKey(uid);
+ if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻
+ {
+ try {
+ addDebt(uid, child.getId(), drawBackMoney);
+ } catch (UserMoneyDebtException e) {
+ throw new TaoBaoWeiQuanException(101, "璧勯噾鍊熻捶寮傚父");
+ }
+ continue;
}
- continue;
- }
- UserMoneyDetail userMoneyDetail = null;
- // 鏂扮増璧勯噾璁板綍
- try {
- userMoneyDetail = UserMoneyDetailFactory.createInviteWeiQuan(uid, weiQuanDrawBack,
- drawBackMoney);
- } catch (UserMoneyDetailException e) {
+ UserMoneyDetail userMoneyDetail = null;
+ // 鏂扮増璧勯噾璁板綍
try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
+ userMoneyDetail = UserMoneyDetailFactory.createInviteWeiQuan(uid, weiQuanDrawBack,
+ drawBackMoney);
+ } catch (UserMoneyDetailException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
- }
- userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
+ userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);
- // 鏂扮増閫氱煡
- userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
- userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
+ }
}
}
}
--
Gitblit v1.8.0