From c3e0ba93d45c43b54b7866bee503b7a76a3f15a4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 15:19:56 +0800 Subject: [PATCH 1/7] fix --- .../java/com/cool/store/request/BuildInformationRequest.java | 2 ++ .../com/cool/store/request/license/BusinessLicenseRequest.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 d27528689..5a413c993 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 @@ -59,6 +59,7 @@ public class BuildInformationRequest { private String inStorePhoto; @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") + //@NotNull private Boolean juridicalIsSamePartner; @NotBlank(message = "法人身份证正面 不能为空") @@ -87,6 +88,7 @@ public class BuildInformationRequest { private String juridicalHandheldIdCardReverse; @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是") + //@NotNull private Boolean settlerIsSamePartner; @ApiModelProperty("结算人姓名") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java index 53038cd1c..d6c67dcc8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java @@ -56,7 +56,7 @@ public class BusinessLicenseRequest { private Integer submitStatus; @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") - @NotNull + //@NotNull private Boolean legalIsSamePartner; @ApiModelProperty("法人身份证号码") From 6a67c91b18506d7eae925674cd53910c077898fc Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 15:25:22 +0800 Subject: [PATCH 2/7] fix --- .../java/com/cool/store/request/BuildInformationRequest.java | 4 ++-- .../cool/store/request/license/BusinessLicenseRequest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 5a413c993..c75784399 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 @@ -60,7 +60,7 @@ public class BuildInformationRequest { @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") //@NotNull - private Boolean juridicalIsSamePartner; + private Boolean juridicalIsSamePartner = false; @NotBlank(message = "法人身份证正面 不能为空") @Length(max = 250 , message = "法人身份证正面长度不能超过250") @@ -89,7 +89,7 @@ public class BuildInformationRequest { @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是") //@NotNull - private Boolean settlerIsSamePartner; + private Boolean settlerIsSamePartner = false; @ApiModelProperty("结算人姓名") @NotBlank(message = "结算人姓名 不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java index d6c67dcc8..8bf9763b1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java @@ -57,7 +57,7 @@ public class BusinessLicenseRequest { @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") //@NotNull - private Boolean legalIsSamePartner; + private Boolean legalIsSamePartner = false; @ApiModelProperty("法人身份证号码") @NotBlank(message = "法人身份证号码不能为空") From 368a61b8ffc9ff3a1eccf32344ad25fe709f7093 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 15:33:39 +0800 Subject: [PATCH 3/7] fix --- .../impl/BuildInformationServiceImpl.java | 26 ++++++++++++------- .../cool/store/config/SignValidateFilter.java | 3 ++- 2 files changed, 18 insertions(+), 11 deletions(-) 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 3dc6eb4fd..603051b24 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 @@ -17,6 +17,7 @@ import com.cool.store.service.BuildInformationService; import com.cool.store.mapper.BuildInformationMapper; import com.cool.store.service.PreparationService; import com.cool.store.service.UserAuthMappingService; +import com.cool.store.utils.poi.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -102,13 +103,18 @@ public class BuildInformationServiceImpl implements BuildInformationService { if (Objects.nonNull(warehouseInfoDO)) { response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); } - }else { - if (Objects.nonNull(pointInfo)){ - response.setAddresseeProvince(pointInfo.getProvince()); - response.setAddresseeCity(pointInfo.getCity()); - response.setAddresseeDistrict(pointInfo.getDistrict());} - response.setAddresseeAddress(shopInfo.getDetailAddress()); } + if (Objects.nonNull(pointInfo)) { + if (StringUtils.isNotBlank(response.getAddresseeProvince())){ + response.setAddresseeProvince(pointInfo.getProvince());} + if (StringUtils.isNotBlank(response.getAddresseeCity())){ + response.setAddresseeCity(pointInfo.getCity());} + if (StringUtils.isNotBlank(response.getAddresseeDistrict())){ + response.setAddresseeDistrict(pointInfo.getDistrict());} + } + if (StringUtils.isNotBlank(response.getAddresseeAddress())){ + response.setAddresseeAddress(shopInfo.getDetailAddress());} + return response; } @@ -152,20 +158,20 @@ public class BuildInformationServiceImpl implements BuildInformationService { BuildInformationDO buildInformationDO = request.toDO(); OrderSysInfoDO orderSysInfoDO = getOrderSysInfoDO(request); OrderSysInfoDO orderSysInfoDO1 = orderSysInfoDAO.selectByShopId(request.getShopId()); - if (Objects.nonNull(orderSysInfoDO1)){ + if (Objects.nonNull(orderSysInfoDO1)) { orderSysInfoDAO.updateByShopId(orderSysInfoDO); - }else{ + } 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()){ + if (request.getJuridicalIsSamePartner()) { request.setJuridicalIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setJuridicalIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); request.setJuridicalIdCardReverse(qualificationsInfoDO.getBackOfIdCard()); } - if (request.getSettlerIsSamePartner()){ + if (request.getSettlerIsSamePartner()) { request.setSettlerIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setSettlerName(lineInfoDO.getUsername()); request.setSettlerIdCardFront(qualificationsInfoDO.getFrontOfIdCard()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index d96af4e4a..44b826e8d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -59,7 +59,8 @@ public class SignValidateFilter implements Filter { "/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/zxjp/**/api/audit/result", "/zxjp/**/api/license", - "/zxjp/mini/line/getRegionPayPic" + "/zxjp/mini/line/getRegionPayPic", + "/zxjp/mini/**" ); From 52d4507193cb56e88396bd2f662d033c3e329115 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 15:34:41 +0800 Subject: [PATCH 4/7] fix --- .../store/service/impl/BuildInformationServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 603051b24..61cfa2a3c 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 @@ -105,14 +105,14 @@ public class BuildInformationServiceImpl implements BuildInformationService { } } if (Objects.nonNull(pointInfo)) { - if (StringUtils.isNotBlank(response.getAddresseeProvince())){ + if (StringUtils.isBlank(response.getAddresseeProvince())){ response.setAddresseeProvince(pointInfo.getProvince());} - if (StringUtils.isNotBlank(response.getAddresseeCity())){ + if (StringUtils.isBlank(response.getAddresseeCity())){ response.setAddresseeCity(pointInfo.getCity());} - if (StringUtils.isNotBlank(response.getAddresseeDistrict())){ + if (StringUtils.isBlank(response.getAddresseeDistrict())){ response.setAddresseeDistrict(pointInfo.getDistrict());} } - if (StringUtils.isNotBlank(response.getAddresseeAddress())){ + if (StringUtils.isBlank(response.getAddresseeAddress())){ response.setAddresseeAddress(shopInfo.getDetailAddress());} return response; From 19f27ba4a9a5f3cb12a598dc8b5ef141d891a131 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 15:35:57 +0800 Subject: [PATCH 5/7] fix --- .../main/java/com/cool/store/config/SignValidateFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 44b826e8d..d96af4e4a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -59,8 +59,7 @@ public class SignValidateFilter implements Filter { "/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/zxjp/**/api/audit/result", "/zxjp/**/api/license", - "/zxjp/mini/line/getRegionPayPic", - "/zxjp/mini/**" + "/zxjp/mini/line/getRegionPayPic" ); From f3c013fa6d6fa4d6ac00c4a02879fdf87f04db7a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 18:38:24 +0800 Subject: [PATCH 6/7] fix --- .../store/request/BuildInformationRequest.java | 14 +++++++------- .../request/license/BusinessLicenseRequest.java | 8 ++++---- .../controller/webc/ApplyLicenseController.java | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) 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 c75784399..d6c1daacf 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 @@ -62,17 +62,17 @@ public class BuildInformationRequest { //@NotNull private Boolean juridicalIsSamePartner = false; - @NotBlank(message = "法人身份证正面 不能为空") + //@NotBlank(message = "法人身份证正面 不能为空") @Length(max = 250 , message = "法人身份证正面长度不能超过250") @ApiModelProperty("法人身份证正面（图片）") private String juridicalIdCardFront; - @NotBlank(message = "法人身份证反面 不能为空") + // @NotBlank(message = "法人身份证反面 不能为空") @Length(max = 250 , message = "法人身份证反面长度不能超过250") @ApiModelProperty("法人身份证反面（图片）") private String juridicalIdCardReverse; - @NotBlank(message = "法人身份证号 不能为空") + // @NotBlank(message = "法人身份证号 不能为空") @Length(max = 18, message = "法人身份证号长度必须为18位") @ApiModelProperty("法人身份证号") private String juridicalIdCardNo; @@ -92,11 +92,11 @@ public class BuildInformationRequest { private Boolean settlerIsSamePartner = false; @ApiModelProperty("结算人姓名") - @NotBlank(message = "结算人姓名 不能为空") + // @NotBlank(message = "结算人姓名 不能为空") @JsonProperty("settlerName") private String settlerName; - @NotBlank(message = "结算人身份证正面 不能为空") + //@NotBlank(message = "结算人身份证正面 不能为空") @Length(max = 250 , message = "结算人身份证正面 长度不能超过250") @ApiModelProperty("结算人身份证正面（图片）") private String settlerIdCardFront; @@ -111,12 +111,12 @@ public class BuildInformationRequest { @ApiModelProperty("结算人手持身份证反面 （图片）") private String settlerInHandBackPicture; - @NotBlank(message = "结算人身份证反面 不能为空") + // @NotBlank(message = "结算人身份证反面 不能为空") @Length(max = 250 , message = "结算人身份证反面 长度不能超过250") @ApiModelProperty("结算人身份证反面（图片）") private String settlerIdCardReverse; - @NotBlank(message = "结算人身份证号 不能为空") + // @NotBlank(message = "结算人身份证号 不能为空") @Length(max = 64 , message = "结算人身份证号 长度不能超过64") @ApiModelProperty("结算人身份证号") private String settlerIdCardNo; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java index 8bf9763b1..cfd7c4999 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java @@ -60,19 +60,19 @@ public class BusinessLicenseRequest { private Boolean legalIsSamePartner = false; @ApiModelProperty("法人身份证号码") - @NotBlank(message = "法人身份证号码不能为空") + //@NotBlank(message = "法人身份证号码不能为空") private String licenseLegalIdCardNo; @ApiModelProperty("法人身份证正面") - @NotBlank(message = "法人身份证正面不能为空") + //@NotBlank(message = "法人身份证正面不能为空") private String licenseLegalIdCardFront; @ApiModelProperty("法人身份证反面") - @NotBlank(message = "法人身份证反面不能为空") + // @NotBlank(message = "法人身份证反面不能为空") private String licenseLegalIdCardBack; @ApiModelProperty("法人手机号") - @NotBlank(message = "法人手机号不能为空") + //@NotBlank(message = "法人手机号不能为空") private String licenseLegalMobile; public LicenseTransactDO toLicenseTransactDO(LicenseTransactDO licenseTransactDO) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java index 45e9d4e8a..5a5061f5f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java @@ -14,6 +14,7 @@ import com.cool.store.vo.PartnerUserInfoVO; 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; @@ -34,7 +35,7 @@ public class ApplyLicenseController { @ApiOperation("证照办理提交-营业执照") @PostMapping("/submitBusinessLicense") - public ResponseResult submitBusinessLicense(@RequestBody BusinessLicenseRequest request) { + public ResponseResult submitBusinessLicense(@RequestBody @Validated BusinessLicenseRequest request) { PartnerUserInfoVO user = PartnerUserHolder.getUser(); return ResponseResult.success(applyLicenseService.submitBusinessLicense(request,user)); } From bee2f0f0508b6d83c944bbf75d47da6d3150772a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 16 Apr 2025 18:41:07 +0800 Subject: [PATCH 7/7] fix --- .../com/cool/store/request/BuildInformationRequest.java | 8 ++++---- .../store/request/license/BusinessLicenseRequest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 d6c1daacf..1e0012bb8 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 @@ -59,8 +59,8 @@ public class BuildInformationRequest { private String inStorePhoto; @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") - //@NotNull - private Boolean juridicalIsSamePartner = false; + @NotNull(message = "法人身份证信息是否和加盟商一致不能为空") + private Boolean juridicalIsSamePartner ; //@NotBlank(message = "法人身份证正面 不能为空") @Length(max = 250 , message = "法人身份证正面长度不能超过250") @@ -88,8 +88,8 @@ public class BuildInformationRequest { private String juridicalHandheldIdCardReverse; @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是") - //@NotNull - private Boolean settlerIsSamePartner = false; + @NotNull(message = "结算人身份证信息是否和加盟商一致不能为空") + private Boolean settlerIsSamePartner ; @ApiModelProperty("结算人姓名") // @NotBlank(message = "结算人姓名 不能为空") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java index cfd7c4999..9bc88eda4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/license/BusinessLicenseRequest.java @@ -56,8 +56,8 @@ public class BusinessLicenseRequest { private Integer submitStatus; @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是") - //@NotNull - private Boolean legalIsSamePartner = false; + @NotNull(message = "法人身份证信息是否和加盟商一致不能为空") + private Boolean legalIsSamePartner ; @ApiModelProperty("法人身份证号码") //@NotBlank(message = "法人身份证号码不能为空")