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

选址阶段

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-11 15:57:15 +08:00
parent d7cbc816cb
commit 5c326fa488
15 changed files with 205 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coolstore-partner-model/src/main/java/com/cool/store/request/PointPageRequest.java
View File

@@ -1,12 +1,15 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.enums.point.PointStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
/**
* @author zhangchenbiao
@@ -32,7 +35,6 @@ public class PointPageRequest extends PageBasicInfo {
@ApiModelProperty(value = "拓展专员", hidden = true)
private String developmentManager;
@NotNull
@Min(1)@Max(2)
@ApiModelProperty("必传参数:1已入库 2暂未入库")
private Integer storageStatus;
@@ -40,4 +42,18 @@ public class PointPageRequest extends PageBasicInfo {
@ApiModelProperty("1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
private Integer pointStatus;
@ApiModelProperty(value = "铺位状态列表", hidden = true)
private List<Integer> pointStatusList;
public List<Integer> getPointStatusList() {
List<Integer> pointStatusList = new ArrayList<>();
if (pointStatus != null) {
pointStatusList.add(pointStatus);
}
if(PointStatusEnum.POINT_STATUS_3.getCode().equals(pointStatus)){
pointStatusList.add(PointStatusEnum.POINT_STATUS_4.getCode());
}
return pointStatusList;
}
}

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

@@ -0,0 +1,19 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: TodoPageRequest
* @Description:
* @date 2024-04-11 14:30
*/
@Data
public class PointTodoPageRequest extends PageBasicInfo {
@ApiModelProperty(value = "扩展经理", hidden = true)
private String developmentManager;
}

18
coolstore-partner-model/src/main/java/com/cool/store/request/RecommendPointPageRequest.java
View File

@@ -1,9 +1,13 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import com.cool.store.enums.point.PointStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author zhangchenbiao
* @FileName: RecommendPointPageRequest
@@ -19,4 +23,18 @@ public class RecommendPointPageRequest extends PageBasicInfo {
@ApiModelProperty(value = "拓展专员", hidden = true)
private String developmentManager;
@ApiModelProperty(value = "铺位状态列表", hidden = true)
private List<Integer> pointStatusList;
public List<Integer> getPointStatusList() {
List<Integer> pointStatusList = new ArrayList<>();
if (pointStatus != null) {
pointStatusList.add(pointStatus);
}
if(PointStatusEnum.POINT_STATUS_3.getCode().equals(pointStatus)){
pointStatusList.add(PointStatusEnum.POINT_STATUS_4.getCode());
}
return pointStatusList;
}
}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.vo.point;
import com.cool.store.entity.PointDetailInfoDO;
import com.cool.store.entity.PointInfoDO;
import com.cool.store.enums.point.PointStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,7 +32,7 @@ public class PointDetailVO {
@ApiModelProperty("详细地址")
private String address;
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效")
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
private Integer pointStatus;
@ApiModelProperty("铺位得分")
@@ -236,6 +237,9 @@ public class PointDetailVO {
result.setLatitude(pointInfo.getLatitude());
result.setAddress(pointInfo.getAddress());
result.setPointStatus(pointInfo.getPointStatus());
if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){
result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
}
result.setPointScore(pointInfo.getPointScore());
result.setBussinessStatus(pointDetailInfo.getBussinessStatus());
result.setNineFlowRate(pointDetailInfo.getNineFlowRate());

19
coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java
View File

@@ -1,7 +1,7 @@
package com.cool.store.vo.point;
import com.cool.store.entity.PointDetailInfoDO;
import com.cool.store.entity.PointInfoDO;
import com.cool.store.enums.point.PointStatusEnum;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,7 +30,7 @@ public class PointPageVO {
@ApiModelProperty("所属站区")
private String regionNodeName;
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效")
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
private Integer pointStatus;
@ApiModelProperty("铺位得分")
@@ -48,6 +48,15 @@ public class PointPageVO {
@ApiModelProperty("选择状态0.未选择, 1.已被选择")
private Integer selectStatus;
@ApiModelProperty("铺位地址")
private String address;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
public static List<PointPageVO> convertVO(List<PointInfoDO> pointList, Map<String, String> usernameMap, Map<Long, String> regionNameMap) {
@@ -63,11 +72,17 @@ public class PointPageVO {
pointPageVO.setRegionId(pointInfo.getRegionId());
pointPageVO.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId()));
pointPageVO.setPointStatus(pointInfo.getPointStatus());
if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){
pointPageVO.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
}
pointPageVO.setPointScore(pointInfo.getPointScore());
pointPageVO.setPointArea(pointInfo.getPointArea());
pointPageVO.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager()));
pointPageVO.setDevelopmentTime(pointInfo.getDevelopmentTime());
pointPageVO.setSelectStatus(pointInfo.getSelectStatus());
pointPageVO.setAddress(pointInfo.getAddress());
pointPageVO.setCreateTime(pointInfo.getCreateTime());
pointPageVO.setUpdateTime(pointInfo.getUpdateTime());
resultList.add(pointPageVO);
}
return resultList;

6
coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointRecommendPageVO.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.vo.point;
import com.cool.store.entity.PointInfoDO;
import com.cool.store.entity.PointRecommendDO;
import com.cool.store.enums.point.PointStatusEnum;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,7 @@ public class PointRecommendPageVO {
@ApiModelProperty("所属站区")
private String regionNodeName;
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效")
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、5.已审核、6.已签约、7.已失效")
private Integer pointStatus;
@ApiModelProperty("铺位得分")
@@ -71,6 +72,9 @@ public class PointRecommendPageVO {
recommend.setRegionId(pointInfo.getRegionId());
recommend.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId()));
recommend.setPointStatus(pointInfo.getPointStatus());
if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){
recommend.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
}
recommend.setPointScore(pointInfo.getPointScore());
recommend.setPointArea(pointInfo.getPointArea());
recommend.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager()));