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-common/src/main/java/com/cool/store/constants/RedisConstant.java

@@ -279,4 +279,6 @@ public class RedisConstant {
     public static final String YUN_XUE_TANG_ACCESS_TOKEN = "yun_xue_tang_access_token_";
 
     public static final String SUBMIT_BUILD_KEY = "submit_build_key_";
+
+    public static final String GET_AI_MODULE = "get_ai_module_";
 }

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

@@ -65,6 +65,8 @@ public enum UserRoleEnum {
 
     BRAND_HEAD(490000000L,"品牌负责人"),
 
+    QW_SUPERVISION(1725431698852L,"企微督导"),
+
     JING_DONG_OPERATIONS_CUSTOMER(500000000L,"京东运营大区客服"),
     JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
     ;

coolstore-partner-common/src/main/java/com/cool/store/utils/RedisConstantUtil.java

@@ -109,5 +109,8 @@ public class RedisConstantUtil {
     public String submitBuildKey(Long shopId){
         return active + "_" + RedisConstant.SUBMIT_BUILD_KEY + eid + ":" + shopId ;
     }
+    public String getAiModuleKey(){
+        return active + "_" + RedisConstant.GET_AI_MODULE + eid;
+    }
 
 }

coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml

@@ -37,7 +37,10 @@
         update_time,
         deleted,
         two_certificates_one,
-        legal_is_same_partner
+        legal_is_same_partner,
+        single_shop,
+        commitment_url,
+        food_shop_list_url
     </sql>
     <update id="updateByShopId">
         update xfsg_license_transact

coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml

@@ -30,6 +30,7 @@
         <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
         <result property="poi" column="poi" jdbcType="VARCHAR"/>
         <result property="storeId" column="store_id" jdbcType="VARCHAR"/>
+        <result property="dyMobile" column="dy_mobile" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -40,6 +41,6 @@
         settler_bank_name,
         account,store_positioning_url,authorization_url,
         create_time,update_time,create_user,
-        update_user,poi,store_id
+        update_user,poi,store_id,dy_mobile
     </sql>
 </mapper>

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

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

@@ -186,6 +186,15 @@ public interface DeskService {
      */
     PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
 
+    /**
+     * 营业执照
+     */
+    PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
+
+    /**
+     * 食品安全许可证
+     */
+    PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user);
     /**
      *      京东外卖
      */

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

@@ -112,4 +112,12 @@ public interface LineService {
     Integer updateRegionId(Long regionId,Long lineId);
     Boolean hasRegionId(Long lineId);
 
+    /**
+     * @Auther: wangshuo
+     * @Date: 2025/5/27
+     * @description:小程序ai模块是否展示
+     */
+    Boolean getAiModule();
+
+    Boolean setAiModule(Boolean flag);
 }

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

@@ -53,7 +53,7 @@ import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS;
 public class DeskServiceImpl implements DeskService {
 
     @Resource
-    private  SignFranchiseDAO signFranchiseDAO;
+    private SignFranchiseDAO signFranchiseDAO;
     @Resource
     DecorationMeasureDAO decorationMeasureDAO;
     @Resource
@@ -244,15 +244,21 @@ public class DeskServiceImpl implements DeskService {
         PageInfo<PreparationCommonPendingVO> pageInfo = new PageInfo<>();
         List<Integer> subStageStatusList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(userRoleIds)) {
-            if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
+            //督导代填
-                subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
+            if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
-            }
-            if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
-                subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus());
-            }
-            if (!subStageStatusList.isEmpty()) {
                 pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
-                        subStageStatusList, Boolean.TRUE);
+                        Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()), Boolean.FALSE);
+            } else {
+                if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
+                    subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus());
+                }
+                if (userRoleIds.contains(UserRoleEnum.BRANCH_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) {
+                    subStageStatusList.add(SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus());
+                }
+                if (!subStageStatusList.isEmpty()) {
+                    pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7,
+                            subStageStatusList, Boolean.TRUE);
+                }
             }
         }
         return pageInfo;
@@ -342,7 +348,7 @@ public class DeskServiceImpl implements DeskService {
             List<LineInfoDO> lineInfoDOS = lineInfoDAO.getByLineIds(lineIds);
             Map<Long, LineInfoDO> lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line));
             List<SignFranchiseDO> signType = signFranchiseDAO.getSignType(shopIds);
