diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml index 01663186b..b0201f021 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml @@ -9,7 +9,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml index f41b4d541..b6a6c37cc 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml @@ -13,7 +13,7 @@ - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java new file mode 100644 index 000000000..c96394dab --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AdvancedSettingRequest.java @@ -0,0 +1,27 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:58 + * @Version 1.0 + */ +@Data +@ApiModel +public class AdvancedSettingRequest { + + private Long id; + + private String partnerUrl; + + private String tencentVideoAccount; + + private String tencentVideoKey; + + private List roleIdList; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java index 432bba335..7ae9e9fe8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java @@ -13,6 +13,7 @@ import lombok.Data; @ApiModel public class CloseFollowRequest { + @ApiModelProperty("线索ID") private Long lineId; @ApiModelProperty("公开拒绝原因") @@ -21,5 +22,9 @@ public class CloseFollowRequest { private String rejectRealReason; @ApiModelProperty("证明文件与凭证") private String certifyFile; + @ApiModelProperty("通过原因") + private String passReason; + @ApiModelProperty("通过-pass 拒绝-reject") + private String type; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java new file mode 100644 index 000000000..12c80bfce --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java @@ -0,0 +1,28 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:44 + * @Version 1.0 + */ +@Data +@ApiModel +public class IntentAreaSettingRequest { + + @ApiModelProperty("意向区域-intent 开发区域=dev") + private String type; + @ApiModelProperty("Id") + private Long id; + @ApiModelProperty("战区名称") + private String zoneName; + @ApiModelProperty("组织机构ID集合") + private List orgIdList; + @ApiModelProperty("开放区域id集合") + private List openAreaIdList; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java new file mode 100644 index 000000000..3d748c4d4 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OpenAreaRequest.java @@ -0,0 +1,31 @@ +package com.cool.store.request; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:27 + * @Version 1.0 + */ +@Data +@ApiModel +public class OpenAreaRequest { + + @ApiModelProperty("开发区域ID集合") + private List idList; + + @ApiModelProperty("开放区域状态") + private String status; + + @ApiModelProperty("背景banner") + private String backgroundBanner; + + @ApiModelProperty("详细Banner") + private String detailBanner; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java new file mode 100644 index 000000000..bb0da6115 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AdvancedSettingVO.java @@ -0,0 +1,27 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:58 + * @Version 1.0 + */ +@Data +@ApiModel +public class AdvancedSettingVO { + + private Long id; + + private String partnerUrl; + + private String tencentVideoAccount; + + private String tencentVideoKey; + + private List roleIdList; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java new file mode 100644 index 000000000..7d0dccc36 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java @@ -0,0 +1,27 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:47 + * @Version 1.0 + */ +@Data +@ApiModel +public class IntentAreaSettingVO { + + private Long id; + + private String zoneName; + + private List orgVOS; + + private Date updateTime; + + private String updateUserId; +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java new file mode 100644 index 000000000..688cd1eaa --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerClerkVO.java @@ -0,0 +1,36 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/30 15:19 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerClerkVO { + + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("hy_partner_line_info.id") + private Long partnerLineId; + + @ApiModelProperty("hy_partner_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("伙伴姓名") + private String username; + + @ApiModelProperty("关系") + private String relationship; + + @ApiModelProperty("年龄") + private Integer age; + + @ApiModelProperty("选择原因") + private String chooseReason; +} 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 new file mode 100644 index 000000000..be98c2254 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java @@ -0,0 +1,84 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/5/30 15:14 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerIntentInfoVO { + + @ApiModelProperty("") + private Long id; + + @ApiModelProperty("hy_partner_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("hy_partner_line_info.id") + private Long partnerLineId; + + @ApiModelProperty("常驻区域") + private String liveArea; + + @ApiModelProperty("意向开店区域") + private String wantShopArea; + + @ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂") + private Integer acceptAdjustType; + + @ApiModelProperty("是否有意向铺位") + private Integer isHaveWantShop; + + @ApiModelProperty("意向铺位信息,json字段,最多5个") + private String wantShopInfo; + + @ApiModelProperty("最大预算") + private String maxBudget; + + @ApiModelProperty("资金来源 1自有资金;2借贷资金;3部分自有、部分借代;4部分自有、部分亲友借代") + private String moneySource; + + @ApiModelProperty("资金证明") + private String moneyProve; + + @ApiModelProperty("学历") + private String education; + + @ApiModelProperty("工作年限") + private String workYear; + + @ApiModelProperty("是否具有工作经验") + private Integer isHaveWorkExp; + + @ApiModelProperty("工作或经商经验") + private String workExp; + + @ApiModelProperty("是否是消费者") + private Integer isConsumer; + + @ApiModelProperty("其他品牌") + private String otherBand; + + @ApiModelProperty("品牌优势") + private String brandStrength; + + @ApiModelProperty("需要改进") + private String needImprove; + + @ApiModelProperty("优势") + private String strength; + + @ApiModelProperty("劣势") + private String weakness; + + @ApiModelProperty("创建时间") + private Date createTime; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java index bea02f7d7..b12414ba3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java @@ -1,9 +1,40 @@ package com.cool.store.vo; +import com.cool.store.request.PartnerClerkRequest; +import com.cool.store.request.PartnerIntentInfoRequest; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + /** * @Author suzhuhong * @Date 2023/5/31 11:40 * @Version 1.0 */ +@Data +@ApiModel public class PartnerSummaryInfoVO { + + @ApiModelProperty("线索ID") + private Long id; + + @ApiModelProperty("hy_partner_user_info.partner_id") + private String partnerId; + + @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") + private String workflowStage; + + @ApiModelProperty("流程子状态") + private String workflowStatus; + + @ApiModelProperty("基础信息") + private PartnerBaseInfoVO partnerBaseInfoVO; + + @ApiModelProperty("加盟商店员信息列表") + private List partnerClerkVOS; + + @ApiModelProperty("加盟商意向信息/行业认知") + private PartnerIntentInfoVO partnerIntentInfoVO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java new file mode 100644 index 000000000..d6f96d492 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java @@ -0,0 +1,22 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:48 + * @Version 1.0 + */ +@Data +@ApiModel +public class orgVO { + + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("组织机构名称") + private String name; + + +} diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index f451e0bbc..f3c2f5268 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.List; /** * @Author suzhuhong @@ -65,7 +66,13 @@ public class DeskController { @GetMapping(path = "/lastMonthCloseLine") @ApiOperation("最近30天结束的线索") - public ResponseResult> lastMonthCloseLine(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){ + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNumber", value = "页码", required = false), + @ApiImplicitParam(name = "pageSize", value = "分页大小", required = false) + }) + public ResponseResult> lastMonthCloseLine(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ return ResponseResult.success(); @@ -113,6 +120,7 @@ public class DeskController { @PostMapping(path = "/removeBlackList") + @ApiOperation("移出黑名单") public ResponseResult removeBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, @RequestBody LineBlackListRequest lineBlackListRequest){ @@ -121,6 +129,7 @@ public class DeskController { } @PostMapping(path = "/joinBlackList") + @ApiOperation("加入黑名单") public ResponseResult joinBlackList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, @RequestBody LineBlackListRequest lineBlackListRequest){ @@ -129,7 +138,8 @@ public class DeskController { } - @PostMapping(path = "/closeFollow") + @PostMapping(path = "/closeOrPassFollow") + @ApiOperation("结束跟进/通过流程") public ResponseResult closeFollow(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, @RequestBody CloseFollowRequest closeFollowRequest){ @@ -154,6 +164,107 @@ public class DeskController { return ResponseResult.success(); } + @GetMapping(path = "/queryPartnerIntentApplyInfo") + @ApiOperation("查看意向审核信息") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + }) + public ResponseResult queryPartnerIntentApplyInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "lineId",required = false)Long lineId){ + + + return ResponseResult.success(); + } + + + + @GetMapping(path = "/getOpenAreaTree") + @ApiOperation("开放城市树") + @ApiImplicitParams({ + @ApiImplicitParam(name = "parentId", value = "父区域名称", required = false), + @ApiImplicitParam(name = "type", value = "可预约-reservation 可申请-apply ", required = false), + @ApiImplicitParam(name = "keyWord", value = "搜索关键字", required = false) + }) + public ResponseResult> getOpenAreaTree(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "parentId",required = false)Long parentId, + @RequestParam(value = "type",required = false)String type, + @RequestParam(value = "keyWord",required = false)String keyWord){ + return ResponseResult.success(); + } + + + + @PostMapping(path = "/changeOpenAreaStatus") + @ApiOperation("变更开放区域状态") + public ResponseResult changeOpenAreaStatus(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody OpenAreaRequest openAreaRequest){ + + return ResponseResult.success(); + } + + + @PostMapping(path = "/addZone") + @ApiOperation("新建意向战区/开发战区") + public ResponseResult addZone(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ + + return ResponseResult.success(); + } + + @PostMapping(path = "/updateZone") + @ApiOperation("编辑意向战区/开发战区") + public ResponseResult updateZone(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody IntentAreaSettingRequest intentAreaSettingRequest){ + + return ResponseResult.success(); + } + + + + @GetMapping(path = "/getZoneList") + @ApiOperation("战区列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), + }) + public ResponseResult> getZoneList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "type",required = false)String type, + @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, + @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + return ResponseResult.success(); + } + + + @GetMapping(path = "/deletedZoneList") + @ApiOperation("删除战区") + @ApiImplicitParams({ + @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), + }) + public ResponseResult> deletedZoneList(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "id",required = false)Long id){ + return ResponseResult.success(); + } + + + @GetMapping(path = "/getAdvanceSetting") + @ApiOperation("查询企业高级设置") + public ResponseResult getAdvanceSetting(@PathVariable(value = "enterprise-id", required = false) String enterpriseId){ + + + return ResponseResult.success(); + } + + @GetMapping(path = "/changeAdvanceSetting") + @ApiOperation("新增或者修改高级设置") + public ResponseResult getAdvanceSetting(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody AdvancedSettingRequest advancedSettingRequest){ + + + return ResponseResult.success(); + } + + + + 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 index e99a2d577..67e29bea1 100644 --- 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 @@ -4,6 +4,7 @@ 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.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping({"/v1/partnerManage/{enterprise-id}/openArea" }) @Slf4j +@Api(tags = "开发区域城市") public class OpenAreaController { 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 754d047b6..2df3e418d 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 @@ -7,7 +7,9 @@ import com.cool.store.response.ResponseResult; import com.cool.store.vo.OpenAreaVO; import com.cool.store.vo.PartnerLineDetailVO; import com.cool.store.vo.PartnerLineInfoVO; +import com.cool.store.vo.PartnerSummaryInfoVO; import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -22,6 +24,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping({"/v1/partnerManage/{enterprise-id}/partner" }) @Slf4j +@Api(tags = "加盟商信息") public class PartnerController { @@ -120,6 +123,19 @@ public class PartnerController { } + @GetMapping(path = "/queryPartnerIntentInfo") + @ApiOperation("查看意向申请书") + @ApiImplicitParams({ + @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), + }) + public ResponseResult queryPartnerIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "lineId",required = false)Long lineId){ + + + return ResponseResult.success(); + } + +