From 20d591c7e4c41dc2b6f13de51c9c4493720c3f99 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Sun, 25 Jun 2023 09:48:04 +0800 Subject: [PATCH 01/13] fix --- .../cool/store/service/impl/HyPartnerLineInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 397fd4390..16460d42f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -336,7 +336,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List followCountList = hyPartnerLineInfoDAO.getFollowCountList(partnerIdList); Map countMap = followCountList.stream().collect(Collectors.toMap(LineCountDTO::getPartnerId, LineCountDTO::getFollowCount)); - List wantShopAreaList = list.stream().map(PublicSeaLineDTO::getWantShopArea).map(Long::parseLong).distinct().collect(Collectors.toList()); + List wantShopAreaList = list.stream().map(PublicSeaLineDTO::getWantShopArea).filter(Objects::nonNull).map(Long::parseLong).distinct().collect(Collectors.toList()); Map wantShopAreaNameMap = hyOpenAreaInfoDAO.selectNameMapByIds(wantShopAreaList); List result = new ArrayList<>(); list.forEach(x->{ From b63a69e616542bc18edabfd1f71151f72be21bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 25 Jun 2023 09:50:14 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=84=8F=E5=90=91=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/PartnerIntentInfoRequest.java | 2 +- .../store/request/WantShopInfoRequest.java | 45 +++++++++++++++++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 4 +- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java index 5d74e7ec2..e1bab4f83 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java @@ -37,7 +37,7 @@ public class PartnerIntentInfoRequest { private Integer isHaveWantShop; @ApiModelProperty("意向铺位信息,json字段,最多5个") - private String wantShopInfo; + private List wantShopInfo; @ApiModelProperty("最大预算") private String maxBudget; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java new file mode 100644 index 000000000..d58220b70 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/WantShopInfoRequest.java @@ -0,0 +1,45 @@ +package com.cool.store.request; + +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/21 22:07 + * @Version 1.0 + */ +@Data +public class WantShopInfoRequest { + + + private ShopInfo shopInfo; + + + private String uuid; + + + + @Data + static class ShopInfo{ + private ShopAddress shopAddress; + + private String storeIsTakeDown; + + private String takeDown; + + } + + @Data + static class ShopAddress{ + + private String address; + + private String longitude; + + private String latitude; + + } + + +} 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 397c0c2a9..b5ae8d7df 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 @@ -173,7 +173,9 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic intentInfoDO.setWantShopArea(request.getWantShopArea()); intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType()); intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop()); - intentInfoDO.setWantShopInfo(request.getWantShopInfo()); + if (CollectionUtils.isNotEmpty(request.getWantShopInfo())){ + intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo())); + } intentInfoDO.setMaxBudget(request.getMaxBudget()); intentInfoDO.setMoneySource(request.getMoneySource()); if(CollectionUtils.isNotEmpty(request.getMoneyProve())){ From 488197f8cf79304ed11dace7fc8e0df3d5b7d928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 25 Jun 2023 11:07:38 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/utils/CoolDateUtils.java | 17 +++++++++++++++++ .../HyIntendDevelopementMappingMapper.xml | 2 +- .../mapper/HyPartnerInterviewPlanMapper.xml | 2 +- .../store/service/impl/DeskServiceImpl.java | 4 ++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java index 487f69744..1d98c27ac 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java @@ -1,5 +1,7 @@ package com.cool.store.utils; +import cn.hutool.core.date.DateUtil; + import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -39,6 +41,21 @@ public class CoolDateUtils { return now.getTime(); } + /** + * n天后 的最小时间 20230613 2天后最小时间---->2023-06-15 00:00:00 + * @param day + * @return + */ + public static Date getDateFormatDayMinTime(int day){ + LocalDate today = LocalDate.now(); + LocalDate thirdDay = today.plusDays(day); + LocalDateTime thirdDayMidnight = LocalDateTime.of(thirdDay, LocalTime.MIDNIGHT); + LocalDateTime thirdDay235959 = thirdDayMidnight.with(LocalTime.MIN); + ZonedDateTime zonedDateTime = ZonedDateTime.of(thirdDay235959, ZoneId.systemDefault()); + return Date.from(zonedDateTime.toInstant()); + } + + /** * n天后 的最大时间 20230613 2天后最大时间---->2023-06-15 23:59:59 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index e2f551d84..87872d83c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -140,7 +140,7 @@ from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id - and type = #{type} + and a.type = #{type} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 640204bc2..4ead4d31a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -270,7 +270,7 @@