-            Map<Long,SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
+            Map<Long, SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
 
             Set<Long> regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet());
             Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet));
@@ -355,7 +361,7 @@ public class DeskServiceImpl implements DeskService {
                 if (lineInfoDO == null) {
                     continue;
                 }
-                SignFranchiseDO signFranchiseDO = signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(),new SignFranchiseDO());
+                SignFranchiseDO signFranchiseDO = signTypeMap.getOrDefault(preparationCommonPendingVO.getShopId(), new SignFranchiseDO());
                 preparationCommonPendingVO.setSignType(signFranchiseDO.getSignType());
                 preparationCommonPendingVO.setPartnerName(lineInfoDO.getUsername());
                 preparationCommonPendingVO.setPartnerPhone(lineInfoDO.getMobile());
@@ -429,6 +435,10 @@ public class DeskServiceImpl implements DeskService {
     @Override
     public PageInfo<PreparationCommonPendingVO> buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
         List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
+        if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) {
+            return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_15,
+                    Collections.singletonList(SHOP_SUB_STAGE_STATUS_150.getShopSubStageStatus()), Boolean.FALSE );
+        }
         //如果不是财务角色或者即是财务又是自有店财务 则不需要标识
         Boolean ownShopFlag = null;
         if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())&&userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())){
@@ -490,7 +500,7 @@ public class DeskServiceImpl implements DeskService {
             List<LineInfoDO> lineInfoDOS = lineInfoDAO.getByLineIds(lineIds);
             Map<Long, LineInfoDO> lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line));
             List<SignFranchiseDO> signType = signFranchiseDAO.getSignType(shopIds);
-            Map<Long,SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
+            Map<Long, SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
 
             Set<Long> regionIdSet = list.stream().map(PreparationCommonPendingVO::getRegionId).collect(Collectors.toSet());
             Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(new ArrayList<>(regionIdSet));
@@ -514,6 +524,17 @@ public class DeskServiceImpl implements DeskService {
         return new PageInfo<>();
     }
 
+    @Override
+    public PageInfo<PreparationCommonPendingVO> businessLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
+        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_3,
+                    Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus()), Boolean.FALSE );
+    }
+
+    @Override
+    public PageInfo<PreparationCommonPendingVO> foodLicensePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
+        return commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_4,
+                Collections.singletonList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40.getShopSubStageStatus()), Boolean.FALSE );
+    }
     @Override
     public PageInfo<PreparationCommonPendingVO> JingDongPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
         return commonPlatformBuild(pageNum, pageSize, user, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_251.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()));
@@ -563,7 +584,7 @@ public class DeskServiceImpl implements DeskService {
         List<PlanLineDTO> lines = lineInfoDAO.getLines(lineIds);
 
         List<SignFranchiseDO> signType = signFranchiseDAO.getSignType(shopIds);
-        Map<Long,SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
+        Map<Long, SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
         //将shopInfoList 转为map
         Map<Long, ShopInfoDO> shopInfoMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getId, shop -> shop));
         //将lines 转为map
@@ -659,7 +680,7 @@ public class DeskServiceImpl implements DeskService {
         Map<Long, PlanLineDTO> lineMap = lines.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, line -> line));
 
         List<SignFranchiseDO> signType = signFranchiseDAO.getSignType(shopIds);
-        Map<Long,SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
+        Map<Long, SignFranchiseDO> signTypeMap = signType.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, dto -> dto));
 
         List<Long> regionIds = shopInfoList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList());
         List<String> developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList());

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

@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
+import com.cool.store.constants.RedisConstant;
 import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
@@ -13,6 +14,8 @@ import com.cool.store.mapper.IntentAgreementMapper;
 import com.cool.store.mapper.JoinIntentionMapper;
 import com.cool.store.request.*;
 import com.cool.store.service.*;
+import com.cool.store.utils.RedisConstantUtil;
+import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.StringUtil;
 import com.cool.store.utils.UUIDUtils;
 import com.cool.store.utils.poi.DateUtils;
