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

PC+mini铺位改造

Browse Source
This commit is contained in:
shuo.wang
2025-03-31 15:37:22 +08:00
parent ae381ea81a
commit 4e3eda6659
17 changed files with 601 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/entity/PointInfoDO.java
View File

@@ -160,4 +160,7 @@ public class PointInfoDO {
@Column(name = "opportunity_point_name")
private String opportunityPointName;
@Column(name = "open_shop_name")
private String openShopName;
}

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

@@ -43,4 +43,6 @@ public class AllPointPageRequest extends PageBasicInfo {
@ApiModelProperty(value = "管辖区域",hidden = true)
private List<String> authRegionIds;
@ApiModelProperty(value = "是否入库1已入库 2暂未入库")
private Integer storageStatus;
}

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

@@ -6,6 +6,7 @@ import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @author zhangchenbiao
@@ -24,4 +25,11 @@ public class MiniPointPageRequest extends PageBasicInfo {
@ApiModelProperty(value = "门店线索ID")
private Long shopId;
@ApiModelProperty(value = "1-推荐铺位,2-我创建的")
@NotNull
private Integer type;
private Long lineId;
private String partnerId;
}

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

@@ -11,6 +11,7 @@ import lombok.Data;
import org.apache.commons.collections4.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -41,6 +42,30 @@ public class MiniPointPageVO {
@ApiModelProperty("1.待选择 2.已选择 3.已被他人选择 4.已签约 5.已拒绝 6.已失效")
private Integer recommendStatus;
@ApiModelProperty("租金")
private String monthRent;
@ApiModelProperty("房东电话")
private String landlordMobile;
@ApiModelProperty("录入时间")
private Date createTime;
@ApiModelProperty("机会点编号")
private String opportunityPointCode;
@ApiModelProperty("机会点名称")
private String opportunityPointName;
@ApiModelProperty("图片/视频附件")
private String pictureObj;
@ApiModelProperty("经度")
private String longitude;
@ApiModelProperty("纬度")
private String latitude;
public static List<MiniPointPageVO> convertVO(List<MiniPointPageDTO> pointList, Map<Long, String> regionNameMap) {
if(CollectionUtils.isEmpty(pointList)){
return Lists.newArrayList();

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

@@ -260,6 +260,14 @@ public class PointDetailVO {
@ApiModelProperty("是否可以上传租赁合同")
private boolean canSubmitRentContract;
@ApiModelProperty("成功开店")
private String openShopName;
@ApiModelProperty("所属机会点编码")
private String opportunityPointCode;
@ApiModelProperty("所属机会点名称")
private String opportunityPointName;
public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) {
PointDetailVO result = new PointDetailVO();
@@ -271,7 +279,7 @@ public class PointDetailVO {
result.setLatitude(pointInfo.getLatitude());
result.setAddress(pointInfo.getAddress());
result.setPointStatus(pointInfo.getPointStatus());
if(PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())){
if (PointStatusEnum.POINT_STATUS_4.getCode().equals(pointInfo.getPointStatus())) {
result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
}
result.setDevelopmentTime(pointInfo.getDevelopmentTime());
@@ -344,6 +352,9 @@ public class PointDetailVO {
result.setCity(pointInfo.getCity());
result.setDistrict(pointInfo.getDistrict());
result.setTownship(pointInfo.getTownship());
result.setOpenShopName(pointInfo.getOpenShopName());
result.setOpportunityPointCode(pointInfo.getOpportunityPointCode());
result.setOpportunityPointName(pointInfo.getOpportunityPointName());
return result;
}

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

@@ -57,6 +57,13 @@ public class PointPageVO {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("成功开店")
private String openShopName;
@ApiModelProperty("所属机会点编码")
private String opportunityPointCode;
@ApiModelProperty("所属机会点名称")
private String opportunityPointName;
public static List<PointPageVO> convertVO(List<PointInfoDO> pointList, Map<String, String> usernameMap, Map<Long, String> regionNameMap) {