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:
shuo.wang
2024-04-26 19:08:49 +08:00
parent 9e4de953c4 baf6dfd44f
commit 987512f8ff
16 changed files with 557 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java Normal file
View File

@@ -0,0 +1,32 @@
package com.cool.store.dto.Preparation;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/26 15:40
* @Version 1.0
*/
@Data
public class PreparationDTO {
private Long id;
private String shopName;
private String storeNum;
private String shopManagerUserId;
private Long regionId;
private Date planOpenTime;
private String username;
private String mobile;
}

23
coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/ScheduleDTO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cool.store.dto.Preparation;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/26 16:19
* @Version 1.0
*/
@Data
public class ScheduleDTO {
private Long shopId;
private Date planCompleteTime;
private Integer totalColumn;
private Integer completionColumn;
}

47
coolstore-partner-model/src/main/java/com/cool/store/request/PreparationRequest.java Normal file
View File

@@ -0,0 +1,47 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/26 15:15
* @Version 1.0
*/
@Data
public class PreparationRequest extends PageBasicInfo {
@ApiModelProperty("选择区域")
private List<String> regionIds;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("加盟商名称与手机号")
private String keyword;
@ApiModelProperty("计划开业开始时间")
private String planOpenStartTime;
@ApiModelProperty("计划开业结束时间")
private String planOpenEndTime;
@ApiModelProperty("招商经理Id")
private String investmentUserId;
@ApiModelProperty("督导ID")
private String supervisorUserId;
@ApiModelProperty(value = "当前登录用户", hidden = true)
private String curUserId;
@ApiModelProperty(value = "管辖区域",hidden = true)
private List<String> authRegionIds;
}

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

@@ -68,6 +68,7 @@ public class UpdatePointDetailRequest extends AddPointDetailRequest {
result.setMonthRateReturn(request.getMonthRateReturn());
result.setRentContract(request.getRentContract());
result.setPictureObj(request.getPictureObj());
result.setFlowRateCalculate(request.getFlowRateCalculate());
return result;
}

79
coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleDetailVO.java Normal file
View File

@@ -0,0 +1,79 @@
package com.cool.store.vo.Preparation;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.temporal.ChronoUnit;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/26 17:38
* @Version 1.0
*/
@Data
public class PreparationScheduleDetailVO {
@ApiModelProperty("加盟商名称")
private String username;
@ApiModelProperty("加盟手机号")
private String mobile;
private Integer joinStatus;
private Long shopId;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("总项数")
private Integer totalColumn;
@ApiModelProperty("完成项")
private Integer completionColumn;
@ApiModelProperty("计划开店时间")
private Date planOpenTime;
@ApiModelProperty("合同完成时间")
private Date ContractCompletionTime;
@ApiModelProperty("开店时长")
private String days;
@ApiModelProperty("所属站区")
private String regionNodeName;
@ApiModelProperty("预估完成时间")
private Date planCompletionTime;
@ApiModelProperty("招商经理名称")
private String investmentManagerName;
@ApiModelProperty("招商经理手机号")
private String investmentManagerMobile;
@ApiModelProperty("扩展经理名称")
private String developmentManagerName;
@ApiModelProperty("扩展经理手机号")
private String developmentManagerMobile;
public void setDays() {
if (this.planOpenTime==null|| this.ContractCompletionTime==null){
return;
}
long between = ChronoUnit.SECONDS.between(this.ContractCompletionTime.toInstant(), this.planOpenTime.toInstant());
double days = (double) between / (24*60*60);
this.days = String.format("%.1f", days);
}
}

61
coolstore-partner-model/src/main/java/com/cool/store/vo/Preparation/PreparationScheduleVO.java Normal file
View File

@@ -0,0 +1,61 @@
package com.cool.store.vo.Preparation;
import com.cool.store.vo.BaseInfoVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.temporal.ChronoUnit;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2024/4/26 15:00
* @Version 1.0
*/
@Data
public class PreparationScheduleVO {
@ApiModelProperty("加盟商名称")
private String username;
@ApiModelProperty("加盟手机号")
private String mobile;
private Long shopId;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("开店负责人")
private String shopManagerUserName;
@ApiModelProperty("总项数")
private Integer totalColumn;
@ApiModelProperty("完成项")
private Integer completionColumn;
@ApiModelProperty("计划开店时间")
private Date planOpenTime;
@ApiModelProperty("合同完成时间")
private Date ContractCompletionTime;
@ApiModelProperty("开店时长")
private String days;
@ApiModelProperty("所属站区")
private String regionNodeName;
public void setDays() {
if (this.planOpenTime==null|| this.ContractCompletionTime==null){
return;
}
long between = ChronoUnit.SECONDS.between(this.ContractCompletionTime.toInstant(), this.planOpenTime.toInstant());
double days = (double) between / (24*60*60);
this.days = String.format("%.1f", days);
}
}