@@ -22,9 +25,11 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -37,6 +42,10 @@ import java.util.stream.Collectors;
 @Service
 public class LineServiceImpl implements LineService {
 
+    @Autowired
+    private RedisUtilPool redisUtilPool;
+    @Autowired
+    private RedisConstantUtil redisConstantUtil;
     @Resource
     ShopInfoDAO shopInfoDAO;
     @Resource
@@ -666,6 +675,24 @@ public class LineServiceImpl implements LineService {
         return false;
     }
 
+    @Override
+    public Boolean getAiModule() {
+        String key =redisConstantUtil.getAiModuleKey();
+        String value = redisUtilPool.getString(key);
+        if (StringUtils.isEmpty(value)){
+            return true;
+        }else {
+            return Boolean.valueOf(value);
+        }
+    }
+
+    @Override
+    public Boolean setAiModule(Boolean flag) {
+        String key =redisConstantUtil.getAiModuleKey();
+        redisUtilPool.setString(key,flag.toString());
+        return true;
+    }
+
     /**
      * 计算预期时间
      * @param startTime

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

@@ -9,6 +9,7 @@ import com.cool.store.entity.*;
 import com.cool.store.enums.DownSystemTypeEnum;
 import com.cool.store.enums.ErrorCodeEnum;
 import com.cool.store.enums.FranchiseBrandEnum;
+import com.cool.store.enums.PlatformBuildEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.ApplyLicenseMapper;
 import com.cool.store.mapper.SignFranchiseMapper;
@@ -64,6 +65,8 @@ public class SyncDataServiceImpl implements SyncDataService {
     private PointInfoDAO pointInfoDAO;
     @Resource
     private EnterpriseUserDAO enterpriseUserDAO;
+    @Resource
+    private PlatformBuildDAO platformBuildDAO;
 
     @Override
     public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) {
@@ -99,6 +102,10 @@ public class SyncDataServiceImpl implements SyncDataService {
         String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager());
 
         QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
+        //抖音
+        PlatformBuildDO dyPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.DOU_YIN.getCode());
+        //快手
+        PlatformBuildDO ksPlatformBuildDO = platformBuildDAO.selectOneByShopId(shopId, PlatformBuildEnum.KUAI_SHOU.getCode());
 
         request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo());
         request.setShopAddress(shopInfo.getDetailAddress());
@@ -154,7 +161,8 @@ public class SyncDataServiceImpl implements SyncDataService {
                 request.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName());
             }
             request.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
-            request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {}));
+            request.setDeclareGoodsDate(JSONUtils.parseToListOrMap(orderSysInfoDO.getDeclareGoodsDate(), new TypeReference<List<DeclareGoodsDateDTO>>() {
+            }));
             request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());
             request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
             request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
@@ -167,8 +175,12 @@ public class SyncDataServiceImpl implements SyncDataService {
             request.setShopInteriorPhoto(getUrlList(acceptanceInfoDO.getShopInteriorPhoto()));
 
             request.setShopLocationScreenshots(getUrl(acceptanceInfoDO.getShopLocationScreenshots()));
-            request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile());
+        }
-            request.setKsAccount(acceptanceInfoDO.getKsAccount());
+        if (dyPlatformBuildDO != null) {
+            request.setVerificationMobile(dyPlatformBuildDO.getDyMobile());
+        }
+        if (ksPlatformBuildDO != null) {
+            request.setKsAccount(ksPlatformBuildDO.getKsAccount());
         }
         if (buildInformationDO != null) {
             request.setBusinessHours(buildInformationDO.getBusinessHours());
@@ -219,7 +231,7 @@ public class SyncDataServiceImpl implements SyncDataService {
             request.setShopProvince(pointInfo.getProvince());
             request.setShopCity(pointInfo.getCity());
         }
-        log.info("/pushData 数据 ：{}",JSONObject.toJSONString(request));
+        log.info("/pushData 数据 ：{}", JSONObject.toJSONString(request));
         return request;
     }
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java

@@ -212,6 +212,22 @@ public class DeskController {
         LoginUserInfo userInfo = CurrentUserHolder.getUser();
         return ResponseResult.success(deskService.measurePendingList(pageNumber,pageSize,userInfo));
     }
+
+    @ApiOperation("待处理-营业执照")
+    @GetMapping("/businessLicensePendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                                   @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo));
+    }
+
+    @ApiOperation("待处理-食品许可证")
+    @GetMapping("/foodLicensePendingList")
+    public ResponseResult<PageInfo<PreparationCommonPendingVO>> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
+                                                                                           @RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
+        LoginUserInfo userInfo = CurrentUserHolder.getUser();
+        return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo));
+    }
     @ApiOperation("待处理-京东外卖")
     @GetMapping("/JingDongPendingList")
     public ResponseResult<PageInfo<PreparationCommonPendingVO>> JingDongPendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java

@@ -190,5 +190,16 @@ public class LineInfoController {
     public ResponseResult<Boolean> hasLineRegion(@RequestParam("lineId")Long lineId) {
         return ResponseResult.success(lineService.hasRegionId(lineId));
     }
+    @ApiOperation("获取ai模块是否展示，true展示false不展示")
+    @GetMapping("/getAiModule")
+    public ResponseResult<Boolean> getAiModule() {
+        return ResponseResult.success(lineService.getAiModule());
+    }
+
+    @ApiOperation("设置ai模块是否展示，true展示false不展示")
+    @GetMapping("/setAiModule")
+    public ResponseResult<Boolean> setAiModule(@RequestParam("flag") Boolean flag) {
+        return ResponseResult.success(lineService.setAiModule(flag));
+    }
 
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java

@@ -2,19 +2,21 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.request.LicenseListRequest;
+import com.cool.store.request.license.BusinessLicenseRequest;
+import com.cool.store.request.license.FoodLicenseRequest;
 import com.cool.store.response.LicenseListResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.SubmitLicenseResponse;
 import com.cool.store.service.ApplyLicenseService;
+import com.cool.store.vo.PartnerUserInfoVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -60,4 +62,22 @@ public class PCApplyLicenseController {
         LoginUserInfo user = CurrentUserHolder.getUser();
         return ResponseResult.success(applyLicenseService.licenseExamine(shopId, status, result, user));
     }
+
+
+    @ApiOperation("证照办理提交-营业执照")
+    @PostMapping("/submitBusinessLicense")
+    public ResponseResult submitBusinessLicense(@RequestBody @Validated BusinessLicenseRequest request) {
+        PartnerUserInfoVO user = PartnerUserHolder.getUser();
+        return ResponseResult.success(applyLicenseService.submitBusinessLicense(request,user));
+    }
+
+
+    @ApiOperation("证照办理提交-食品许可证")
+    @PostMapping("/submitFoodLicense")
+    public ResponseResult submitFoodLicense(@RequestBody FoodLicenseRequest request) {
+        PartnerUserInfoVO user = PartnerUserHolder.getUser();
+        return ResponseResult.success(applyLicenseService.submitFoodLicense(request,user));
+    }
+
+
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java

@@ -0,0 +1,51 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.entity.BankdocDO;
+import com.cool.store.entity.BanktypeDO;
+import com.cool.store.request.BankRequest;
+import com.cool.store.request.BranchBankPageRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.BankService;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Fun Li 2023/8/10 14:20
+ * @version 1.0
+ */
+@RestController
+@RequestMapping("/pc/bank")
+@Api(tags = "PC银行信息")
+@Slf4j
+public class PCBankController {
+
+    @Autowired
+    private BankService bankService;
+
+    @ApiOperation("银行类型")
+    @GetMapping("/listBank")
+    public ResponseResult<List<BanktypeDO>> listBank() {
+        List<BanktypeDO> result = bankService.listBank();
+        return ResponseResult.success(result);
+    }
+
+    @ApiOperation("添加银行")
+    @PostMapping("/addBank")
+    public ResponseResult<Boolean> listBank(@RequestBody(required = true) BankRequest bankRequest) {
+        return ResponseResult.success( bankService.addBank(bankRequest.getName()));
+    }
+
+    @ApiOperation("支行列表查询")
+    @PostMapping("/listBranchBank")
+    public ResponseResult<PageInfo<BankdocDO>> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) {
+        return ResponseResult.success(bankService.listBranchBank(request));
+    }
+
+}

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java

