From 90ce9c6390613004d24699a80bbbe23f482cf001 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 七月 2019 15:10:21 +0800
Subject: [PATCH] 淘宝授权添加延时，爬单错误bug解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index 6f59edf..9a07365 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -587,17 +587,20 @@
if (notificationMap.get(child.getType()) == null) {
HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
tempHongBao.setUserInfo(child.getUserInfo());
- tempHongBao.setMoney(childUpdate.getMoney());
+ tempHongBao
+ .setMoney(childUpdate.getMoney() == null ? new BigDecimal(0) : childUpdate.getMoney());
CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
tempCommonOrder.setPayment(commonOrder.getPayment());
notificationMap.put(child.getType(), new HongBaoOrder(tempCommonOrder, tempHongBao));
} else {
// 澧炲姞浠樻閲戦涓庤祫閲�
HongBaoOrder tempHongBaoOrder = notificationMap.get(child.getType());
- tempHongBaoOrder.getCommonOrder().setPayment(
- tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
- tempHongBaoOrder.getHongBaoV2()
- .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(childUpdate.getMoney()));
+ if (commonOrder.getPayment() != null)
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ if (childUpdate.getMoney() != null)
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(childUpdate.getMoney()));
notificationMap.put(child.getType(), tempHongBaoOrder);
}
@@ -726,7 +729,7 @@
firstHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
}
- //杩斿埄涓�0鐨勪笉閫氱煡
+ // 杩斿埄涓�0鐨勪笉閫氱煡
if (firstHongbao.getMoney() == null || firstHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
return;
@@ -777,8 +780,8 @@
secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
}
-
- //杩斿埄涓�0鐨勪笉缁熻
+
+ // 杩斿埄涓�0鐨勪笉缁熻
if (secondHongbao.getMoney() == null || secondHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
return;
@@ -1034,9 +1037,9 @@
public List<HongBaoV2> listChildrenById(Long id) {
return hongBaoV2Mapper.listChildrenById(id);
}
-
+
@Override
- public List<Long> getUidByNear30DayShareSucceed(){
+ public List<Long> getUidByNear30DayShareSucceed() {
return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
}
}
--
Gitblit v1.8.0