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-16 17:39:07 +08:00
parent fca4c05bac
commit cf0b5927d7
9 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java
View File

@@ -521,10 +521,6 @@ public class PointDetailInfoDO {
return getMarketSizeScore() + getShopAreaScore() + getConvenientScore() + getEnvironmentScore();
}
public Integer getFlowRateCalculate() {
return FlowRateCalculateEnum.getByFlowRate(this.nineFlowRate, this.tenFlowRate, this.eighteenFlowRate, this.nineteenFlowRate).getCode();
}
public boolean isCanSubmitEvaluable(){
if(Objects.isNull(this.businessStatus)){
return false;

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

@@ -209,6 +209,9 @@ public class AddPointDetailRequest {
@ApiModelProperty("图片对象")
private String pictureObj;
@ApiModelProperty("人流测算 1.>400人/时以上, 2.300～400人/时, 3.200～300人/时, 4.100～200人/时")
private Integer flowRateCalculate;
public static PointDetailInfoDO convertDO(AddPointDetailRequest request) {
PointDetailInfoDO result = new PointDetailInfoDO();
@@ -258,6 +261,7 @@ public class AddPointDetailRequest {
result.setMonthRateReturn(request.getMonthRateReturn());
result.setRentContract(request.getRentContract());
result.setPictureObj(request.getPictureObj());
result.setFlowRateCalculate(request.getFlowRateCalculate());
return result;
}

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

@@ -54,6 +54,9 @@ public class PointRecommendPageVO {
@ApiModelProperty("选择状态1.待选择 2.已选择 3.已被他人选择 4.已签约 5.已拒绝 6.已失效")
private Integer recommendStatus;
@ApiModelProperty("铺位地址")
private String address;
public static List<PointRecommendPageVO> convertVO(List<PointRecommendDO> recommendList, List<PointInfoDO> pointList, Map<String, String> usernameMap, Map<Long, String> regionNameMap) {
if(CollectionUtils.isEmpty(recommendList) || CollectionUtils.isEmpty(pointList)){
@@ -79,6 +82,7 @@ public class PointRecommendPageVO {
recommend.setPointArea(pointInfo.getPointArea());
recommend.setDevelopmentManagerUsername(usernameMap.get(pointInfo.getDevelopmentManager()));
recommend.setDevelopmentTime(pointInfo.getDevelopmentTime());
recommend.setAddress(pointInfo.getAddress());
}
resultList.add(recommend);
}

5
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopStageInfoVO.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.vo.shop;
import com.cool.store.entity.LineAuditInfoDO;
import com.cool.store.entity.ShopStageInfoDO;
import com.cool.store.vo.AuditInfoVO;
import com.cool.store.vo.LineAuditInfoVO;
import com.google.common.collect.Lists;
import io.swagger.annotations.ApiModelProperty;
@@ -43,7 +44,7 @@ public class ShopStageInfoVO {
private String actualCompleteTime;
@ApiModelProperty("阶段审核信息")
private LineAuditInfoVO auditInfo;
private AuditInfoVO auditInfo;
public ShopStageInfoVO(Integer shopStage, Integer shopSubStage, Integer shopSubStageStatus, Boolean isTerminated) {
this.shopStage = shopStage;
@@ -62,7 +63,7 @@ public class ShopStageInfoVO {
for (ShopStageInfoDO stageInfo : stageList) {
ShopStageInfoVO shopStageInfo = new ShopStageInfoVO(stageInfo.getShopStage(), stageInfo.getShopSubStage(), stageInfo.getShopSubStageStatus(), stageInfo.getIsTerminated());
LineAuditInfoDO auditInfo = auditMap.get(stageInfo.getAuditId());
LineAuditInfoVO auditInfoVO = LineAuditInfoVO.convertVO(auditInfo);
AuditInfoVO auditInfoVO = AuditInfoVO.convertVO(auditInfo);
shopStageInfo.setAuditInfo(auditInfoVO);
shopStageInfo.setPlanCompleteTime(stageInfo.getPlanCompleteTime());
shopStageInfo.setActualCompleteTime(stageInfo.getActualCompleteTime());