Merge branch 'master' into cc_20250526_jingDong

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java

@@ -87,4 +87,10 @@ public class LicenseTransactDO {
     private Integer syncFlag;
     @Column(name = "legal_is_same_partner")
     private Boolean legalIsSamePartner;
+    @Column(name = "single_shop")
+    private Boolean singleShop;
+    @Column(name = "commitment_url")
+    private String commitmentUrl;
+    @Column(name = "food_shop_list_url")
+    private String foodShopListUrl;
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java

@@ -158,4 +158,10 @@ public class PlatformBuildDO  {
     @Column(name = "store_id")
     private String storeId;
 
+    /**
+     * 抖音核销手机号
+     */
+    @Column(name = "dy_mobile")
+    private String dyMobile;
+
 }

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

@@ -81,6 +81,10 @@ public class PlatformBuildRequest {
     @Length(max = 250, message = "快手平台账号 长度不能超过250")
     private String ksAccount;
 
+    @ApiModelProperty("抖音核销手机号")
+    private String dyMobile;
+
+
 
     public PlatformBuildDO toDO() {
         PlatformBuildDO platformBuildDO = new PlatformBuildDO();
@@ -99,6 +103,7 @@ public class PlatformBuildRequest {
         platformBuildDO.setStorePositioningUrl(this.storePositioningUrl);
         platformBuildDO.setAuthorizationUrl(this.authorizationUrl);
         platformBuildDO.setKsAccount(this.ksAccount);
+        platformBuildDO.setDyMobile(this.dyMobile);
         return platformBuildDO;
 
     }

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

@@ -38,7 +38,7 @@ public class ThreeAcceptanceRequest {
     private String shopInteriorPhoto;
 
     public Boolean miniCheck(){
-        if (StringUtils.isAnyBlank(this.ksAccount,this.verificationPhone,this.shopLocationScreenshots)){
+        if (StringUtils.isAnyBlank(this.shopLocationScreenshots)){
             return false;
         }
         return true;

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

@@ -126,7 +126,7 @@ public class ZxjpApiRequest {
     @ApiModelProperty(value = "门店详细地址")
     private String  shopAddress;
 
-    @ApiModelProperty(value = "核销手机号")
+    @ApiModelProperty(value = "抖音核销手机号")
     private String  verificationMobile;
 
     @ApiModelProperty(value = "快手号")

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

@@ -75,6 +75,16 @@ public class BusinessLicenseRequest {
     //@NotBlank(message = "法人手机号不能为空")
     private String licenseLegalMobile;
 
+    @ApiModelProperty("是否单店使用")
+    @NotNull(message = "是否单店使用不能为空")
+    private Boolean singleShop;
+
+    @ApiModelProperty("美食城承诺书")
+    private String commitmentUrl;
+
+    @ApiModelProperty("美食城档口列表")
+    private String foodShopListUrl;
+
     public LicenseTransactDO toLicenseTransactDO(LicenseTransactDO licenseTransactDO) {
         if (Objects.isNull(licenseTransactDO)){
             licenseTransactDO = new LicenseTransactDO();
@@ -99,6 +109,9 @@ public class BusinessLicenseRequest {
         }else if (this.validityType == 1){
             licenseTransactDO.setValidity(this.validity);
         }
+        licenseTransactDO.setSingleShop(this.singleShop);
+        licenseTransactDO.setCommitmentUrl(this.commitmentUrl);
+        licenseTransactDO.setFoodShopListUrl(this.foodShopListUrl);
         return licenseTransactDO;
     }
 

coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java

@@ -100,6 +100,8 @@ public class PlatformBuildResponse {
     private String shopProvinceCityDistrict;
     @ApiModelProperty("门店详细地址")
     private String shopAddress;
+    @ApiModelProperty("抖音核销手机号")
+    private String dyMobile;
 
 
 }

coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -122,7 +123,14 @@ public class SubmitLicenseResponse {
     private StoreDocument storeDocument;
     @ApiModelProperty("二证合一标识；0否 1 是")
     private Integer twoCertificatesOne;
+    @ApiModelProperty("是否单店使用")
+    private Boolean singleShop;
 
+    @ApiModelProperty("美食城承诺书")
+    private String commitmentUrl;
+
+    @ApiModelProperty("美食城档口列表")
+    private String foodShopListUrl;
     @Data
     public static class StoreDocument {
         @ApiModelProperty("营业执照拍照上传")
@@ -227,6 +235,9 @@ public class SubmitLicenseResponse {
             return new SubmitLicenseResponse();
         }
         SubmitLicenseResponse submitLicenseResponse = new SubmitLicenseResponse();
+        submitLicenseResponse.setSingleShop(licenseTransactDO.getSingleShop());
+        submitLicenseResponse.setCommitmentUrl(licenseTransactDO.getCommitmentUrl());
+        submitLicenseResponse.setFoodShopListUrl(licenseTransactDO.getFoodShopListUrl());
         submitLicenseResponse.setLegalIsSamePartner(licenseTransactDO.getLegalIsSamePartner());
         submitLicenseResponse.setLicenseLegalIdCardNo(licenseTransactDO.getLicenseLegalIdCardNo());
         submitLicenseResponse.setLicenseLegalIdCardFront(licenseTransactDO.getLicenseLegalIdCardFront());