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

铺位，选址改造

Browse Source
This commit is contained in:
shuo.wang
2025-04-03 14:11:53 +08:00
parent 874dd92bb9
commit 944695ab31
22 changed files with 220 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
coolstore-partner-model/src/main/java/com/cool/store/dto/PCPointListDTO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.cool.store.dto;
import com.cool.store.entity.PointInfoDO;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/04/03/11:17
* @Version 1.0
* @注释:
*/
@Data
public class PCPointListDTO extends PointInfoDO {
private String openName;
}

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

@@ -161,9 +161,6 @@ public class PointInfoDO {
@Column(name = "opportunity_point_name")
private String opportunityPointName;
@Column(name = "open_shop_name")
private String openShopName;
@Column(name = "province_code")
private String provinceCode;

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

@@ -25,14 +25,5 @@ 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;
@ApiModelProperty("省市区编码,传最后一级")
private String areaCode;
}

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

@@ -0,0 +1,27 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author: WangShuo
* @Date: 2025/04/03/09:52
* @Version 1.0
* @注释:
*/
@Data
public class MiniPointRequest extends PageBasicInfo {
@ApiModelProperty(value = "1-推荐铺位,2-我创建的")
@NotNull
private Integer type;
private Long lineId;
private String partnerId;
@ApiModelProperty("省市区编码,传最后一级")
private String areaCode;
}

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

@@ -352,7 +352,6 @@ 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;

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

@@ -1,5 +1,6 @@
package com.cool.store.vo.point;
import com.cool.store.dto.PCPointListDTO;
import com.cool.store.entity.PointInfoDO;
import com.cool.store.enums.point.PointStatusEnum;
import com.google.common.collect.Lists;
@@ -66,12 +67,12 @@ public class PointPageVO {
private String opportunityPointName;
public static List<PointPageVO> convertVO(List<PointInfoDO> pointList, Map<String, String> usernameMap, Map<Long, String> regionNameMap) {
public static List<PointPageVO> convertVO(List<PCPointListDTO> pointList, Map<String, String> usernameMap, Map<Long, String> regionNameMap) {
if(CollectionUtils.isEmpty(pointList)){
return Lists.newArrayList();
}
List<PointPageVO> resultList = new ArrayList<>();
for (PointInfoDO pointInfo : pointList) {
for (PCPointListDTO pointInfo : pointList) {
PointPageVO pointPageVO = new PointPageVO();
pointPageVO.setPointId(pointInfo.getId());
pointPageVO.setPointName(pointInfo.getPointName());
@@ -90,6 +91,7 @@ public class PointPageVO {
pointPageVO.setAddress(pointInfo.getAddress());
pointPageVO.setCreateTime(pointInfo.getCreateTime());
pointPageVO.setUpdateTime(pointInfo.getUpdateTime());
pointPageVO.setOpenShopName(pointInfo.getOpenName());
resultList.add(pointPageVO);
}
return resultList;

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

@@ -1,5 +1,6 @@
package com.cool.store.vo.point;
import com.cool.store.dto.PCPointListDTO;
import com.cool.store.entity.PointInfoDO;
import com.cool.store.enums.point.PointStatusEnum;
import com.google.common.collect.Lists;
@@ -36,12 +37,12 @@ public class PointToDoVO {
@ApiModelProperty("提交时间")
private Date submitTime;
public static List<PointToDoVO> convertVO(List<PointInfoDO> pointList, Map<Long, String> regionNameMap, Map<Long, Date> submitTimeMap) {
public static List<PointToDoVO> convertVO(List<PCPointListDTO> pointList, Map<Long, String> regionNameMap, Map<Long, Date> submitTimeMap) {
if(CollectionUtils.isEmpty(pointList)){
return Lists.newArrayList();
}
List<PointToDoVO> resultList = new ArrayList<>();
for (PointInfoDO pointInfo : pointList) {
for (PCPointListDTO pointInfo : pointList) {
PointToDoVO pointPageVO = new PointToDoVO();
pointPageVO.setPointId(pointInfo.getId());
pointPageVO.setPointName(pointInfo.getPointName());