diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java index 1052efcc9..b9d735f30 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -17,6 +18,7 @@ import java.util.List; */ @Data public class ThreeAcceptanceRequest { + @NotNull private Long shopId; @ApiModelProperty("工程部验收") private ThreeAcceptanceDTO engineeringAcceptance; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index 5d3bc419d..2229bb5e9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -59,9 +59,12 @@ public class ZxjpApiRequest { @ApiModelProperty(value = "店铺品牌") private String franchiseBrand; - @ApiModelProperty(value = "新管家对应组织") + @ApiModelProperty(value = "新管家对应组织id") private String xgjRegionId; + @ApiModelProperty(value = "新管家对应组织") + private String xgjRegionName; + @ApiModelProperty(value = "新管家副总裁") private String xgjVicePresident; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 46ed56270..14ab526fa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -132,6 +132,7 @@ public class SyncDataServiceImpl implements SyncDataService { } if (orderSysInfoDO != null) { request.setXgjRegionId(orderSysInfoDO.getXgjRegionId()); + request.setXgjRegionName(orderSysInfoDO.getXgjRegionName()); request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident()); request.setAddresseeName(orderSysInfoDO.getAddresseeName()); request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index b0e9a07a1..55e3ca2df 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -21,6 +21,7 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -89,7 +90,7 @@ public class PCDecorationController { } @ApiOperation("提交三方验收签字") @PostMapping("/submitThreeAcceptanceSign") - public ResponseResult submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){ + public ResponseResult submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request){ return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request)); } @ApiOperation("查看三方验收签字")