From 3bba7cdc4c5e0bd667f2ef392f02977009f6a70f Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Sun, 25 Jun 2023 13:41:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=84=8F=E5=90=91?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/vo/ApplyBaseInfoVO.java | 22 +++++++++++++++++++ .../store/service/PartnerUserInfoService.java | 3 ++- .../impl/PartnerUserInfoServiceImpl.java | 18 +++++++++++++-- .../store/controller/PartnerController.java | 2 +- 4 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java new file mode 100644 index 000000000..364605893 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/ApplyBaseInfoVO.java @@ -0,0 +1,22 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author wxp + * @Date 2023/6/25 9:49 + * @Version 1.0 + */ +@Data +@ApiModel +public class ApplyBaseInfoVO { + + @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") + private String selectAreaStatus; + + @ApiModelProperty("所选省内是否含有开放城市") + private Boolean provinceHasOpenArea; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java index a15b932b5..31e31c840 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java @@ -2,6 +2,7 @@ package com.cool.store.service; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.request.PartnerUserInfoRequest; +import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; public interface PartnerUserInfoService { @@ -14,6 +15,6 @@ public interface PartnerUserInfoService { InviteCodeDetailVO selectInviteCodeDetail(String partnerId); - String updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest); + ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index 3a98ae2ac..75daddba9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -11,11 +11,14 @@ import com.cool.store.request.PartnerUserInfoRequest; import com.cool.store.service.HyPartnerBaseInfoService; import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.service.PartnerUserInfoService; +import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; @Service public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { @@ -72,11 +75,12 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { } @Override - public String updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) { + public ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) { HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(String.valueOf(partnerUserInfoRequest.getPartnerId())); if (hyPartnerUserInfoDO == null){ throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST); } + ApplyBaseInfoVO applyBaseInfoVO = new ApplyBaseInfoVO(); hyPartnerUserInfoDO.setUsername(partnerUserInfoRequest.getUsername()); hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile()); hyPartnerUserInfoDO.setLiveArea(partnerUserInfoRequest.getLiveArea()); @@ -95,6 +99,16 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { // 生成一条意向基本信息 hyPartnerBaseInfoService.generateBaseInfo(hyPartnerUserInfoDO, hyPartnerLineInfoDO.getId()); HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(partnerUserInfoRequest.getWantShopArea())); - return hyOpenAreaInfoDO != null ? hyOpenAreaInfoDO.getAreaStatus() : ""; + List hyOpenAreaInfoDOS = null; + if(hyOpenAreaInfoDO != null){ + applyBaseInfoVO.setSelectAreaStatus(hyOpenAreaInfoDO.getAreaStatus()); + String areaPath = hyOpenAreaInfoDO.getAreaPath(); + String province = areaPath.substring(0, areaPath.indexOf("/", areaPath.indexOf("/") + 1)); + hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(province, true, null, true); + } + if (CollectionUtils.isNotEmpty(hyOpenAreaInfoDOS)) { + applyBaseInfoVO.setProvinceHasOpenArea(true); + } + return applyBaseInfoVO; } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index a13c68e7e..371df2c89 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -52,7 +52,7 @@ public class PartnerController { @PostMapping(path = "/applyBaseInfo") @ApiOperation("提交加盟商基本信息") - public ResponseResult applyBaseInfo(@RequestBody PartnerUserInfoRequest partnerUserInfoRequest){ + public ResponseResult applyBaseInfo(@RequestBody PartnerUserInfoRequest partnerUserInfoRequest){ return ResponseResult.success(partnerUserInfoService.updatePartnerUserInfo(partnerUserInfoRequest)); } From d2954d6197743c7ff0e067323455b15f0e2ba138 Mon Sep 17 00:00:00 2001 From: pserimal Date: Sun, 25 Jun 2023 13:43:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E9=9D=A2?= =?UTF-8?q?=E8=AF=95=E4=BF=A1=E6=81=AF=E8=A1=A8auth=5Fcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/FlowServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index e34e96189..e808423f2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -157,6 +157,7 @@ public class FlowServiceImpl implements FlowService { hyPartnerInterviewDO.setUpdateTime(new Date()); //更新 hyPartnerInterviewDO.setStatus(Integer.valueOf(WorkflowStatusEnum.INTERVIEW_5.getCode())); + hyPartnerInterviewDO.setAuthCode(authCode); hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO); //4. 更新线索信息（开发主管） From e824b86e8893dbe888a8c2853ab457ec25147106 Mon Sep 17 00:00:00 2001 From: pserimal Date: Sun, 25 Jun 2023 13:43:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9F=A5=E8=AF=A2=E9=9D=A2=E8=AF=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8room=5Fstatus=E7=AD=9B=E9=80=89=E5=A4=B1=E8=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 15355e842..c17dcbae9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -351,7 +351,7 @@ and hpui.mobile like concat('%',#{record.interviewerMobile},'%') - + and hpip.room_status = #{record.roomStatus} From e3f6b7feafaed49c2d636f4cf373d1a077dccb97 Mon Sep 17 00:00:00 2001 From: wxp01309236 Date: Sun, 25 Jun 2023 13:44:44 +0800 Subject: [PATCH 4/4] setProvinceHasOpenArea --- .../com/cool/store/service/impl/PartnerUserInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index 75daddba9..245eed02b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -106,6 +106,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { String province = areaPath.substring(0, areaPath.indexOf("/", areaPath.indexOf("/") + 1)); hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(province, true, null, true); } + applyBaseInfoVO.setProvinceHasOpenArea(false); if (CollectionUtils.isNotEmpty(hyOpenAreaInfoDOS)) { applyBaseInfoVO.setProvinceHasOpenArea(true); }