From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +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/HongBaoV2ServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
index cb4e522..25d557f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
@@ -264,7 +264,7 @@
private void updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,
Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException {
System.out.println(commonOrder.getOrderNo());
- //閿佽
+ // 閿佽
HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
throw new HongBaoException(10, "绾㈠寘瀵硅薄涓嶅瓨鍦�");
@@ -943,24 +943,27 @@
child.setUrank(boss.getRank());
child.setVersion(2);
child.setCreateTime(new Date());
- hongBaoV2Mapper.insertSelective(child);
- // 娣诲姞閫氱煡
- if (notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI) == null) {
- HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
- tempHongBao.setUserInfo(child.getUserInfo());
- tempHongBao.setMoney(child.getMoney());
- tempHongBao.setBeizhu(hongBao.getUserInfo().getNickName());
- CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
- tempCommonOrder.setPayment(commonOrder.getPayment());
- notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));
- } else {
- // 澧炲姞浠樻閲戦涓庤祫閲�
- HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI);
- tempHongBaoOrder.getCommonOrder().setPayment(
- tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
- tempHongBaoOrder.getHongBaoV2()
- .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(child.getMoney()));
- notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI, tempHongBaoOrder);
+ if (child.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ hongBaoV2Mapper.insertSelective(child);
+ // 娣诲姞閫氱煡
+ if (notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
+ tempHongBao.setUserInfo(child.getUserInfo());
+ tempHongBao.setMoney(child.getMoney());
+ tempHongBao.setBeizhu(hongBao.getUserInfo().getNickName());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI,
+ new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI);
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(child.getMoney()));
+ notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI, tempHongBaoOrder);
+ }
}
}
}
@@ -1100,4 +1103,16 @@
return null;
return hongBaoV2Mapper.listBySourceTypeAndTradeIdListAndUid(sourceType, uid, tradeIdList);
}
+
+ @Override
+ public HongBaoV2 getFirstValidHongBaoByTypeAndUid(List<Integer> typeList, Long uid) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(HongBaoV2.STATE_BUKELINGQU);
+ stateList.add(HongBaoV2.STATE_KELINGQU);
+ stateList.add(HongBaoV2.STATE_YILINGQU);
+ List<HongBaoV2> hongBaoV2List = hongBaoV2Mapper.listByStateAndTypeAndUid(stateList, typeList, uid, 0, 1);
+ if (hongBaoV2List != null && hongBaoV2List.size() > 0)
+ return hongBaoV2List.get(0);
+ return null;
+ }
}
--
Gitblit v1.8.0