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-22 11:36:30 +08:00
parent c50888d461
commit bd0e1fa888
5 changed files with 106 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml
View File

@@ -23,10 +23,16 @@
<result column="deleted" jdbcType="BIT" property="deleted" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="province" jdbcType="VARCHAR" property="province" />
<result column="city" jdbcType="VARCHAR" property="city" />
<result column="district" jdbcType="VARCHAR" property="district" />
<result column="township" jdbcType="VARCHAR" property="township" />
</resultMap>
<sql id="allColumn">
id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted, create_time, update_time
id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id,
development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted, create_time, update_time,
province, city, district, township
</sql>
<select id="getMyPointData" resultType="com.cool.store.vo.point.PointHomePageDataVO">

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

@@ -127,5 +127,29 @@ public class PointInfoDO {
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 省
*/
@Column(name = "province")
private String province;
/**
* 市
*/
@Column(name = "city")
private String city;
/**
* 区/县
*/
@Column(name = "district")
private String district;
/**
* 街道
*/
@Column(name = "township")
private String township;
}

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

@@ -7,22 +7,43 @@ import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
@Data
public class AddPointDetailRequest {
@NotBlank
@ApiModelProperty("铺位名称")
private String pointName;
@ApiModelProperty("所属大区")
private Long regionId;
@NotBlank
@ApiModelProperty("经度")
private String longitude;
@NotBlank
@ApiModelProperty("纬度")
private String latitude;
@NotBlank
@ApiModelProperty("省")
private String province;
@NotBlank
@ApiModelProperty("市")
private String city;
@NotBlank
@ApiModelProperty("区/县")
private String district;
@NotBlank
@ApiModelProperty("街道")
private String township;
@NotBlank
@ApiModelProperty("详细地址")
private String address;
@@ -273,6 +294,10 @@ public class AddPointDetailRequest {
result.setLatitude(request.getLatitude());
result.setLongitude(request.getLongitude());
result.setAddress(request.getAddress());
result.setProvince(request.getProvince());
result.setCity(request.getCity());
result.setDistrict(request.getDistrict());
result.setTownship(request.getTownship());
return result;
}

34
coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java
View File

@@ -7,29 +7,40 @@ import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
public class MiniAddPointRequest {
@NotBlank
@ApiModelProperty("铺位名称")
private String pointName;
@NotNull
@ApiModelProperty("所属大区")
private Long regionId;
@NotBlank
@ApiModelProperty("经度")
private String longitude;
@NotBlank
@ApiModelProperty("纬度")
private String latitude;
@NotBlank
@ApiModelProperty("详细地址")
private String address;
@NotNull
@Min(1)
@Max(2)
@ApiModelProperty("经营状况 1营业中 2空铺")
private Integer businessStatus;
@NotBlank
@ApiModelProperty("使用面积(一楼)")
private String pointArea;
@@ -38,18 +49,37 @@ public class MiniAddPointRequest {
@ApiModelProperty("支付方式 1.月付 2.季付 3.半年付 4.年付")
private Integer paymentMethod;
@NotBlank
@ApiModelProperty("转让费")
private String transferFee;
@NotBlank
@ApiModelProperty("图片对象")
private String pictureObj;
@ApiModelProperty(value = "当前线索id", hidden = true)
private Long curLineId;
@NotBlank
@ApiModelProperty("加盟商签名")
private String lineSign;
@NotBlank
@ApiModelProperty("省")
private String province;
@NotBlank
@ApiModelProperty("市")
private String city;
@NotBlank
@ApiModelProperty("区/县")
private String district;
@NotBlank
@ApiModelProperty("街道")
private String township;
public static PointDetailInfoDO convertDO(MiniAddPointRequest request) {
PointDetailInfoDO result = new PointDetailInfoDO();
@@ -70,6 +100,10 @@ public class MiniAddPointRequest {
result.setLatitude(request.getLatitude());
result.setLongitude(request.getLongitude());
result.setAddress(request.getAddress());
result.setProvince(request.getProvince());
result.setCity(request.getCity());
result.setDistrict(request.getDistrict());
result.setTownship(request.getTownship());
return result;
}

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

@@ -248,6 +248,18 @@ public class PointDetailVO {
@ApiModelProperty("当前节点")
private Integer curNodeNo;
@ApiModelProperty("省")
private String province;
@ApiModelProperty("市")
private String city;
@ApiModelProperty("区/县")
private String district;
@ApiModelProperty("街道")
private String township;
public static PointDetailVO convertVO(PointInfoDO pointInfo, PointDetailInfoDO pointDetailInfo) {
PointDetailVO result = new PointDetailVO();
@@ -330,6 +342,10 @@ public class PointDetailVO {
result.setRentContract(pointDetailInfo.getRentContract());
result.setMapEvaluationReport(pointDetailInfo.getMapEvaluationReport());
result.setPictureObj(pointDetailInfo.getPictureObj());
result.setProvince(pointInfo.getProvince());
result.setCity(pointInfo.getCity());
result.setDistrict(pointInfo.getDistrict());
result.setTownship(pointInfo.getTownship());
return result;
}