加必填校验

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -238,6 +238,7 @@ public enum ErrorCodeEnum {
     CONFIRM_THE_APPROVER(131006,"您提交的铺位暂时找不到选址审批人，请联系系统管理员配置选址审批权限后再提交铺位审批",null),
     CREATE_PASSWORD_FAIL(131007,"身份证号信息错误",null),
     GET_HOME_TEMPLATE_ERROR(131008,"获取首页模板失败",null),
+    THE_DATA_IS_NOT_FILLED(131009,"您有数据还未填写",null),
 
     TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null),
 

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

@@ -16,27 +16,30 @@ import java.util.Objects;
 @Data
 public class AddPointDetailRequest {
 
-    @NotBlank
+    @NotBlank(message = "铺位名称不能为空")
     @ApiModelProperty("铺位名称")
     private String pointName;
 
     @ApiModelProperty("所属大区")
     private Long regionId;
 
-    @NotBlank
+    @NotBlank(message = "经度不能为空")
     @ApiModelProperty("经度")
     private String longitude;
 
-    @NotBlank
+    @NotBlank(message = "纬度不能为空")
     @ApiModelProperty("纬度")
     private String latitude;
 
+    @NotBlank(message = "省不能为空")
     @ApiModelProperty("省")
     private String province;
 
+    @NotBlank(message = "市不能为空")
     @ApiModelProperty("市")
     private String city;
 
+    @NotBlank(message = "区/县不能为空")
     @ApiModelProperty("区/县")
     private String district;
 

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

@@ -84,6 +84,7 @@ public class AddSignFranchiseRequest {
     @ApiModelProperty("合同金额")
     private String contractAmount;
     @ApiModelProperty("合伙签约人1")
+    @NotBlank(message = "合伙签约人1不能为空")
     private String partnershipSignatoryFirst;
     @ApiModelProperty("合伙签约人2")
     private String partnershipSignatorySecond;

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

@@ -145,21 +145,27 @@ public class BuildInformationRequest {
     @ApiModelProperty("公司结算需要:开户许可证")
     private String accountOpeningPermit;
 
+    @NotBlank(message = "订货信息收件人  不能为空")
     @ApiModelProperty(value = "收件人")
     private String addresseeName;
 
+    @NotBlank(message = "订货信息手机号  不能为空")
     @ApiModelProperty(value = "手机号" )
     private String addresseeMobile;
 
+    @NotBlank(message = "订货信息收件省  不能为空")
     @ApiModelProperty(value = "收件省" )
     private String addresseeProvince;
 
+    @NotBlank(message = "订货信息收件市  不能为空")
     @ApiModelProperty(value = "收件市" )
     private String addresseeCity;
 
+    @NotBlank(message = "订货信息收件区  不能为空")
     @ApiModelProperty(value = "收件区" )
     private String addresseeDistrict;
 
+    @NotBlank(message = "订货信息详细地址  不能为空")
     @ApiModelProperty(value = "详细地址" )
     private String addresseeAddress;
 

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

@@ -22,10 +22,10 @@ public class JoinIntentionRequest {
     @ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
     private Integer joinMode;
     @ApiModelProperty("姓名")
-    @NotBlank
+    @NotBlank(message = "姓名不能为空")
     private String userName;
     @ApiModelProperty("手机号")
-    @NotBlank
+    @NotBlank(message = "手机号不能为空")
     private String mobile;
     @ApiModelProperty("1男 2女")
     private Integer sex;
@@ -40,12 +40,12 @@ public class JoinIntentionRequest {
     @ApiModelProperty("线索审核信息id")
     private Long auditId;
     @ApiModelProperty("身份证号码/统一社会信用代码")
-    @NotBlank
+    @NotBlank(message = "身份证号码不能为空")
     private String idCardNo;
     @ApiModelProperty("身份证正面")
-    @NotBlank
+    @NotBlank(message = "身份证正面不能为空")
     private String frontOfIdCard;
-    @NotBlank
+    @NotBlank(message = "身份证反面不能为空")
     @ApiModelProperty("身份证反面")
     private String backOfIdCard;
     @ApiModelProperty("婚姻状态 1-未婚 2-已婚 3-离婚 4-丧偶")
@@ -77,19 +77,19 @@ public class JoinIntentionRequest {
     @ApiModelProperty("办公地址")
     private String officeAddress;
     @ApiModelProperty("法人姓名")
-    @NotBlank
+    @NotBlank(message = "法人姓名不能为空")
     private String legalName;
     @ApiModelProperty("法人身份证号码")
-    @NotBlank
+    @NotBlank(message = "法人身份证号码不能为空")
     private String legalIdCardNo;
     @ApiModelProperty("法人身份证正面")
-    @NotBlank
+    @NotBlank(message = "法人身份证正面不能为空")
     private String legalIdCardFront;
     @ApiModelProperty("法人身份证反面")
-    @NotBlank
+    @NotBlank(message = "法人身份证反面不能为空")
     private String legalIdCardBack;
     @ApiModelProperty("法人手机号")
-    @NotBlank
+    @NotBlank(message = "法人手机号不能为空")
     private String legalMobile;
     @ApiModelProperty("业务负责人姓名")
     private String businessLeaderName;

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

@@ -23,22 +23,22 @@ public class MiniAddPointRequest {
     @ApiModelProperty("店铺id")
     private Long shopId;
 
-    @NotBlank
+    @NotBlank(message = "铺位名称不能为空")
     @ApiModelProperty("铺位名称")
     private String pointName;
 
     @ApiModelProperty("所属大区")
     private Long regionId;
 
-    @NotBlank
+    @NotBlank(message = "经度不能为空")
     @ApiModelProperty("经度")
     private String longitude;
 
-    @NotBlank
+    @NotBlank(message = "纬度不能为空")
     @ApiModelProperty("纬度")
     private String latitude;
 
-    @NotBlank
+    @NotBlank(message = "详细地址不能为空")
     @ApiModelProperty("详细地址")
     private String address;
 
@@ -72,14 +72,15 @@ public class MiniAddPointRequest {
     @ApiModelProperty("加盟商签名")
     private String lineSign;
 
-    @NotBlank
+    @NotBlank(message = "省不能为空")
     @ApiModelProperty("省")
     private String province;
 
-    @NotBlank
+    @NotBlank(message = "市不能为空")
     @ApiModelProperty("市")
     private String city;
 
+    @NotBlank(message = "区/县不能为空")
     @ApiModelProperty("区/县")
     private String district;
 
@@ -100,7 +101,7 @@ public class MiniAddPointRequest {
 
     @ApiModelProperty("区/县编码")
     private String districtCode;
-
+    @NotBlank(message = "铺位经纬度geohash不能为空")
     @ApiModelProperty("铺位经纬度geohash")
     private String location;
 

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

@@ -1,12 +1,15 @@
 package com.cool.store.request;
 
 import com.cool.store.entity.OrderSysInfoDO;
+import com.cool.store.enums.OrderSysTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 public class OrderSysInfoRequest {
@@ -14,8 +17,7 @@ public class OrderSysInfoRequest {
     @ApiModelProperty(hidden = true)
     private Integer type;
 
-    @ApiModelProperty(value = "店铺编码",required = true)
+    @ApiModelProperty(value = "店铺编码")
-    @NotBlank(message = "店铺编码不能为空")
     private String shopCode;
 
     @ApiModelProperty(value = "店铺ID" ,required = true)
@@ -105,4 +107,17 @@ public class OrderSysInfoRequest {
       
         return orderSysInfoDO;
     }
+    public Boolean check(){
+        if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
+            if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.warehouseDeliveryDate)){
+                return false;
+            }
+        }
+        if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
+            if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
+                return false;
+            }
+        }
+        return true;
+    }
 }

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

@@ -5,6 +5,7 @@ import com.cool.store.entity.AssessmentDataDO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
@@ -33,4 +34,11 @@ public class ThreeAcceptanceRequest {
     private String shopDoorwayPhoto;
     @ApiModelProperty("门店内景照片")
     private String shopInteriorPhoto;
+
+    public Boolean miniCheck(){
+        if (StringUtils.isAnyBlank(this.ksAccount,this.verificationPhone,this.shopLocationScreenshots)){
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -350,6 +350,9 @@ public class DecorationServiceImpl implements DecorationService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean miniSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
+        if (!request.miniCheck()){
+            throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
+        }
         //加盟商
         if (Objects.nonNull(request.getPartnerAcceptance())) {
             request.getPartnerAcceptance().setStatus(CommonConstants.ONE);
@@ -688,6 +691,9 @@ public class DecorationServiceImpl implements DecorationService {
     @Override
     public Boolean pcSubmitAcceptanceSign(ThreeAcceptanceRequest request) {
         log.info("submitAcceptance, request:{} ", JSONObject.toJSONString(request));
+        if(StringUtils.isAnyBlank(request.getShopDoorwayPhoto(),request.getShopInteriorPhoto())){
+            throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
+        }
         //营运部 验收签名
         AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(request.getShopId());
         if (StringUtils.isNotEmpty(acceptanceInfoDO1.getPartnerAcceptanceSignatures())

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

@@ -8,10 +8,12 @@ import com.cool.store.entity.EnterpriseUserDO;
 import com.cool.store.entity.LineInfoDO;
 import com.cool.store.entity.OrderSysInfoDO;
 import com.cool.store.entity.ShopInfoDO;
+import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.MessageEnum;
 import com.cool.store.enums.OrderSysTypeEnum;
 import com.cool.store.enums.UserRoleEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.request.OrderSysInfoRequest;
 import com.cool.store.service.OrderSysInfoService;
 import com.cool.store.service.UserAuthMappingService;
@@ -51,8 +53,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer updateByShopId(OrderSysInfoRequest request, String userId) {
-
+        //参数校验
-
+        if (!request.check()){
+            throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED);
+        }
         OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
         if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) {
             orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident());