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

Merge branch 'dev/feat/partner1.5.2_20231121' into hxd/feat/partner1.5.2

Browse Source
This commit is contained in:
xiaodong.hu
2023-11-13 13:39:33 +08:00
parent 7b877e7cda fcd0b44f34
commit 6d268cd523
35 changed files with 784 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerInterviewBookSituation.java Normal file
View File

@@ -0,0 +1,40 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @author Fun Li 2023/11/7 17:06
* @version 1.0
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyPartnerInterviewBookSituation {
@ApiModelProperty("预约人数")
private Integer bookingCount;
@ApiModelProperty("预约的面试开始时间")
private String startTime;
@ApiModelProperty("预约的面试结束时间")
private String endTime;
@ApiModelProperty("是否已被预定成功")
private Boolean booked;
@ApiModelProperty("预约成功人的 partnerId")
private String bookedPartnerId;
public HyPartnerInterviewBookSituation(Integer bookingCount, Boolean booked) {
this.bookingCount = bookingCount;
this.booked = booked;
}
}

43
coolstore-partner-model/src/main/java/com/cool/store/entity/SuperAdminConfigDO.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author zhangchenbiao
* @date 2023-11-09 02:24
*/
@Table(name = "super_admin_config")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SuperAdminConfigDO implements Serializable {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("超管用户ID")
private String superAdminUserId;
@ApiModelProperty("删除标志 0-正常 1-删除")
private Integer deleted;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("新建人ID")
private String createUserId;
@ApiModelProperty("更新人ID")
private String updateUserId;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/CreateAppointmentReq.java
View File

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
public class CreateAppointmentReq {
@ApiModelProperty(value = "加盟商用户ID", required = true)
private String partnerId;
@ApiModelProperty(value = "面试官id")
@ApiModelProperty(value = "面试官id，PC 端招商经理主动预约可以不传")
private String interviewerId;
@ApiModelProperty(value = "预约开始时间 (YYYY-MM-DD hh:mm:ss)", required = true)

8
coolstore-partner-model/src/main/java/com/cool/store/request/GetFreeBusyListReq.java
View File

@@ -16,10 +16,12 @@ public class GetFreeBusyListReq {
private String startDate;
@ApiModelProperty(value = "结束时间",required = true)
private String endDate;
@ApiModelProperty("线索id(C端使用)")
@ApiModelProperty(value = "线索id", required = true)
private String lineId;
@ApiModelProperty("加盟商用户ID（C端使用，与面试官id两个字段中必传一个,该字段传值时，线索id必传）")
@ApiModelProperty(value = "加盟商用户ID", required = true)
private String partnerId;
@ApiModelProperty("面试官ID(B端使用,如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)")
@ApiModelProperty(value = "面试官ID", required = false)
private String interviewerId;
@ApiModelProperty(value = "是否是PC端请求", required = true)
private Boolean whetherPC;
}

7
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerInterviewInfoVO.java
View File

@@ -84,4 +84,11 @@ public class PartnerInterviewInfoVO {
@ApiModelProperty("来源名称")
private String userChannelName;
@ApiModelProperty("是否已被预约成功")
private Boolean booked;
@ApiModelProperty("该时间段面试预约人数")
private Integer appointmentCount;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CalendarInfo.java
View File

@@ -27,7 +27,7 @@ public class CalendarInfo {
@ApiModelProperty("日期字符串")
private String dateStr;
@ApiModelProperty("飞书日程忙闲清单")
@ApiModelProperty("忙闲清单")
private List<FreeBusyInfo> freeBusyList;
public CalendarInfo(Integer dayOfWeek, String year, String month, String day, String dateStr, List<FreeBusyInfo> freeBusyList) {

7
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/CreateAppointmentVO.java
View File

@@ -13,6 +13,13 @@ public class CreateAppointmentVO {
@ApiModelProperty("面试安排id")
private String interviewPlanId;
public CreateAppointmentVO() {
}
public CreateAppointmentVO(String interviewPlanId) {
this.interviewPlanId = interviewPlanId;
}
public String getInterviewPlanId() {
return interviewPlanId;
}

67
coolstore-partner-model/src/main/java/com/cool/store/vo/interview/FreeBusyInfo.java
View File

@@ -15,18 +15,43 @@ public class FreeBusyInfo {
private String endTime;
@ApiModelProperty("是否空闲")
private boolean isFree;
private boolean free;
public FreeBusyInfo(String startTime, String endTime, boolean isFree) {
@ApiModelProperty("预约人数")
private Integer appointmentCount;
@ApiModelProperty("是否被成功预约")
private Boolean booked;
@ApiModelProperty("是否是自己预约的时间段")
private Boolean selfBooked;
public FreeBusyInfo(String startTime, String endTime, boolean free) {
this.startTime = startTime;
this.endTime = endTime;
this.isFree = isFree;
this.free = free;
}
public FreeBusyInfo(String startTime, String endTime) {
this.startTime = startTime;
this.endTime = endTime;
this.isFree = isFree;
}
public FreeBusyInfo(String startTime, String endTime, boolean free, Integer appointmentCount, Boolean booked) {
this.startTime = startTime;
this.endTime = endTime;
this.free = free;
this.appointmentCount = appointmentCount;
this.booked = booked;
}
public FreeBusyInfo(String startTime, String endTime, boolean free, Integer appointmentCount, Boolean booked, Boolean selfBooked) {
this.startTime = startTime;
this.endTime = endTime;
this.free = free;
this.appointmentCount = appointmentCount;
this.booked = booked;
this.selfBooked = selfBooked;
}
public String getStartTime() {
@@ -45,11 +70,39 @@ public class FreeBusyInfo {
this.endTime = endTime;
}
public boolean isFree() {
return isFree;
public boolean getFree() {
return free;
}
public void setFree(boolean free) {
isFree = free;
this.free = free;
}
public Integer getAppointmentCount() {
return appointmentCount;
}
public void setAppointmentCount(Integer appointmentCount) {
this.appointmentCount = appointmentCount;
}
public Boolean getBooked() {
return booked;
}
public void setBooked(Boolean booked) {
this.booked = booked;
}
public boolean isFree() {
return free;
}
public Boolean getSelfBooked() {
return selfBooked;
}
public void setSelfBooked(Boolean selfBooked) {
this.selfBooked = selfBooked;
}
}

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

@@ -127,4 +127,13 @@ public class InterviewVO {
@ApiModelProperty("所属战区id")
private String affiliationZone;
@ApiModelProperty("该时间段是否被预约成功")
private Boolean booked;
@ApiModelProperty("该时间段面试预约人数")
private Integer appointmentCount;
@ApiModelProperty("该时段是否是自己预约的（不一定代表预约成功）")
private Boolean selfBooked;
}