@@ -1,14 +1,13 @@
 package com.cool.store.controller.webb;
 
+import com.cool.store.request.BuildInformationRequest;
 import com.cool.store.response.BuildInformationResponse;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.BuildInformationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -31,4 +30,16 @@ public class PCBuildInformationController {
         return ResponseResult.success(buildInformationService.getBuildInformation(shopId));
     }
 
+    @ApiOperation("提交/修改")
+    @PostMapping("/submitOrUpdate")
+    public ResponseResult<Integer> submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) {
+        return ResponseResult.success(buildInformationService.submitOrUpdate(request));
+    }
+
+    @ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟")
+    @GetMapping("/getJoinType")
+    public ResponseResult<Integer> getJoinType(@RequestParam(value = "lineId", required = true) Long lineId) {
+        return ResponseResult.success(buildInformationService.getJoinType(lineId));
+    }
+
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java

@@ -44,4 +44,12 @@ public class PCLinePayController {
         return ResponseResult.success(linePayService.getAmount(lineId));
     }
 
+    @ApiOperation("缴纳意向金/加盟费")
+    @PostMapping("/submitPayInfo")
+    public ResponseResult<Long> submitPayInfo(@RequestBody LinePaySubmitRequest request){
+        PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser();
+        return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser));
+    }
+
+
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOcrController.java

