From f2b1816276058cbe996ca67200dcfb997cd99603 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 29 Oct 2019 12:53:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E4=BB=BB=E5=8A=A1]?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/invest/InvestHelper.java | 5 ++++- .../iformall/service/invest/impl/InvestBizServiceImpl.java | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index 33c4f79af..5ee25f049 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -192,16 +192,19 @@ public class InvestHelper { return JsonUtil.obj2Json(contentMap); } - public static void checkOwner(InvestTaskEntity entity) { + public static boolean checkOwner(InvestTaskEntity entity) { + boolean ownerEmpty = true; try { List owner = JSONArray.parseArray(entity.getOwner(), Long.class); if (CollectionUtils.isNotEmpty(owner)) { entity.setStatus(EnumTaskStatus.NEGOTIATING); + ownerEmpty = false; } else { entity.setStatus(EnumTaskStatus.CREATED); } } catch (Exception e) { InvestHelper.throwException(ErrorCode.SYS_PARAMETER_ERROR, "owner"); } + return ownerEmpty; } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index ba735814d..be1ecca25 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -1053,7 +1053,9 @@ public class InvestBizServiceImpl implements InvestBizService { // return; //} - InvestHelper.checkOwner(investTaskEntity); + if (InvestHelper.checkOwner(investTaskEntity)) { + return; + } WxShop shop = shopService.getById(investTaskEntity.getTargetId()); if (Objects.nonNull(shop)) { Map shopContractMap = getWxRentContractMap(shop); @@ -1071,8 +1073,8 @@ public class InvestBizServiceImpl implements InvestBizService { if (count > 0) { investTaskEntity.setStatus(EnumTaskStatus.INTENTION); } + } } - } } private InvestFollowRecordVo buildFollowRecordItem(Map usersMap, InvestFollowRecordEntity item,