From 2784c724a752674fead06236a9427db711b6af7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 30 May 2023 14:44:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/BaseUserInfoRequest.java | 38 +++++++++++ .../java/com/cool/store/vo/OpenAreaVO.java | 49 ++++++++++++++ .../com/cool/store/vo/OpenProvinceVO.java | 25 ++++++++ .../store/service/WechatMiniAppService.java | 3 +- .../impl/WechatMiniAppServiceImpl.java | 9 ++- .../controller/MiniProgramAppController.java | 13 +++- .../store/controller/OpenAreaController.java | 59 +++++++++++++++++ .../store/controller/PartnerController.java | 64 +++++++++++++++++++ 8 files changed, 254 insertions(+), 6 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java create mode 100644 coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java create mode 100644 coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java new file mode 100644 index 000000000..92f6d75fa --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BaseUserInfoRequest.java @@ -0,0 +1,38 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/30 9:49 + * @Version 1.0 + */ +@Data +@ApiModel +public class BaseUserInfoRequest { + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("申请人姓名") + private String username; + + @ApiModelProperty("常驻区域") + private String liveArea; + + @ApiModelProperty("意向开店区域") + private String wantShopArea; + + @ApiModelProperty("意向开店区域ID") + private Long wantShopAreaId; + + @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") + private Integer acceptAdjustType; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java new file mode 100644 index 000000000..53d806044 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java @@ -0,0 +1,49 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 开放城市VO + * @Author suzhuhong + * @Date 2023/5/29 16:27 + * @Version 1.0 + */ +@Data +@ApiModel +public class OpenAreaVO { + + @ApiModelProperty("ID") + private Long id; + + @ApiModelProperty("parent.id") + private Long parentId; + + @ApiModelProperty("区域名称") + private String areaName; + + @ApiModelProperty("区域路径") + private String areaPath; + + @ApiModelProperty("背景图URL 重点区域时候必填") + private String backgroundBanner; + + @ApiModelProperty("详情banner URL 重点区域时候必填") + private String detailBanner; + + @ApiModelProperty("状态 open-开放 keyOpen-重点开放 notOpen-未开放 saturated-已饱和") + private String areaStatus; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新时间") + private Date updateTime; + + @ApiModelProperty("更新人") + private String updateUserId; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java new file mode 100644 index 000000000..3b0820c87 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenProvinceVO.java @@ -0,0 +1,25 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/29 19:46 + * @Version 1.0 + */ +@Data +@ApiModel +public class OpenProvinceVO { + + @ApiModelProperty("可申请省份") + List applyProvinceList; + + @ApiModelProperty("可预约省份") + List reservationProvinceList; + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java index b96ab41fa..ef81ba5f9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java @@ -16,6 +16,7 @@ public interface WechatMiniAppService { CodeSessionVO miniProgramLogin(MiniProgramLoginDTO param); + CodeSessionVO getUserPhoneNumber(MiniProgramLoginDTO param); - MiniProgramUserVO queryMiniProgramUser(MiniProgramMsgDTO param); + CodeSessionVO queryMiniProgramUser(MiniProgramMsgDTO param); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index c217a80a5..24f7d9884 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -60,7 +60,12 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } @Override - public MiniProgramUserVO queryMiniProgramUser(MiniProgramMsgDTO param) { + public CodeSessionVO getUserPhoneNumber(MiniProgramLoginDTO param) { + return null; + } + + @Override + public CodeSessionVO queryMiniProgramUser(MiniProgramMsgDTO param) { String sessionCacheKey = MessageFormat.format(CommonConstants.MINI_PROGRAM_SESSION_KEY, param.getAppid(), param.getOpenid()); String sessionKey = redisUtilPool.getString(sessionCacheKey); if (StringUtils.isBlank(sessionKey)) { @@ -73,6 +78,6 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { if (Objects.isNull(miniProgramUser)) { throw new ServiceException(ErrorCodeEnum.GET_WECHAT_USER_INFO_FAIL); } - return miniProgramUser; + return new CodeSessionVO(); } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java index c66c6d7c4..67ccbddb6 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/MiniProgramAppController.java @@ -36,10 +36,17 @@ public class MiniProgramAppController { return ResponseResult.success(codeSessionVO); } + @ApiOperation("获取手机号") + @PostMapping("/code/getUserPhoneNumber") + public ResponseResult getUserPhoneNumber(@RequestBody @Valid MiniProgramLoginDTO param) { + CodeSessionVO codeSessionVO = wechatMiniAppService.getUserPhoneNumber(param); + return ResponseResult.success(codeSessionVO); + } + @ApiOperation("获取小程序用户信息") @PostMapping("/user") - public ResponseResult queryMiniProgramUser(@RequestBody @Valid MiniProgramMsgDTO param) { - MiniProgramUserVO miniProgramUserVO = wechatMiniAppService.queryMiniProgramUser(param); - return ResponseResult.success(miniProgramUserVO); + public ResponseResult queryMiniProgramUser(@RequestBody @Valid MiniProgramMsgDTO param) { + CodeSessionVO codeSessionVO = wechatMiniAppService.queryMiniProgramUser(param); + return ResponseResult.success(codeSessionVO); } } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java new file mode 100644 index 000000000..f4f3c71d3 --- /dev/null +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java @@ -0,0 +1,59 @@ +package com.cool.store.controller; + +import com.cool.store.response.ResponseResult; +import com.cool.store.vo.OpenAreaVO; +import com.cool.store.vo.OpenProvinceVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * @Author suzhuhong + * @Date 2023/5/29 14:19 + * @Version 1.0 + */ +@RestController +@RequestMapping({"/v1/partnerManage/{enterprise-id}/openArea" }) +@Slf4j +public class OpenAreaController { + + + @GetMapping(path = "/getOpenAreaList") + @ApiOperation("开放城市(重点城市接口 区域申请搜索 )") + @ApiImplicitParams({ + @ApiImplicitParam(name = "keyOpenFlag", value = "重点城市标识 重点城市查询入参", required = false), + @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), + @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false), + @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false), + @ApiImplicitParam(name = "pageNumber", value = "页码", required = false), + @ApiImplicitParam(name = "pageSize", value = "分页大小", required = false) + }) + public ResponseResult> getOpenAreaList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "keyOpenFlag",required = false)Boolean keyOpenFlag, + @RequestParam(value = "parentId",required = false)Boolean parentId, + @RequestParam(value = "type",required = false)Boolean type, + @RequestParam(value = "keyWord",required = false)Boolean keyWord, + @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + return ResponseResult.success(); + } + + + @GetMapping(path = "/getOpenProvince") + @ApiOperation("可申请加盟省份/可预约加盟省份") + public ResponseResult getOpenProvince(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){ + + return ResponseResult.success(); + } + + + + + + + + +} 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 new file mode 100644 index 000000000..f74880398 --- /dev/null +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -0,0 +1,64 @@ +package com.cool.store.controller; + +import com.cool.store.request.BaseUserInfoRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.vo.OpenAreaVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +/** + * @Author suzhuhong + * @Date 2023/5/29 20:04 + * @Version 1.0 + */ +@RestController +@RequestMapping({"/v1/partnerManage/{enterprise-id}/partner" }) +@Slf4j +public class PartnerController { + + + + @PostMapping(path = "/applyBaseInfo") + @ApiOperation("提交基本信息") + public ResponseResult applyBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody BaseUserInfoRequest baseUserInfoRequest){ + + return ResponseResult.success(); + } + + + @PostMapping(path = "/changeBaseInfo") + @ApiOperation("变更基本信息") + public ResponseResult changeBaseInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody BaseUserInfoRequest baseUserInfoRequest){ + + //前提 未提交加盟申请 + //成功 意向区域变更成功 失败 您已进入意向申请流程，当前不可变更意向区域 + return ResponseResult.success(); + } + + + @GetMapping(path = "/getSubmitIntentionApplyFlag") + @ApiOperation("获取提交意向申请标识 true 已提交 false 未提交") + public ResponseResult getSubmitIntentionApplyFlag(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){ + + + return ResponseResult.success(); + } + + + + + + + + + + + + + + +}