diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointDetailInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointDetailInfoMapper.xml index 7a2792312..99cc615ec 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointDetailInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointDetailInfoMapper.xml @@ -4,7 +4,7 @@ - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java index b990139a7..565ac63cd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java @@ -24,8 +24,8 @@ public class PointDetailInfoDO { /** * 经营状况 */ - @Column(name = "bussiness_status") - private Integer bussinessStatus; + @Column(name = "business_status") + private Integer businessStatus; /** * 09:00-10:00人流量 @@ -526,7 +526,7 @@ public class PointDetailInfoDO { } public boolean isCanSubmitEvaluable(){ - if(Objects.isNull(this.bussinessStatus)){ + if(Objects.isNull(this.businessStatus)){ return false; } Integer nullCount = 0; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index a51eb0875..c27af82d5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -27,7 +27,7 @@ public class AddPointDetailRequest { private String address; @ApiModelProperty("经营状况") - private Integer bussinessStatus; + private Integer businessStatus; @ApiModelProperty("09:00-10:00人流量") private Integer nineFlowRate; @@ -212,7 +212,7 @@ public class AddPointDetailRequest { public static PointDetailInfoDO convertDO(AddPointDetailRequest request) { PointDetailInfoDO result = new PointDetailInfoDO(); - result.setBussinessStatus(request.getBussinessStatus()); + result.setBusinessStatus(request.getBusinessStatus()); result.setNineFlowRate(request.getNineFlowRate()); result.setTenFlowRate(request.getTenFlowRate()); result.setEighteenFlowRate(request.getEighteenFlowRate()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java new file mode 100644 index 000000000..af2b8afbd --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniAddPointRequest.java @@ -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; + } + +} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java index ec9d55418..7495960ea 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdatePointDetailRequest.java @@ -19,7 +19,7 @@ public class UpdatePointDetailRequest extends AddPointDetailRequest { public static PointDetailInfoDO convertDO(UpdatePointDetailRequest request) { PointDetailInfoDO result = new PointDetailInfoDO(); result.setPointId(request.getPointId()); - result.setBussinessStatus(request.getBussinessStatus()); + result.setBusinessStatus(request.getBusinessStatus()); result.setNineFlowRate(request.getNineFlowRate()); result.setTenFlowRate(request.getTenFlowRate()); result.setEighteenFlowRate(request.getEighteenFlowRate()); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java index 4d0eab9f0..6fa48bfed 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java @@ -39,7 +39,7 @@ public class PointDetailVO { private Integer pointScore; @ApiModelProperty("经营状况 1营业中 2空铺") - private Integer bussinessStatus; + private Integer businessStatus; @ApiModelProperty("09:00-10:00人流量") private Integer nineFlowRate; @@ -241,7 +241,7 @@ public class PointDetailVO { result.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); } result.setPointScore(pointInfo.getPointScore()); - result.setBussinessStatus(pointDetailInfo.getBussinessStatus()); + result.setBusinessStatus(pointDetailInfo.getBusinessStatus()); result.setNineFlowRate(pointDetailInfo.getNineFlowRate()); result.setTenFlowRate(pointDetailInfo.getTenFlowRate()); result.setEighteenFlowRate(pointDetailInfo.getEighteenFlowRate()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index 60693c4b9..61a218c39 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -1,6 +1,8 @@ package com.cool.store.controller.webc; +import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.PartnerUserHolder; +import com.cool.store.request.AddPointDetailRequest; import com.cool.store.request.MiniPointPageRequest; import com.cool.store.request.PointRecommendLineRequest; import com.cool.store.request.SelectPointRequest; @@ -80,4 +82,10 @@ public class MiniShopController { return ResponseResult.success(pointService.lineSelectPoint(request)); } + @ApiOperation("提交新铺位") + @PostMapping("/add") + public ResponseResult addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) { + return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId())); + } + }