From 19b023bef66db90042ccc139c70742866dafa932 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 15:21:56 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=88=98=E5=8C=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/controller/RegionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java index 20703f5ad..1847f776f 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java @@ -45,7 +45,7 @@ public class RegionController { @ApiOperation("查询所有被绑定战区的组织机构") @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "intent-意向区域 development 开发区域", required = false) + @ApiImplicitParam(name = "type", value = "intent-意向区域 dev 开发区域", required = false) }) @GetMapping("/queryAllBingZoneRegionList") public ResponseResult> queryAllBingZoneRegionList(@RequestParam(value = "type",required = false)String type){ From f397fd496bf8275618f7d98f357ba0c7771b7d39 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 15:57:23 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/vo/PartnerIntentInfoVO.java | 3 +- .../com/cool/store/vo/WantShopInfoVO.java | 43 +++++++++++++++++++ .../impl/HyPartnerIntentInfoServiceImpl.java | 3 +- 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java index b601bbb1d..da78ff652 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java @@ -1,5 +1,6 @@ package com.cool.store.vo; +import com.cool.store.request.WantShopInfoRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,7 +52,7 @@ public class PartnerIntentInfoVO { 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/vo/WantShopInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java new file mode 100644 index 000000000..833f3dcc4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/WantShopInfoVO.java @@ -0,0 +1,43 @@ +package com.cool.store.vo; + +import com.cool.store.request.WantShopInfoRequest; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/6/25 15:53 + * @Version 1.0 + */ +@Data +public class WantShopInfoVO { + + + private ShopInfoVO shopInfo; + + + private String uuid; + + + + @Data + static class ShopInfoVO{ + private ShopAddressVO shopAddress; + + private String storeIsTakeDown; + + private String takeDown; + + } + + @Data + static class ShopAddressVO{ + + 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 b5ae8d7df..1584402c1 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 @@ -23,6 +23,7 @@ import com.cool.store.utils.StringUtil; import com.cool.store.vo.PartnerIntentApplyInfoVO; import com.cool.store.vo.PartnerIntentInfoVO; import com.cool.store.vo.PartnerUserInfoVO; +import com.cool.store.vo.WantShopInfoVO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -223,7 +224,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand()); partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength()); partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove()); - partnerIntentInfoVO.setWantShopInfo(hyPartnerIntentInfoDO.getWantShopInfo()); + partnerIntentInfoVO.setWantShopInfo(JSONObject.parseArray(hyPartnerIntentInfoDO.getWantShopInfo(), WantShopInfoVO.class)); return partnerIntentInfoVO; } From 16fa372047994f08117501f3c53675c8d3278c61 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 16:19:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/utils/CoolDateUtils.java | 2 +- .../main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 2 +- .../src/main/resources/mapper/HyPartnerLineInfoMapper.xml | 4 ++-- 3 files changed, 4 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 1d98c27ac..1eb9582dd 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 @@ -66,7 +66,7 @@ public class CoolDateUtils { LocalDate today = LocalDate.now(); LocalDate thirdDay = today.plusDays(day); LocalDateTime thirdDayMidnight = LocalDateTime.of(thirdDay, LocalTime.MIDNIGHT); - LocalDateTime thirdDay235959 = thirdDayMidnight.with(LocalTime.MAX); + LocalDateTime thirdDay235959 = thirdDayMidnight.with(LocalTime.MIN); ZonedDateTime zonedDateTime = ZonedDateTime.of(thirdDay235959, ZoneId.systemDefault()); return Date.from(zonedDateTime.toInstant()); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 938afccc2..6378ad4b3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -315,7 +315,7 @@ b.interviewer as interviewer, b.create_time as createTime, b.room_id as roomId - from hy_partner_interview a inner join hy_partner_interview_plan b on a.interview_plan_id = b.id + from hy_partner_interview a left join hy_partner_interview_plan b on a.interview_plan_id = b.id and a.interviewer = #{userId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 92b418ef9..acfa39f3b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -265,7 +265,7 @@ select IFNULL(sum(if(workflow_stage=1 and workflow_status = 1,1,0)),0) as intentApplyApproveCount, IFNULL(sum(if(workflow_stage=2 and workflow_status = 1,1,0)),0) as reservationInterviewCount, - IFNULL(sum(if(workflow_stage=3 and workflow_status = 3,1,0)),0) as qualifiedInterviewCount + IFNULL(sum(if(workflow_stage=3 and workflow_status = 4,1,0)),0) as qualifiedInterviewCount from hy_partner_line_info @@ -277,7 +277,7 @@