suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-04-13 00:31:57 +08:00
parent 29b0f7baac
commit d2202fbc5c
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java
View File

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
/** /**
@@ -17,6 +18,7 @@ import java.util.List;
*/ */
@Data @Data
public class ThreeAcceptanceRequest { public class ThreeAcceptanceRequest {
@NotNull
private Long shopId; private Long shopId;
@ApiModelProperty("工程部验收") @ApiModelProperty("工程部验收")
private ThreeAcceptanceDTO engineeringAcceptance; private ThreeAcceptanceDTO engineeringAcceptance;

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

@@ -59,9 +59,12 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "店铺品牌") @ApiModelProperty(value = "店铺品牌")
private String franchiseBrand; private String franchiseBrand;
@ApiModelProperty(value = "新管家对应组织") @ApiModelProperty(value = "新管家对应组织id")
private String xgjRegionId; private String xgjRegionId;
@ApiModelProperty(value = "新管家对应组织")
private String xgjRegionName;
@ApiModelProperty(value = "新管家副总裁") @ApiModelProperty(value = "新管家副总裁")
private String xgjVicePresident; private String xgjVicePresident;

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -132,6 +132,7 @@ public class SyncDataServiceImpl implements SyncDataService {
} }
if (orderSysInfoDO != null) { if (orderSysInfoDO != null) {
request.setXgjRegionId(orderSysInfoDO.getXgjRegionId()); request.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
request.setXgjRegionName(orderSysInfoDO.getXgjRegionName());
request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident()); request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
request.setAddresseeName(orderSysInfoDO.getAddresseeName()); request.setAddresseeName(orderSysInfoDO.getAddresseeName());
request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile()); request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile());

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
View File

@@ -21,6 +21,7 @@ import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -89,7 +90,7 @@ public class PCDecorationController {
} }
@ApiOperation("提交三方验收签字") @ApiOperation("提交三方验收签字")
@PostMapping("/submitThreeAcceptanceSign") @PostMapping("/submitThreeAcceptanceSign")
public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){ public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request){
return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request)); return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
} }
@ApiOperation("查看三方验收签字") @ApiOperation("查看三方验收签字")