From 50361d9b29962f66b05df0732820840c6531f84f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 14:23:27 +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/order/OrderMoneySettleServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
index 2b17f89..538ba34 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -422,7 +422,7 @@
@Transactional
@Override
- public void ziGouSettle(String orderId, int sourceType,String taskKey) throws OrderMoneySettleException {
+ public void ziGouSettle(String orderId, int sourceType, String taskKey) throws OrderMoneySettleException {
// 鏌ヨ鍚屼竴璁㈠崟鍙风殑绾㈠寘
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);
List<HongBaoV2> hongBaoList = new ArrayList<>();
@@ -466,6 +466,10 @@
}
}
+ // if (userMoney.isEmpty()) {
+ // throw new OrderMoneySettleException(1, "娌℃湁闇�瑕佺粨绠楃殑璁㈠崟");
+ // }
+
Iterator<Long> its = userMoney.keySet().iterator();
while (its.hasNext()) {
@@ -486,8 +490,8 @@
}
userMoneyService.addUserMoney(uid, money, userMoneyDetail);
-
- List<Long> hbIdList=new ArrayList<>();
+
+ List<Long> hbIdList = new ArrayList<>();
// 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
for (HongBaoV2 v2 : userHongBao.get(uid)) {
hbIdList.add(v2.getId());
@@ -498,7 +502,7 @@
LogHelper.errorDetailInfo(e);
}
}
- //娣诲姞缁撶畻鏄犲皠
+ // 娣诲姞缁撶畻鏄犲皠
hongBaoV2SettleTempService.addTemp(hbIdList, taskKey);
// 绔欏唴淇�+鎺ㄩ��
@@ -539,10 +543,9 @@
} else
throw new OrderMoneySettleException(e.getCode(), "缁存潈澶勭悊鍑洪敊:" + e.getMsg());
}
-
- //娣诲姞缁撶畻鏄犲皠
-
-
+
+ // 娣诲姞缁撶畻鏄犲皠
+
}
private HongBaoV2 filterWeiQuanINGHongBao(HongBaoV2 hongBao) {
@@ -961,7 +964,7 @@
for (HongBaoV2SettleTemp temp : list) {
Long hongBaoId = temp.getHongBaoId();
HongBaoV2 hongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoId);
- if (sourceType != null)
+ if (hongBao != null)
sourceType = hongBao.getOrderType();
if (hongBao.getParent() != null)
hongBao = hongBao.getParent();
@@ -1018,7 +1021,9 @@
}
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, totalMoney, userMoneyDetail);
- // TODO 娣诲姞娑堟伅
+ // 娣诲姞娑堟伅
+ userMoneyMsgNotificationService.inviteOrderSubSidy(uid, new Date(), "绯荤粺鑷姩涓嬪彂", totalMoney,
+ userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());
}
}
}
--
Gitblit v1.8.0