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-02 09:58:32 +08:00
parent c3e5b0e53e
commit e5ed16438e
24 changed files with 680 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopPointDetailInfoDO.java
View File

@@ -52,7 +52,7 @@ public class ShopPointDetailInfoDO {
private Integer nineteenFlowRate;
/**
* 店铺方位 0主要路线, 1次要路线
* 店铺方位 1.主要动线 2.次要动线
*/
@Column(name = "point_direction")
private Integer pointDirection;
@@ -81,12 +81,6 @@ public class ShopPointDetailInfoDO {
@Column(name = "landlord_mobile")
private String landlordMobile;
/**
* 门店月租金
*/
@Column(name = "store_rent")
private String storeRent;
/**
* 支付方式 参考PaymentMethodEnum
*/
@@ -527,6 +521,10 @@ public class ShopPointDetailInfoDO {
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.bussinessStatus)){
return false;
@@ -553,9 +551,6 @@ public class ShopPointDetailInfoDO {
if(Objects.isNull(this.landlordUsername) || StringUtils.isBlank(this.landlordUsername.trim()) || Objects.isNull(this.landlordMobile) || StringUtils.isBlank(this.landlordMobile.trim())){
return false;
}
if(Objects.isNull(this.storeRent)){
return false;
}
if(Objects.isNull(this.paymentMethod) || Objects.isNull(this.propertyStatus)){
return false;
}

12
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopPointInfoDO.java
View File

@@ -48,12 +48,6 @@ public class ShopPointInfoDO {
@Column(name = "point_area")
private String pointArea;
/**
* 商圈类型
*/
@Column(name = "shop_area_type")
private String shopAreaType;
/**
* 经度
*/
@@ -99,6 +93,12 @@ public class ShopPointInfoDO {
@Column(name = "point_score")
private Integer pointScore;
/**
* 选择状态0.未选择, 1.已被选择
*/
@Column(name = "select_status")
private Integer selectStatus;
/**
* 审批次数
*/

60
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopPointRecommendDO.java Normal file
View File

@@ -0,0 +1,60 @@
package com.cool.store.entity;
import lombok.Data;
import java.util.Date;
import javax.persistence.*;
@Data
@Table(name = "xfsg_shop_point_recommend")
public class ShopPointRecommendDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 线索id
*/
@Column(name = "line_id")
private Long lineId;
/**
* 点位id
*/
@Column(name = "point_id")
private Long pointId;
/**
* 拓展专员
*/
@Column(name = "development_manager")
private String developmentManager;
/**
* 状态 1.待选择 2.已选择 3.已被他人选择 4.已签约 5.已拒绝 6.已失效
*/
private Integer status;
/**
* 原因
*/
private String reason;
/**
* 删除标识
*/
private Boolean deleted;
/**
* 创建时间
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间
*/
@Column(name = "update_time")
private Date updateTime;
}

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

@@ -0,0 +1,20 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zhangchenbiao
* @FileName: AddMapEvaluationReportRequest
* @Description:
* @date 2024-04-01 17:49
*/
@Data
public class AddMapEvaluationReportRequest {
@ApiModelProperty("店铺id")
private Long pointId;
@ApiModelProperty("高德地图评估报告")
private String mapEvaluationReport;
}

15
coolstore-partner-model/src/main/java/com/cool/store/request/AddShopPointDetailRequest.java
View File

@@ -63,9 +63,6 @@ public class AddShopPointDetailRequest {
@ApiModelProperty("房东电话")
private String landlordMobile;
@ApiModelProperty("门店月租金")
private String storeRent;
@Min(1)
@Max(4)
@ApiModelProperty("支付方式 1.月付 2.季付 3.半年付 4.年付")
@@ -89,11 +86,6 @@ public class AddShopPointDetailRequest {
@ApiModelProperty("消费能力 1.高端 2.中高端 3.中端 4.低端")
private Integer consumerAbility;
@Min(1)
@Max(4)
@ApiModelProperty("人流测算 1.>400人/时以上, 2.300～400人/时, 3.200～300人/时, 4.100～200人/时")
private Integer flowRateCalculate;
@Min(1)
@Max(2)
@ApiModelProperty("聚客点农贸市场 1.是 2.否")
@@ -226,9 +218,6 @@ public class AddShopPointDetailRequest {
@ApiModelProperty("租赁合同")
private String rentContract;
@ApiModelProperty("高德地图评估报告")
private String mapEvaluationReport;
@ApiModelProperty("图片对象")
private String pictureObj;
@@ -237,6 +226,7 @@ public class AddShopPointDetailRequest {
ShopPointDetailInfoDO result = new ShopPointDetailInfoDO();
result.setBussinessStatus(request.getBussinessStatus());
result.setNineFlowRate(request.getNineFlowRate());
result.setTenFlowRate(request.getTenFlowRate());
result.setEighteenFlowRate(request.getEighteenFlowRate());
result.setNineteenFlowRate(request.getNineteenFlowRate());
result.setPointDirection(request.getPointDirection());
@@ -244,13 +234,11 @@ public class AddShopPointDetailRequest {
result.setStoreWidth(request.getStoreWidth());
result.setLandlordUsername(request.getLandlordUsername());
result.setLandlordMobile(request.getLandlordMobile());
result.setStoreRent(request.getStoreRent());
result.setPaymentMethod(request.getPaymentMethod());
result.setPropertyStatus(request.getPropertyStatus());
result.setTransferFee(request.getTransferFee());
result.setCoverCommunity(request.getCoverCommunity());
result.setConsumerAbility(request.getConsumerAbility());
result.setFlowRateCalculate(request.getFlowRateCalculate());
result.setGatherGuestFarmerMarket(request.getGatherGuestFarmerMarket());
result.setGatherGuestHospital(request.getGatherGuestHospital());
result.setGatherGuestSchool(request.getGatherGuestSchool());
@@ -285,7 +273,6 @@ public class AddShopPointDetailRequest {
result.setNetProfit(request.getNetProfit());
result.setMonthRateReturn(request.getMonthRateReturn());
result.setRentContract(request.getRentContract());
result.setMapEvaluationReport(request.getMapEvaluationReport());
result.setPictureObj(request.getPictureObj());
return result;
}

5
coolstore-partner-model/src/main/java/com/cool/store/request/UpdateShopPointDetailRequest.java
View File

@@ -5,11 +5,13 @@ import com.cool.store.entity.ShopPointInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
@NotNull
@ApiModelProperty("点位id")
private Long pointId;
@@ -28,13 +30,11 @@ public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
result.setStoreWidth(request.getStoreWidth());
result.setLandlordUsername(request.getLandlordUsername());
result.setLandlordMobile(request.getLandlordMobile());
result.setStoreRent(request.getStoreRent());
result.setPaymentMethod(request.getPaymentMethod());
result.setPropertyStatus(request.getPropertyStatus());
result.setTransferFee(request.getTransferFee());
result.setCoverCommunity(request.getCoverCommunity());
result.setConsumerAbility(request.getConsumerAbility());
result.setFlowRateCalculate(request.getFlowRateCalculate());
result.setGatherGuestFarmerMarket(request.getGatherGuestFarmerMarket());
result.setGatherGuestHospital(request.getGatherGuestHospital());
result.setGatherGuestSchool(request.getGatherGuestSchool());
@@ -69,7 +69,6 @@ public class UpdateShopPointDetailRequest extends AddShopPointDetailRequest{
result.setNetProfit(request.getNetProfit());
result.setMonthRateReturn(request.getMonthRateReturn());
result.setRentContract(request.getRentContract());
result.setMapEvaluationReport(request.getMapEvaluationReport());
result.setPictureObj(request.getPictureObj());
return result;
}

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

@@ -1,6 +1,7 @@
package com.cool.store.vo.point;
import com.cool.store.entity.ShopPointDetailInfoDO;
import com.cool.store.entity.ShopPointInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,9 +10,15 @@ import java.util.Date;
@Data
public class ShopPointDetailVO {
@ApiModelProperty("店铺id")
private Long pointId;
@ApiModelProperty("铺位名称")
private String pointName;
@ApiModelProperty("铺位编号")
private String pointCode;
@ApiModelProperty("所属大区")
private Long regionId;
@@ -24,7 +31,13 @@ public class ShopPointDetailVO {
@ApiModelProperty("详细地址")
private String address;
@ApiModelProperty("经营状况")
@ApiModelProperty("铺位状态 1.采集中、2.已评估、3.待审核、4.待审核可推荐、5.已审核、6.已签约、7.已失效")
private Integer pointStatus;
@ApiModelProperty("铺位得分")
private Integer pointScore;
@ApiModelProperty("经营状况 1营业中 2空铺")
private Integer bussinessStatus;
@ApiModelProperty("09:00-10:00人流量")
@@ -39,7 +52,7 @@ public class ShopPointDetailVO {
@ApiModelProperty("19:00-20:00人流量")
private Integer nineteenFlowRate;
@ApiModelProperty("店铺方位 0主要路线, 1次要路线")
@ApiModelProperty("店铺方位 1.主要动线 2.次要动线")
private Integer pointDirection;
@ApiModelProperty("立地条件0单门面, 1双门面, 2多门面, 3转角")
@@ -57,9 +70,6 @@ public class ShopPointDetailVO {
@ApiModelProperty("房东电话")
private String landlordMobile;
@ApiModelProperty("门店月租金")
private String storeRent;
@ApiModelProperty("支付方式 1.月付 2.季付 3.半年付 4.年付")
private Integer paymentMethod;
@@ -217,71 +227,78 @@ public class ShopPointDetailVO {
private String pictureObj;
public static ShopPointDetailInfoDO convertDO(ShopPointDetailVO request) {
ShopPointDetailInfoDO result = new ShopPointDetailInfoDO();
result.setBussinessStatus(request.getBussinessStatus());
result.setNineFlowRate(request.getNineFlowRate());
result.setTenFlowRate(request.getTenFlowRate());
result.setEighteenFlowRate(request.getEighteenFlowRate());
result.setNineteenFlowRate(request.getNineteenFlowRate());
result.setPointDirection(request.getPointDirection());
result.setSiteConditions(request.getSiteConditions());
result.setStoreWidth(request.getStoreWidth());
result.setLandlordUsername(request.getLandlordUsername());
result.setLandlordMobile(request.getLandlordMobile());
result.setStoreRent(request.getStoreRent());
result.setPaymentMethod(request.getPaymentMethod());
result.setPropertyStatus(request.getPropertyStatus());
result.setTransferFee(request.getTransferFee());
result.setCoverCommunity(request.getCoverCommunity());
result.setConsumerAbility(request.getConsumerAbility());
result.setFlowRateCalculate(request.getFlowRateCalculate());
result.setGatherGuestFarmerMarket(request.getGatherGuestFarmerMarket());
result.setGatherGuestHospital(request.getGatherGuestHospital());
result.setGatherGuestSchool(request.getGatherGuestSchool());
result.setStoreFlowTrend(request.getStoreFlowTrend());
result.setNearRepast(request.getNearRepast());
result.setNearNeighbor(request.getNearNeighbor());
result.setNearCompete(request.getNearCompete());
result.setNearBusinessCondition(request.getNearBusinessCondition());
result.setIntendPosition(request.getIntendPosition());
result.setGreenBelt(request.getGreenBelt());
result.setStoreOutlook(request.getStoreOutlook());
result.setGuestConvenience(request.getGuestConvenience());
result.setWantShopSize(request.getWantShopSize());
result.setCompeteType(request.getCompeteType());
result.setCompeteBusinessCapacity(request.getCompeteBusinessCapacity());
result.setInvestAmount(request.getInvestAmount());
result.setDayTrader(request.getDayTrader());
result.setProfitRate(request.getProfitRate());
result.setMonthProfitRate(request.getMonthProfitRate());
result.setDeliveryRate(request.getDeliveryRate());
result.setDeliveryFee(request.getDeliveryFee());
result.setBrandUseRate(request.getBrandUseRate());
result.setBrandUseFee(request.getBrandUseFee());
result.setStaffFee(request.getStaffFee());
result.setShopManagerNum(request.getShopManagerNum());
result.setShopManagerFee(request.getShopManagerFee());
result.setClerkNum(request.getClerkNum());
result.setClerkFee(request.getClerkFee());
result.setBonus(request.getBonus());
result.setMonthRent(request.getMonthRent());
result.setOtherFee(request.getOtherFee());
result.setNetProfit(request.getNetProfit());
result.setMonthRateReturn(request.getMonthRateReturn());
result.setDevelopmentManagerSign(request.getDevelopmentManagerSign());
result.setDevelopmentManagerSignTime(request.getDevelopmentManagerSignTime());
result.setOperationUserSign(request.getOperationUserSign());
result.setOperationUserSignTime(request.getOperationUserSignTime());
result.setLineSign(request.getLineSign());
result.setLineSignTime(request.getLineSignTime());
result.setMarketSizeScore(request.getMarketSizeScore());
result.setShopAreaScore(request.getShopAreaScore());
result.setConvenientScore(request.getConvenientScore());
result.setEnvironmentScore(request.getEnvironmentScore());
result.setRentContract(request.getRentContract());
result.setMapEvaluationReport(request.getMapEvaluationReport());
result.setPictureObj(request.getPictureObj());
public static ShopPointDetailVO convertVO(ShopPointInfoDO pointInfo, ShopPointDetailInfoDO pointDetailInfo) {
ShopPointDetailVO result = new ShopPointDetailVO();
result.setPointId(pointInfo.getId());
result.setPointName(pointInfo.getPointName());
result.setPointCode(pointInfo.getPointCode());
result.setLongitude(pointInfo.getLongitude());
result.setLatitude(pointInfo.getLatitude());
result.setAddress(pointInfo.getAddress());
result.setPointStatus(pointInfo.getPointStatus());
result.setPointScore(pointInfo.getPointScore());
result.setBussinessStatus(pointDetailInfo.getBussinessStatus());
result.setNineFlowRate(pointDetailInfo.getNineFlowRate());
result.setTenFlowRate(pointDetailInfo.getTenFlowRate());
result.setEighteenFlowRate(pointDetailInfo.getEighteenFlowRate());
result.setNineteenFlowRate(pointDetailInfo.getNineteenFlowRate());
result.setPointDirection(pointDetailInfo.getPointDirection());
result.setSiteConditions(pointDetailInfo.getSiteConditions());
result.setStoreWidth(pointDetailInfo.getStoreWidth());
result.setLandlordUsername(pointDetailInfo.getLandlordUsername());
result.setLandlordMobile(pointDetailInfo.getLandlordMobile());
result.setPaymentMethod(pointDetailInfo.getPaymentMethod());
result.setPropertyStatus(pointDetailInfo.getPropertyStatus());
result.setTransferFee(pointDetailInfo.getTransferFee());
result.setCoverCommunity(pointDetailInfo.getCoverCommunity());
result.setConsumerAbility(pointDetailInfo.getConsumerAbility());
result.setFlowRateCalculate(pointDetailInfo.getFlowRateCalculate());
result.setGatherGuestFarmerMarket(pointDetailInfo.getGatherGuestFarmerMarket());
result.setGatherGuestHospital(pointDetailInfo.getGatherGuestHospital());
result.setGatherGuestSchool(pointDetailInfo.getGatherGuestSchool());
result.setStoreFlowTrend(pointDetailInfo.getStoreFlowTrend());
result.setNearRepast(pointDetailInfo.getNearRepast());
result.setNearNeighbor(pointDetailInfo.getNearNeighbor());
result.setNearCompete(pointDetailInfo.getNearCompete());
result.setNearBusinessCondition(pointDetailInfo.getNearBusinessCondition());
result.setIntendPosition(pointDetailInfo.getIntendPosition());
result.setGreenBelt(pointDetailInfo.getGreenBelt());
result.setStoreOutlook(pointDetailInfo.getStoreOutlook());
result.setGuestConvenience(pointDetailInfo.getGuestConvenience());
result.setWantShopSize(pointDetailInfo.getWantShopSize());
result.setCompeteType(pointDetailInfo.getCompeteType());
result.setCompeteBusinessCapacity(pointDetailInfo.getCompeteBusinessCapacity());
result.setInvestAmount(pointDetailInfo.getInvestAmount());
result.setDayTrader(pointDetailInfo.getDayTrader());
result.setProfitRate(pointDetailInfo.getProfitRate());
result.setMonthProfitRate(pointDetailInfo.getMonthProfitRate());
result.setDeliveryRate(pointDetailInfo.getDeliveryRate());
result.setDeliveryFee(pointDetailInfo.getDeliveryFee());
result.setBrandUseRate(pointDetailInfo.getBrandUseRate());
result.setBrandUseFee(pointDetailInfo.getBrandUseFee());
result.setStaffFee(pointDetailInfo.getStaffFee());
result.setShopManagerNum(pointDetailInfo.getShopManagerNum());
result.setShopManagerFee(pointDetailInfo.getShopManagerFee());
result.setClerkNum(pointDetailInfo.getClerkNum());
result.setClerkFee(pointDetailInfo.getClerkFee());
result.setBonus(pointDetailInfo.getBonus());
result.setMonthRent(pointDetailInfo.getMonthRent());
result.setOtherFee(pointDetailInfo.getOtherFee());
result.setNetProfit(pointDetailInfo.getNetProfit());
result.setMonthRateReturn(pointDetailInfo.getMonthRateReturn());
result.setDevelopmentManagerSign(pointDetailInfo.getDevelopmentManagerSign());
result.setDevelopmentManagerSignTime(pointDetailInfo.getDevelopmentManagerSignTime());
result.setOperationUserSign(pointDetailInfo.getOperationUserSign());
result.setOperationUserSignTime(pointDetailInfo.getOperationUserSignTime());
result.setLineSign(pointDetailInfo.getLineSign());
result.setLineSignTime(pointDetailInfo.getLineSignTime());
result.setMarketSizeScore(pointDetailInfo.getMarketSizeScore());
result.setShopAreaScore(pointDetailInfo.getShopAreaScore());
result.setConvenientScore(pointDetailInfo.getConvenientScore());
result.setEnvironmentScore(pointDetailInfo.getEnvironmentScore());
result.setRentContract(pointDetailInfo.getRentContract());
result.setMapEvaluationReport(pointDetailInfo.getMapEvaluationReport());
result.setPictureObj(pointDetailInfo.getPictureObj());
return result;
}