From f043e888b3f469541018816822422cdcdbe98d2b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 四月 2019 18:58:30 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 ca7ce6f..c085968 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
@@ -338,7 +338,7 @@
// 鑾峰彇瀛愮孩鍖�
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
- if (children != null&&children.size()>0)
+ if (children != null && children.size() > 0)
for (HongBaoV2 child : children) {
HongBaoV2 childUpdate = new HongBaoV2(child.getId());
childUpdate.setState(hongBao.getState());
@@ -390,7 +390,7 @@
else {// 淇涔嬪墠浜岀骇,涓夌骇璁㈠崟鏈粺璁″埌鐨勬儏鍐�
if (!mianDan) {
ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(commonOrder.getUserInfo().getId());
- if (threeSale.getSucceedTime() != null
+ if (threeSale != null && threeSale.getSucceedTime() != null
&& threeSale.getSucceedTime() <= commonOrder.getThirdCreateTime().getTime()) {
UserInfo boss = threeSaleSerivce.getBoss(commonOrder.getUserInfo().getId());
// 鎻掑叆涓�绾у瓙绾㈠寘
--
Gitblit v1.8.0