From f5ac5f4bc8d9d2d2c9356ebf1a0a0f0d97232a02 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 29 Jun 2023 11:15:38 +0800 Subject: [PATCH 1/3] add log --- .../src/main/java/com/cool/store/vo/OpenAreaTreeVO.java | 7 +++++-- .../com/cool/store/service/impl/OpenAreaServiceImpl.java | 2 +- coolstore-partner-webb/pom.xml | 8 -------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java index 723d5cb39..2869a4b4a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -1,12 +1,14 @@ package com.cool.store.vo; import com.cool.store.entity.HyOpenAreaInfoDO; +import com.cool.store.enums.AreaStatusEnum; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; @@ -49,7 +51,7 @@ public class OpenAreaTreeVO { private List childNode; - public static List convertTree(List allOpenArea, String keyword){ + public static List convertTree(List allOpenArea, String keyword, Boolean applyFlag){ long startTime = System.currentTimeMillis(); List firstArea = allOpenArea.stream().filter(o -> Objects.isNull(o.getParentId())).collect(Collectors.toList()); Map> openAreaParentMap = allOpenArea.stream().filter(o->Objects.nonNull(o.getParentId())).collect(Collectors.groupingBy(k -> k.getParentId())); @@ -62,7 +64,8 @@ public class OpenAreaTreeVO { } log.info("1#耗时：{}", System.currentTimeMillis() - startTime); Map> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode())); - List filterList = allOpenArea.stream().filter(o -> o.getAreaPath().contains(keyword)).collect(Collectors.toList()); + List filterList = allOpenArea.stream().filter(o -> StringUtils.isNotBlank(keyword) && o.getAreaPath().contains(keyword)) + .filter(o->Objects.nonNull(applyFlag) && AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus())).collect(Collectors.toList()); Map openAreaMap = allOpenArea.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); List list = new ArrayList<>(); //向上处理节点 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 919ce4e71..b19459c29 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -122,7 +122,7 @@ public class OpenAreaServiceImpl implements OpenAreaService { //先查出所有的一级菜单 List allOpenArea = hyOpenAreaInfoDAO.getAllOpenArea(); log.info("11耗时：{}", System.currentTimeMillis() - startTime); - return OpenAreaTreeVO.convertTree(allOpenArea, keyword); + return OpenAreaTreeVO.convertTree(allOpenArea, keyword, applyFlag); } @Override diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-webb/pom.xml index 8f1a633b8..d6ef7b991 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-webb/pom.xml @@ -94,14 +94,6 @@ jacoco-maven-plugin - - - src/main/resources - - **/* - - - compile From 85c7ee58cd1fd0029297953046bc2af3460783b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 29 Jun 2023 11:28:43 +0800 Subject: [PATCH 2/3] deleted --- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index eff46ce7c..02657293f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -481,7 +481,7 @@ LEFT JOIN hy_partner_user_info hpuinfo ON hpli.partner_id = hpuinfo.partner_id LEFT JOIN enterprise_user eu ON hpli.investment_manager = eu.user_id LEFT JOIN hy_partner_interview_plan hpip on hpli.id = hpip.partner_line_id - WHERE hpli.line_status in (1,2) and hpli.deleted = 0 + WHERE hpli.line_status in (1,2) and hpli.deleted = 0 and (hpip.deleted is null or hpip.deleted=0) AND (eu.name like concat('%',#{keyword},'%') or hpuinfo.username like concat('%',#{keyword},'%')) From ddc6b4f8105a8a84952d59d26e4bf3b28298c26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 29 Jun 2023 11:47:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=84=8F=E5=90=91?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8=E4=B8=AD=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/HyPartnerInterviewPlanMapper.xml | 1 + .../service/impl/HyPartnerIntentInfoServiceImpl.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index e9a28a598..866406d27 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -287,6 +287,7 @@ and interview_date = #{currentDay} and (start_time>now() or (start_timenow() and room_status!=2)) + and deleted = 0 and application_approved = 1 order by start_time diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index 161e1acc6..392e151ee 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -112,6 +112,16 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic // 更新线索状态 HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoService.generateDefaultLineInfo(hyPartnerUserInfoDO.getPartnerId(), baseUserInfoRequest.getWantShopArea(), baseUserInfoRequest.getAcceptAdjustType()); + //更新意向申请表中信息 + HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(hyPartnerLineInfoDO.getId()); + if (hyPartnerIntentInfoDO!=null){ + hyPartnerIntentInfoDO.setLiveArea(baseUserInfoRequest.getLiveArea()); + hyPartnerIntentInfoDO.setWantShopArea(baseUserInfoRequest.getWantShopArea()); + hyPartnerIntentInfoDO.setAcceptAdjustType(baseUserInfoRequest.getAcceptAdjustType()); + hyPartnerIntentInfoDAO.updateByPrimaryKeySelective(hyPartnerIntentInfoDO); + } + + String cacheKey = MessageFormat.format(RedisConstant.PARTNER_INTENTINFO_CACHE_KEY, baseUserInfoRequest.getPartnerId(), hyPartnerLineInfoDO.getId()); if (StringUtils.isNotBlank(redisUtilPool.getString(cacheKey))) { PartnerIntentInfoRequest request = JSONObject.parseObject(redisUtilPool.getString(cacheKey), PartnerIntentInfoRequest.class);