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)); }