diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java index 2849335f4..5598e751c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyAdvancedSettingMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyAdvancedSettingDO; +import com.cool.store.entity.HyAdvancedSettingDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java index 3914c93ff..fb92f71e4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyContentInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyContentInfoDO; +import com.cool.store.entity.HyContentInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java index 26c31aa94..0eaf82412 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevZoneInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyIntendDevZoneInfoDO; +import com.cool.store.entity.HyIntendDevZoneInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java index 0e295868f..61a7e8096 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyIntendDevelopementMappingDO; +import com.cool.store.entity.HyIntendDevelopementMappingDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java index 09f36b07d..6aa82dffc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyOpenAreaInfoDO; +import com.cool.store.entity.HyOpenAreaInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java index 2f562b1b9..58a6a1174 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerBaseInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerBaseInfoDO; +import com.cool.store.entity.HyPartnerBaseInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java index 89c522d22..2342a5dfd 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerCertificationInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerCertificationInfoDO; +import com.cool.store.entity.HyPartnerCertificationInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java index d0adf8ac9..c761f833a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerClerkMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerClerkDO; +import com.cool.store.entity.HyPartnerClerkDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index 2a22c286a..db627435e 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerIntentInfoDO; +import com.cool.store.entity.HyPartnerIntentInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java index a915be9fc..4828339b8 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewLogMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerInterviewLogDO; +import com.cool.store.entity.HyPartnerInterviewLogDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index bc6c871d6..65566885c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerInterviewDO; +import com.cool.store.entity.HyPartnerInterviewDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java index 11fa9c2a5..ce7c795a2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewPlanMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerInterviewPlanDO; +import com.cool.store.entity.HyPartnerInterviewPlanDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index d436cdc7b..6308a3302 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.HyPartnerLineInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java index 14cc885c9..317e07ba6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerTaskInfoLogMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerTaskInfoLogDO; +import com.cool.store.entity.HyPartnerTaskInfoLogDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java index 411fc56e2..ccc94954d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerUserInfoDO; +import com.cool.store.entity.HyPartnerUserInfoDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java index 5e91670a6..f50d69d10 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserPlatformBindMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyPartnerUserPlatformBindDO; +import com.cool.store.entity.HyPartnerUserPlatformBindDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java index 99927dfff..59f9a4471 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyWorkflowStageMapper.java @@ -1,6 +1,6 @@ package com.cool.store.mapper; -import com.cool.store.model.entity.HyWorkflowStageDO; +import com.cool.store.entity.HyWorkflowStageDO; import org.apache.ibatis.annotations.Param; /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml index 7e271e308..635897157 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyAdvancedSettingMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml index e0d57e427..0bc1b97c7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyContentInfoMapper.xml @@ -1,7 +1,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml index 98d9b7271..47bddedd7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevZoneInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml index 9924b0c34..917162556 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index 8618a0ada..79474931c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml index b5df99cdb..f993ffbc6 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerBaseInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml index cb73c13b2..05fc699fe 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml index a7701a165..ee92f4644 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerClerkMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml index 6fd12ab41..94d3779e3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml index 33a83a1de..01663186b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewLogMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index 77b63cb50..51ae0ddf8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml index 2a51b78d7..ce7e0ce6b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewPlanMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 522fa3184..924b25f4a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml index 4113b9b01..f41b4d541 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerTaskInfoLogMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 542829270..6e13a2861 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml index f766174c2..42ceb1e68 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserPlatformBindMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml index fef74ce38..bdd3223d3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyWorkflowStageMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java new file mode 100644 index 000000000..000974300 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddTagsRequest.java @@ -0,0 +1,22 @@ +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 11:19 + * @Version 1.0 + */ +@Data +@ApiModel +public class AddTagsRequest { + + @ApiModelProperty("线索ID") + private Long lineId; + @ApiModelProperty("标签列表") + private List Tags; +} 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 new file mode 100644 index 000000000..432bba335 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/CloseFollowRequest.java @@ -0,0 +1,25 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/31 11:01 + * @Version 1.0 + */ +@Data +@ApiModel +public class CloseFollowRequest { + + @ApiModelProperty("线索ID") + private Long lineId; + @ApiModelProperty("公开拒绝原因") + private String rejectPublicReason; + @ApiModelProperty("真实拒绝原因") + private String rejectRealReason; + @ApiModelProperty("证明文件与凭证") + private String certifyFile; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfo.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java similarity index 94% rename from coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfo.java rename to coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java index d23d4932f..bfa6652e4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfo.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerSummaryInfoRequest.java @@ -13,7 +13,7 @@ import java.util.List; */ @ApiModel @Data -public class PartnerSummaryInfo { +public class PartnerSummaryInfoRequest { @ApiModelProperty("加盟商基本信息对象") private PartnerBaseInfoRequest partnerBaseInfoRequest; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java new file mode 100644 index 000000000..8064ec71f --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/InviteCodeDetailVO.java @@ -0,0 +1,25 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/31 10:50 + * @Version 1.0 + */ +@Data +@ApiModel +public class InviteCodeDetailVO { + + @ApiModelProperty("推荐加盟商名称") + private String partnerName; + @ApiModelProperty("推荐加盟商手机号码") + private String partnerPhone; + @ApiModelProperty("邀请码") + private String inviteCode; + @ApiModelProperty("门店名称") + private String storeName; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java new file mode 100644 index 000000000..850ebc93d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineFollowHistoryVO.java @@ -0,0 +1,30 @@ +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/31 10:54 + * @Version 1.0 + */ +@Data +@ApiModel +public class LineFollowHistoryVO { + + @ApiModelProperty("开始跟进时间") + private Date startTime; + @ApiModelProperty("结束跟进时间") + private Date closeTime; + @ApiModelProperty("结束原因") + private String closeCause; + + + + + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java new file mode 100644 index 000000000..37ed88a03 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerBaseInfoVO.java @@ -0,0 +1,54 @@ +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/31 11:28 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerBaseInfoVO { + + @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 mobile; + + @ApiModelProperty("姓名") + private String username; + + @ApiModelProperty("1男 2女") + private Boolean sex; + + @ApiModelProperty("民族") + private String nation; + + @ApiModelProperty("出生日期") + private Date birthdate; + + @ApiModelProperty("身份证") + private String idCard; + + @ApiModelProperty("身份证正面") + private String idCardPhotoFront; + + @ApiModelProperty("身份证反面") + private String idCardPhotoBlack; + + @ApiModelProperty("住址") + private String liveAddress; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java index a54a51a4b..12e5c3895 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java @@ -40,6 +40,20 @@ public class PartnerInterviewInfoVO { @ApiModelProperty("意向合同号") private String authCode; + @ApiModelProperty("面试开始时间") + private Date startTime; + @ApiModelProperty("面试官ID") + private String interviewer; + @ApiModelProperty("面试官名称") + private String interviewerName; + + @ApiModelProperty("预约时间") + private Date createTime; + + @ApiModelProperty("房间号") + private String roomId; + @ApiModelProperty("过程信息") + private String processInfo; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java new file mode 100644 index 000000000..4de0b32d3 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineDetailVO.java @@ -0,0 +1,67 @@ +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/31 10:38 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerLineDetailVO { + + @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("加盟商用户ID") + private String partnerUserId; + + @ApiModelProperty("加盟商用户名称") + private String partnerUserName; + + @ApiModelProperty("加盟商用户手机号") + private String partnerUserPhone; + + @ApiModelProperty("手机号归属地") + private String phoneAddress; + + @ApiModelProperty("招商经理") + private String investmentManager; + + @ApiModelProperty("招商经理手机号") + private String investmentManagerPhone; + @ApiModelProperty("用户画像") + private String userPortrait; + + @ApiModelProperty("意向审核信息") + private PartnerIntentApplyInfoVO partnerIntentApplyInfoVO; + + + @ApiModelProperty("预约面试、合格资格面试 信息") + private PartnerInterviewInfoVO partnerInterviewInfoVO; + + @ApiModelProperty("邀请门店基本信息") + private InviteCodeDetailVO inviteCodeDetailVO; + + @ApiModelProperty("跟进历史") + List lineFollowHistoryVOList; + + + + + +} 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 new file mode 100644 index 000000000..bea02f7d7 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerSummaryInfoVO.java @@ -0,0 +1,9 @@ +package com.cool.store.vo; + +/** + * @Author suzhuhong + * @Date 2023/5/31 11:40 + * @Version 1.0 + */ +public class PartnerSummaryInfoVO { +} 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 503b57874..f451e0bbc 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 @@ -55,7 +55,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, @RequestParam(value = "lineId",required = false)Long lineId){ @@ -73,7 +73,7 @@ public class DeskController { @PostMapping(path = "/allocationInvestmentManager") - @ApiOperation("分配招商经理") + @ApiOperation("分配招商经理/转让招商经理") public ResponseResult> allocationInvestmentManager(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, @RequestBody AllocationInvestmentManagerRequest allocationInvestmentManagerRequest){ @@ -129,6 +129,32 @@ public class DeskController { } + @PostMapping(path = "/closeFollow") + public ResponseResult closeFollow(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody CloseFollowRequest closeFollowRequest){ + + + return ResponseResult.success(); + } + + @PostMapping(path = "/changeIntentInfo") + @ApiOperation("员工端变更C端用户意向信息") + public ResponseResult changeIntentInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody BaseUserInfoRequest baseUserInfoRequest){ + + return ResponseResult.success(); + } + + + @PostMapping(path = "/addTags") + @ApiOperation("添加标签接口") + public ResponseResult addTags(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestBody AddTagsRequest addTagsRequest){ + + 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 index 094952d1a..754d047b6 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 @@ -1,9 +1,11 @@ package com.cool.store.controller; import com.cool.store.request.BaseUserInfoRequest; -import com.cool.store.request.PartnerSummaryInfo; +import com.cool.store.request.PartnerSummaryInfoRequest; +import com.cool.store.request.PartnerSummaryInfoRequest; 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.github.pagehelper.PageInfo; import io.swagger.annotations.ApiImplicitParam; @@ -84,7 +86,7 @@ public class PartnerController { @PostMapping(path = "/submitPartnerSummaryInfo") @ApiOperation("提交加盟商汇总信息") public ResponseResult submitPartnerSummaryInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestBody PartnerSummaryInfo partnerSummaryInfo){ + @RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){ //前提 未提交加盟申请 //成功 意向区域变更成功 失败 您已进入意向申请流程,当前不可变更意向区域 @@ -96,7 +98,7 @@ public class PartnerController { @PostMapping(path = "/changePartnerSummaryInfo") @ApiOperation("修改加盟商汇总信息 修改意向信息 修改店员信息 修改行业认知") public ResponseResult changePartnerSummaryInfo(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestBody PartnerSummaryInfo partnerSummaryInfo){ + @RequestBody PartnerSummaryInfoRequest partnerSummaryInfo){ //前提 未提交加盟申请 //成功 意向区域变更成功 失败 您已进入意向申请流程,当前不可变更意向区域 @@ -110,8 +112,8 @@ public class PartnerController { @ApiImplicitParams({ @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), }) - public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, - @RequestParam(value = "lineId",required = false)Long lineId){ + public ResponseResult getPartnerLineDetail(@PathVariable(value = "enterprise-id", required = false) String enterpriseId, + @RequestParam(value = "lineId",required = false)Long lineId){ return ResponseResult.success();