fix
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
<resultMap id="BaseResultMap" type="com.cool.store.entity.PointDetailInfoDO">
|
<resultMap id="BaseResultMap" type="com.cool.store.entity.PointDetailInfoDO">
|
||||||
<id column="id" jdbcType="BIGINT" property="id" />
|
<id column="id" jdbcType="BIGINT" property="id" />
|
||||||
<result column="point_id" jdbcType="BIGINT" property="pointId" />
|
<result column="point_id" jdbcType="BIGINT" property="pointId" />
|
||||||
<result column="bussiness_status" jdbcType="TINYINT" property="bussinessStatus" />
|
<result column="business_status" jdbcType="TINYINT" property="businessStatus" />
|
||||||
<result column="nine_flow_rate" jdbcType="INTEGER" property="nineFlowRate" />
|
<result column="nine_flow_rate" jdbcType="INTEGER" property="nineFlowRate" />
|
||||||
<result column="ten_flow_rate" jdbcType="INTEGER" property="tenFlowRate" />
|
<result column="ten_flow_rate" jdbcType="INTEGER" property="tenFlowRate" />
|
||||||
<result column="eighteen_flow_rate" jdbcType="INTEGER" property="eighteenFlowRate" />
|
<result column="eighteen_flow_rate" jdbcType="INTEGER" property="eighteenFlowRate" />
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ public class PointDetailInfoDO {
|
|||||||
/**
|
/**
|
||||||
* 经营状况
|
* 经营状况
|
||||||
*/
|
*/
|
||||||
@Column(name = "bussiness_status")
|
@Column(name = "business_status")
|
||||||
private Integer bussinessStatus;
|
private Integer businessStatus;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 09:00-10:00人流量
|
* 09:00-10:00人流量
|
||||||
@@ -526,7 +526,7 @@ public class PointDetailInfoDO {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean isCanSubmitEvaluable(){
|
public boolean isCanSubmitEvaluable(){
|
||||||
if(Objects.isNull(this.bussinessStatus)){
|
if(Objects.isNull(this.businessStatus)){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
Integer nullCount = 0;
|
Integer nullCount = 0;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class AddPointDetailRequest {
|
|||||||
private String address;
|
private String address;
|
||||||
|
|
||||||
@ApiModelProperty("经营状况")
|
@ApiModelProperty("经营状况")
|
||||||
private Integer bussinessStatus;
|
private Integer businessStatus;
|
||||||
|
|
||||||
@ApiModelProperty("09:00-10:00人流量")
|
@ApiModelProperty("09:00-10:00人流量")
|
||||||
private Integer nineFlowRate;
|
private Integer nineFlowRate;
|
||||||
@@ -212,7 +212,7 @@ public class AddPointDetailRequest {
|
|||||||
|
|
||||||
public static PointDetailInfoDO convertDO(AddPointDetailRequest request) {
|
public static PointDetailInfoDO convertDO(AddPointDetailRequest request) {
|
||||||
PointDetailInfoDO result = new PointDetailInfoDO();
|
PointDetailInfoDO result = new PointDetailInfoDO();
|
||||||
result.setBussinessStatus(request.getBussinessStatus());
|
result.setBusinessStatus(request.getBusinessStatus());
|
||||||
result.setNineFlowRate(request.getNineFlowRate());
|
result.setNineFlowRate(request.getNineFlowRate());
|
||||||
result.setTenFlowRate(request.getTenFlowRate());
|
result.setTenFlowRate(request.getTenFlowRate());
|
||||||
result.setEighteenFlowRate(request.getEighteenFlowRate());
|
result.setEighteenFlowRate(request.getEighteenFlowRate());
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package com.cool.store.request;
|
||||||
|
|
||||||
|
import com.cool.store.entity.PointDetailInfoDO;
|
||||||
|
import com.cool.store.entity.PointInfoDO;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.Max;
|
||||||
|
import javax.validation.constraints.Min;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class MiniAddPointRequest {
|
||||||
|
|
||||||
|
@ApiModelProperty("铺位名称")
|
||||||
|
private String pointName;
|
||||||
|
|
||||||
|
@ApiModelProperty("所属大区")
|
||||||
|
private Long regionId;
|
||||||
|
|
||||||
|
@ApiModelProperty("经度")
|
||||||
|
private String longitude;
|
||||||
|
|
||||||
|
@ApiModelProperty("纬度")
|
||||||
|
private String latitude;
|
||||||
|
|
||||||
|
@ApiModelProperty("详细地址")
|
||||||
|
private String address;
|
||||||
|
|
||||||
|
@ApiModelProperty("经营状况")
|
||||||
|
private Integer businessStatus;
|
||||||
|
|
||||||
|
@Min(1)
|
||||||
|
@Max(4)
|
||||||
|
@ApiModelProperty("立地条件1.单门面 2.双门面 3.多门面 4.转角")
|
||||||
|
private Integer siteConditions;
|
||||||
|
|
||||||
|
@ApiModelProperty("使用面积(一楼)")
|
||||||
|
private String pointArea;
|
||||||
|
|
||||||
|
@Min(1)
|
||||||
|
@Max(4)
|
||||||
|
@ApiModelProperty("支付方式 1.月付 2.季付 3.半年付 4.年付")
|
||||||
|
private Integer paymentMethod;
|
||||||
|
|
||||||
|
@ApiModelProperty("转让费")
|
||||||
|
private String transferFee;
|
||||||
|
|
||||||
|
@ApiModelProperty("图片对象")
|
||||||
|
private String pictureObj;
|
||||||
|
|
||||||
|
|
||||||
|
public static PointDetailInfoDO convertDO(MiniAddPointRequest request) {
|
||||||
|
PointDetailInfoDO result = new PointDetailInfoDO();
|
||||||
|
result.setBusinessStatus(request.getBusinessStatus());
|
||||||
|
result.setSiteConditions(request.getSiteConditions());
|
||||||
|
result.setPaymentMethod(request.getPaymentMethod());
|
||||||
|
result.setTransferFee(request.getTransferFee());
|
||||||
|
result.setPictureObj(request.getPictureObj());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PointInfoDO convertPointDO(MiniAddPointRequest request) {
|
||||||
|
PointInfoDO result = new PointInfoDO();
|
||||||
|
result.setPointName(request.getPointName());
|
||||||
|
result.setRegionId(request.getRegionId());
|
||||||
|
result.setPointArea(request.getPointArea());
|
||||||
|
result.setLatitude(request.getLatitude());
|
||||||
|
result.setLongitude(request.getLongitude());
|
||||||
|
result.setAddress(request.getAddress());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -19,7 +19,7 @@ public class UpdatePointDetailRequest extends AddPointDetailRequest {
|
|||||||
public static PointDetailInfoDO convertDO(UpdatePointDetailRequest request) {
|
public static PointDetailInfoDO convertDO(UpdatePointDetailRequest request) {
|
||||||
PointDetailInfoDO result = new PointDetailInfoDO();
|
PointDetailInfoDO result = new PointDetailInfoDO();
|
||||||
result.setPointId(request.getPointId());
|
result.setPointId(request.getPointId());
|
||||||
result.setBussinessStatus(request.getBussinessStatus());
|
result.setBusinessStatus(request.getBusinessStatus());
|
||||||
result.setNineFlowRate(request.getNineFlowRate());
|
result.setNineFlowRate(request.getNineFlowRate());
|
||||||
result.setTenFlowRate(request.getTenFlowRate());
|
result.setTenFlowRate(request.getTenFlowRate());
|
||||||
result.setEighteenFlowRate(request.getEighteenFlowRate());
|
result.setEighteenFlowRate(request.getEighteenFlowRate());
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class PointDetailVO {
|
|||||||
private Integer pointScore;
|
private Integer pointScore;
|
||||||
|
|
||||||
@ApiModelProperty("经营状况 1营业中 2空铺")
|
@ApiModelProperty("经营状况 1营业中 2空铺")
|
||||||
private Integer bussinessStatus;
|
private Integer businessStatus;
|
||||||
|
|
||||||
@ApiModelProperty("09:00-10:00人流量")
|
@ApiModelProperty("09:00-10:00人流量")
|
||||||
private Integer nineFlowRate;
|
private Integer nineFlowRate;
|
||||||
@@ -241,7 +241,7 @@ public class PointDetailVO {
|
|||||||
result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
|
result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode());
|
||||||
}
|
}
|
||||||
result.setPointScore(pointInfo.getPointScore());
|
result.setPointScore(pointInfo.getPointScore());
|
||||||
result.setBussinessStatus(pointDetailInfo.getBussinessStatus());
|
result.setBusinessStatus(pointDetailInfo.getBusinessStatus());
|
||||||
result.setNineFlowRate(pointDetailInfo.getNineFlowRate());
|
result.setNineFlowRate(pointDetailInfo.getNineFlowRate());
|
||||||
result.setTenFlowRate(pointDetailInfo.getTenFlowRate());
|
result.setTenFlowRate(pointDetailInfo.getTenFlowRate());
|
||||||
result.setEighteenFlowRate(pointDetailInfo.getEighteenFlowRate());
|
result.setEighteenFlowRate(pointDetailInfo.getEighteenFlowRate());
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.cool.store.controller.webc;
|
package com.cool.store.controller.webc;
|
||||||
|
|
||||||
|
import com.cool.store.context.CurrentUserHolder;
|
||||||
import com.cool.store.context.PartnerUserHolder;
|
import com.cool.store.context.PartnerUserHolder;
|
||||||
|
import com.cool.store.request.AddPointDetailRequest;
|
||||||
import com.cool.store.request.MiniPointPageRequest;
|
import com.cool.store.request.MiniPointPageRequest;
|
||||||
import com.cool.store.request.PointRecommendLineRequest;
|
import com.cool.store.request.PointRecommendLineRequest;
|
||||||
import com.cool.store.request.SelectPointRequest;
|
import com.cool.store.request.SelectPointRequest;
|
||||||
@@ -80,4 +82,10 @@ public class MiniShopController {
|
|||||||
return ResponseResult.success(pointService.lineSelectPoint(request));
|
return ResponseResult.success(pointService.lineSelectPoint(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation("提交新铺位")
|
||||||
|
@PostMapping("/add")
|
||||||
|
public ResponseResult<Long> addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) {
|
||||||
|
return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId()));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user