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

fix

Browse Source
This commit is contained in:
shuo.wang
2025-01-13 14:53:18 +08:00
parent 5d2afdf9c5
commit 06e37e0e89
9 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
View File

@@ -14,11 +14,7 @@ import java.util.List;
* @注释:
*/
@Data
public class BranchShopRequest {
//页码
private Integer pageNum=1;
//分页大小
private Integer pageSize=10;
public class BranchShopRequest extends PageBasicInfo{
@ApiModelProperty("加盟商姓名或手机号")
private String partnerKeyword;
@ApiModelProperty("门店名称/编号")

8
coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
View File

@@ -39,7 +39,7 @@ public class BranchShopResponse {
@ApiModelProperty("完成项")
private Integer completionColumn;
@ApiModelProperty("开店时长")
private String openTime;
private String days;
@ApiModelProperty("督导/招商经理")
private String investmentManagerName;
@ApiModelProperty("状态")
@@ -49,15 +49,15 @@ public class BranchShopResponse {
@ApiModelProperty("开业活动完成时间")
private Date openingActivityEndTime;
public void setOpenTime() {
public void setDays() {
if (this.openingActivityEndTime==null){
long between = ChronoUnit.SECONDS.between(this.createTime.toInstant(), new Date().toInstant());
double days = (double) between / (24*60*60);
this.openTime=String.format("%.1f", days);
this.days=String.format("%.1f", days);
}else{
long between = ChronoUnit.SECONDS.between(this.createTime.toInstant(), this.openingActivityEndTime.toInstant());
double days = (double) between / (24*60*60);
this.openTime = String.format("%.1f", days);
this.days = String.format("%.1f", days);
}
}