diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java index dfdfe4495..691a961b4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BuildInformationRequest.java @@ -95,16 +95,13 @@ public class BuildInformationRequest { private Boolean settlerIsSamePartner ; @ApiModelProperty("结算人姓名") - // @NotBlank(message = "结算人姓名 不能为空") @JsonProperty("settlerName") private String settlerName; - //@NotBlank(message = "结算人身份证正面 不能为空") @Length(max = 250 , message = "结算人身份证正面 长度不能超过250") @ApiModelProperty("结算人身份证正面(图片)") private String settlerIdCardFront; - @NotBlank(message = "结算人手持身份证正面 不能为空") @Length(max = 250 , message = "结算人手持身份证正面 长度不能超过250") @ApiModelProperty("结算人手持身份证正面") private String settlerInHandFrontPicture; @@ -129,23 +126,19 @@ public class BuildInformationRequest { @ApiModelProperty("结算人银行卡照片") private String settlerBankPhotoUrl; - @NotBlank(message = "结算人银行卡背面照片 不能为空") @Length(max = 250, message = "结算人银行卡背面照片 长度不能超过250") @ApiModelProperty("结算人银行卡背面照片") @JsonProperty("settlerBankBackPhotoUrl") private String settlerBankBackPhotoUrl; - @NotBlank(message = "结算人银行卡号 不能为空") @Length(max = 64 , message = "结算人银行卡号 长度不能超过64") @ApiModelProperty("结算人银行卡号") private String settlerBankNumber; - @NotBlank(message = "结算人银行卡预留手机号 不能为空") @Length(min = 11,max = 11 , message = "结算人银行卡预留手机号 长度必须为11") @ApiModelProperty("结算人银行卡预留手机号") private String settlerBankMobile; - @NotBlank(message = "结算开户银行支行 不能为空") @Length(max =100, message = "结算开户银行支行 长度不能超过100") @ApiModelProperty("结算开户银行支行") private String settlerBankName; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 5fc80c44e..e04f8bf61 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -201,6 +201,16 @@ public class BuildInformationServiceImpl implements BuildInformationService { try { acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); if (Boolean.TRUE.equals(acquired)) { + ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); + if (JoinModeEnum.FLAGSHIP_STORE.getCode()!=shopInfoDO.getJoinMode()){ + //校验结算人非空 + if (StringUtils.isAnyBlank(request.getSettlerName(),request.getSettlerIdCardFront(), + request.getSettlerInHandFrontPicture(),request.getSettlerBankBackPhotoUrl(), + request.getSettlerBankNumber(),request.getSettlerBankMobile(),request.getSettlerBankName())) { + throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } + } + BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(request.getShopId()); BuildInformationDO buildInformationDO = request.toDO(); OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request); @@ -210,7 +220,6 @@ public class BuildInformationServiceImpl implements BuildInformationService { } else { orderSysInfoDAO.insertSelective(orderSysInfoDO); } - ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineInfoDO.getId()); if (request.getJuridicalIsSamePartner()) {