@@ -1,8 +1,14 @@
 package com.cool.store.controller.webb;
 
 import com.cool.store.dto.ocr.InvoiceDTO;
+import com.cool.store.enums.ErrorCodeEnum;
+import com.cool.store.enums.IDCardSideEnum;
+import com.cool.store.exception.ServiceException;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.AliyunService;
+import com.cool.store.vo.BusinessLicenseInfoVO;
+import com.cool.store.vo.FoodLicenseVO;
+import com.cool.store.vo.IdentityCardInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +40,37 @@ public class PCOcrController {
         return ResponseResult.success(aliyunService.getRecognizeInvoiceWithOptions(imageUrl));
     }
 
+    @GetMapping(path = "/getBusinessLicenseInfo")
+    @ApiOperation("根据营业证照解析获取数据")
+    public ResponseResult<BusinessLicenseInfoVO> getBusinessLicenseInfo(@RequestParam(value = "imageUrl")String imageUrl){
+        try {
+            BusinessLicenseInfoVO businessLicenseInfo = aliyunService.getBusinessLicenseInfo(imageUrl);
+            return ResponseResult.success(businessLicenseInfo);
+        } catch (Exception e) {
+            throw new ServiceException(ErrorCodeEnum.BUSINESS_LICENSE_PARSE_FAIL);
+        }
+    }
 
+    @GetMapping(path = "/getFoodBusinessLicense")
+    @ApiOperation("根据食营证照解析获取数据")
+    public ResponseResult<FoodLicenseVO> getFoodLicense(@RequestParam(value = "imageUrl")String imageUrl){
+        try {
+            FoodLicenseVO businessLicenseInfo = aliyunService.getFoodLicense(imageUrl);
+            return ResponseResult.success(businessLicenseInfo);
+        } catch (Exception e) {
+            throw new ServiceException(ErrorCodeEnum.FOOD_BUSINESS_LICENSE_PARSE_FAIL);
+        }
+    }
+    @GetMapping(path = "/getIdentityCardInfo")
+    @ApiOperation("根据身份证正面解析获取数据")
+    public ResponseResult<IdentityCardInfoVO> getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl,
+                                                                  @RequestParam("side") IDCardSideEnum sideEnum){
+        try {
+            IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, sideEnum);
+            return ResponseResult.success(identityCardInfo);
+        } catch (Exception e) {
+            throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);
+        }
+    }
 
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java

@@ -152,4 +152,10 @@ public class PCShopController {
                                                      @RequestParam("subStage")Integer subStage) {
         return ResponseResult.success(shopService.getSubStageHandle(shopId,subStage));
     }
+
+    @ApiOperation("获取店铺所属品牌")
+    @GetMapping("/getFranchiseBrandName")
+    public ResponseResult<String> getFranchiseBrandName(@RequestParam(name = "shopId")Long shopId) {
+        return ResponseResult.success(shopService.getFranchiseBrandName(shopId));
+    }
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/LineController.java

@@ -80,6 +80,18 @@ public class LineController {
     public ResponseResult<PageInfo<UserDTO>> getAllUser(@RequestBody GetUserDTO dto) {
         return ResponseResult.success(userAuthMappingService.getAllUser(dto.getKeyword(),dto.getPageNum(),dto.getPageSize()));
     }
+    @ApiOperation("获取ai模块是否展示，true展示false不展示")
+    @GetMapping("/getAiModule")
+    public ResponseResult<Boolean> getAiModule() {
+        return ResponseResult.success(lineService.getAiModule());
+    }
+
+    @ApiOperation("设置ai模块是否展示，true展示false不展示")
+    @GetMapping("/setAiModule")
+    public ResponseResult<Boolean> setAiModule(@RequestParam("flag") Boolean flag) {
+        return ResponseResult.success(lineService.setAiModule(flag));
+    }
+
 
 
 }