增加字段必填校验

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

@@ -85,6 +85,7 @@ public class AddPointDetailRequest {
     private String landlordUsername;
 
     @ApiModelProperty("房东电话")
+    @NotBlank(message = "房东电话不能为空")
     private String landlordMobile;
 
     @Min(1)

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

@@ -302,6 +302,9 @@ public class PointServiceImpl implements PointService {
             log.error("铺位详细信息不存在");
             throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
         }
+        if (!checkIsAudit(pointInfo,pointDetailInfo)) {
+            throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
+        }
         //处理子任务审核记录表
         AuditSettingVO auditSetting = getAuditSetting();
         if (Objects.isNull(auditSetting)) {
@@ -328,7 +331,17 @@ public class PointServiceImpl implements PointService {
         dealNextAuditRecord(pointInfo, pointAuditRecordMap, NodeNoEnum.NODE_NO_0.getCode());
         return pointInfoDAO.updatePointInfo(updatePoint);
     }
+    private Boolean checkIsAudit(PointInfoDO pointInfo,PointDetailInfoDO pointDetailInfoDO){
+        if (StringUtils.isAnyBlank(pointInfo.getPointArea(),pointInfo.getLatitude(),
+                pointInfo.getLongitude(),pointInfo.getAddress(),pointInfo.getProvince(),pointInfo.getCity(),
+                pointInfo.getDistrict(),pointInfo.getTownship(),pointInfo.getOpportunityPointCode(),pointInfo.getOpportunityPointName()
+                ,pointInfo.getProvinceCode(),pointInfo.getCityCode(),pointInfo.getDistrictCode(),pointDetailInfoDO.getMonthRent()
+        ,pointDetailInfoDO.getLandlordMobile())){
+            return false;
+        }
+        return true;
 
+    }
     @Override
     public Integer auditSetting(AuditSettingRequest request) {
         String cacheKey = MessageFormat.format(AUDIT_SETTING_KEY, enterpriseId);

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java

@@ -1,6 +1,7 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.dto.XgjOrganizationDTO;
 import com.cool.store.enums.OrderSysTypeEnum;
 import com.cool.store.request.OrderSysInfoRequest;
 import com.cool.store.response.ResponseResult;
@@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author: WangShuo
@@ -45,7 +47,7 @@ public class PCOrderSysInfoController {
 
     @GetMapping("/getXgjOrganization")
     @ApiOperation("获取新管家组织架构")
-    public ResponseResult<Object> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) {
+    public ResponseResult<List<XgjOrganizationDTO>> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) {
         return ResponseResult.success(pushService.getXgjOrganization(partnerId));
     }