suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-07 10:30:37 +08:00
parent 64ddcfcbb9 23dbb6aaf8
commit 45fc091c44
40 changed files with 145 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java
View File

@@ -23,7 +23,7 @@ public class AssessmentDataDTO {
/**
* 店铺是否合格
*/
@ApiModelProperty("店铺是否合格，0合格1不合格")
@ApiModelProperty("店铺是否合格，false不合格,true合格")
private Boolean qualified;
/**
* 原因

2
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java
View File

@@ -15,7 +15,7 @@ public class ThreeAcceptanceDTO {
private String acceptanceSignatures;
@ApiModelProperty("验收评语")
private String comments;
@ApiModelProperty("0通过，1不通过")
@ApiModelProperty("1通过，0不通过")
private Integer resultType;
@ApiModelProperty("验收时间")
private String acceptanceTime;

1
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("提交加盟合同签约请求体")
public class AddSignFranchiseRequest {
@ApiModelProperty("主键，更新时才存在")

1
coolstore-partner-model/src/main/java/com/cool/store/request/AuditCheckRequest.java
View File

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("稽核请求")
public class AuditCheckRequest {
@ApiModelProperty("稽核id")

1
coolstore-partner-model/src/main/java/com/cool/store/request/AuditResultRequest.java
View File

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("审核结果请求体")
public class AuditResultRequest {
@ApiModelProperty("kdz业务id唯一标识")

7
coolstore-partner-model/src/main/java/com/cool/store/request/EmployeeTrainingDetailRequest.java
View File

@@ -40,13 +40,6 @@ public class EmployeeTrainingDetailRequest {
private String trainingTeacherUserId;
/**
* 实操考核人员ID
*/
@ApiModelProperty("实操考核人员ID")
private String practicalAssessmentUserId;
/**
* 预计考核时间
*/

1
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("加盟费/保证金实体")
public class FranchiseFeeRequest {
private Long id;

1
coolstore-partner-model/src/main/java/com/cool/store/request/IntentAgreementSubmitRequest.java
View File

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("提交意向签署协议Request")
public class IntentAgreementSubmitRequest {
private String partnerId;

1
coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
View File

@@ -9,7 +9,6 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
@ApiModel("加盟意向Request")
public class JoinIntentionRequest {
private Long id;
@ApiModelProperty("线索信息表-线索id")

1
coolstore-partner-model/src/main/java/com/cool/store/request/LicenseListRequest.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("证照审批列表请求体")
public class LicenseListRequest extends PageBasicInfo {
@ApiModelProperty("门店名称")

1
coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
View File

@@ -9,7 +9,6 @@ import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@ApiModel("缴纳意向金Request")
public class LinePaySubmitRequest {
@ApiModelProperty("xfsg_user_info.partner_id")

1
coolstore-partner-model/src/main/java/com/cool/store/request/SubmitLicenseRequest.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("提交证照办理请求体")
public class SubmitLicenseRequest {
@ApiModelProperty("主键id")

4
coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java
View File

@@ -8,7 +8,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("系统建店申请")
public class SysStoreAppRequest {
@ApiModelProperty("主键id")
@@ -28,7 +27,6 @@ public class SysStoreAppRequest {
@Data
@ApiModel("加盟商信息")
public static class FranInfo {
@ApiModelProperty("加盟商类型" +
"0-新加盟商开单店;1-老加盟商开单店;" +
@@ -49,7 +47,6 @@ public class SysStoreAppRequest {
}
@Data
@ApiModel("门店信息")
public static class StoreDetail{
@ApiModelProperty("门店性质 20：加盟 10：直营")
private Integer storeNature;
@@ -121,7 +118,6 @@ public class SysStoreAppRequest {
}
@Data
@ApiModel("督导相关信息")
public static class SupervisorDetail{
@ApiModelProperty("督导姓名")

1
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -7,7 +7,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("提交加盟合同签约请求体")
public class AddSignFranchiseResponse {
@ApiModelProperty("主键，更新时才存在")

2
coolstore-partner-model/src/main/java/com/cool/store/response/CheckListResponse.java
View File

@@ -45,7 +45,7 @@ public class CheckListResponse {
@ApiModelProperty("招商经理id")
private String investmentId;
@ApiModelProperty("招商经理id")
@ApiModelProperty("招商经理姓名")
private String investmentName;
@ApiModelProperty("稽核人")

2
coolstore-partner-model/src/main/java/com/cool/store/response/LicenseApiResponse.java
View File

@@ -7,7 +7,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel("证照信息回调响应体")
@Data
@Builder
@NoArgsConstructor

1
coolstore-partner-model/src/main/java/com/cool/store/response/LicenseListResponse.java
View File

@@ -7,7 +7,6 @@ import lombok.Data;
import java.util.Date;
@Data
@ApiModel("证照审批列表响应体")
public class LicenseListResponse {
private String shopId;

1
coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java
View File

@@ -14,7 +14,6 @@ import java.util.List;
import java.util.Objects;
@Data
@ApiModel("提交证照办理响应体")
public class SubmitLicenseResponse {
@ApiModelProperty("主键id")

3
coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java
View File

@@ -42,7 +42,6 @@ public class SysStoreAppResponse {
}
@Data
@ApiModel("加盟商信息")
public static class FranInfo {
@ApiModelProperty("加盟商姓名")
@@ -88,7 +87,6 @@ public class SysStoreAppResponse {
}
@Data
@ApiModel("门店信息")
public static class StoreDetail {
@ApiModelProperty("门店性质")
private Integer storeNature;
@@ -167,7 +165,6 @@ public class SysStoreAppResponse {
}
@Data
@ApiModel("督导相关信息")
public static class SupervisorDetail {
@ApiModelProperty("督导姓名")

31
coolstore-partner-model/src/main/java/com/cool/store/response/ThreeAcceptanceResponse.java
View File

@@ -1,31 +0,0 @@
package com.cool.store.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/04/29/下午11:51
* @Version 1.0
* @注释:
*/
@Data
public class ThreeAcceptanceResponse {
@ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
private String engineeringAcceptanceSignatures;
@ApiModelProperty("营运部验收签名 {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
private String operationsAcceptanceSignatures;
@ApiModelProperty("加密商验收签名 {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
private String partnerAcceptanceSignatures;
@ApiModelProperty("验收日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptanceTime;
@ApiModelProperty("验收结果")
private Byte resultType;
@ApiModelProperty("验收评语")
private String acceptanceComments;
}

4
coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
View File

@@ -104,6 +104,10 @@ public class AssessmentUserTrainingVO {
private Integer assessmentStatus;
@ApiModelProperty("所属区域")
private String regionNodeName;
@ApiModelProperty("考核数据")
List<AssessmentTemplateDataVO> templateDataList;

12
coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java
View File

@@ -30,7 +30,7 @@ public class EmployeeTrainingDetailVO {
private Long regionId;
@ApiModelProperty("角色id 170000000-店长 180000000-店员")
private String roleId;
private Long roleId;
@ApiModelProperty("店铺id")
private Long shopId;
@@ -42,15 +42,9 @@ public class EmployeeTrainingDetailVO {
private Long employeeTrainingId;
@ApiModelProperty("战区名称")
private String regionName;
@ApiModelProperty("大区ID")
private Long largeRegionId;
@ApiModelProperty("大区名称")
private String largeRegionName;
@ApiModelProperty("所属区域")
private String regionNodeName;
/**
* 实训开始时间
*/

14
coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java
View File

@@ -35,7 +35,7 @@ public class EmployeeTrainingVO {
private Long shopId;
@ApiModelProperty("店铺名称")
private Long shopName;
private String shopName;
@ApiModelProperty("培训id")
private Long employeeTrainingId;
@@ -61,14 +61,9 @@ public class EmployeeTrainingVO {
@ApiModelProperty("考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过")
private Integer assessmentStatus;
@ApiModelProperty("战区名称")
private String regionName;
@ApiModelProperty("大区ID")
private Long largeRegionId;
@ApiModelProperty("大区名称")
private String largeRegionName;
@ApiModelProperty("所属区域")
private String regionNodeName;
/**
* 实训结束时间
*/
@@ -119,4 +114,7 @@ public class EmployeeTrainingVO {
*/
@ApiModelProperty("实际考核时间")
private Date actualAssessmentTime;
@ApiModelProperty("登记时间")
private Date registerTime;
}

3
coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeUserTrainingVO.java
View File

@@ -78,6 +78,9 @@ public class EmployeeUserTrainingVO {
@ApiModelProperty("带教老师名称")
private String trainingTeacherUserName;
@ApiModelProperty("所属区域")
private String regionNodeName;
@ApiModelProperty("培训数据")
List<AssessmentTemplateDataVO> templateDataList;

9
coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAcceptanceInfoListVO.java
View File

@@ -36,14 +36,9 @@ public class OpenAcceptanceInfoListVO {
@ApiModelProperty("战区Id")
private Long regionId;
@ApiModelProperty("战区名称")
private String regionName;
@ApiModelProperty("所属区域")
private String regionNodeName;
@ApiModelProperty("大区ID")
private Long largeRegionId;
@ApiModelProperty("大区名称")
private String largeRegionName;
@ApiModelProperty("计划开业时间")
private Date planOpenTime;
@ApiModelProperty("新店开业结束时间")