Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

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

@@ -59,19 +59,20 @@ public class BuildInformationRequest {
     private String inStorePhoto;
 
     @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是")
-    private  Boolean juridicalIsSamePartner;
+    @NotNull(message = "法人身份证信息是否和加盟商一致不能为空")
+    private  Boolean juridicalIsSamePartner  ;
 
-    @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;
@@ -87,14 +88,15 @@ public class BuildInformationRequest {
     private String juridicalHandheldIdCardReverse;
 
     @ApiModelProperty("结算人身份证信息是否和加盟商一致，false否，true是")
-    private  Boolean settlerIsSamePartner;
+    @NotNull(message = "结算人身份证信息是否和加盟商一致不能为空")
+    private  Boolean settlerIsSamePartner ;
 
     @ApiModelProperty("结算人姓名")
-    @NotBlank(message = "结算人姓名  不能为空")
+   // @NotBlank(message = "结算人姓名  不能为空")
     @JsonProperty("settlerName")
     private String settlerName;
 
-    @NotBlank(message = "结算人身份证正面  不能为空")
+    //@NotBlank(message = "结算人身份证正面  不能为空")
     @Length(max = 250 , message = "结算人身份证正面 长度不能超过250")
     @ApiModelProperty("结算人身份证正面（图片）")
     private String settlerIdCardFront;
@@ -109,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;

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

@@ -56,23 +56,23 @@ public class BusinessLicenseRequest {
     private Integer submitStatus;
 
     @ApiModelProperty("法人身份证信息是否和加盟商一致，false否，true是")
-    @NotNull
-    private Boolean legalIsSamePartner;
+    @NotNull(message = "法人身份证信息是否和加盟商一致不能为空")
+    private Boolean legalIsSamePartner ;
 
     @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) {

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.isBlank(response.getAddresseeProvince())){
+                response.setAddresseeProvince(pointInfo.getProvince());}
+                if (StringUtils.isBlank(response.getAddresseeCity())){
+                response.setAddresseeCity(pointInfo.getCity());}
+                if (StringUtils.isBlank(response.getAddresseeDistrict())){
+                response.setAddresseeDistrict(pointInfo.getDistrict());}
+            }
+        if (StringUtils.isBlank(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());

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));
     }