fix

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

@@ -36,15 +36,12 @@ public enum FranchiseBrandEnum {
         if (StringUtils.isBlank(code)){
             return null;
         }
-        List<Integer> integerList = Arrays.stream(code.split(","))
+        int i = Integer.parseInt(code);
-                .map(Integer::parseInt)
-                .collect(Collectors.toList());
-        StringBuffer stringBuffer = new StringBuffer();
         for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
-            if (integerList.contains(e.getCode())) {
+            if (i == e.getCode()) {
-                stringBuffer.append(e.getDesc()).append(",");
+                return e.getDesc();
             }
         }
-        return stringBuffer.toString();
+        return null;
     }
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/ShopNameAndCodeDTO.java

@@ -0,0 +1,20 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/09/13:42
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ShopNameAndCodeDTO {
+
+    @ApiModelProperty("店铺名称")
+    private String shopName;
+
+    @ApiModelProperty("店铺编码")
+    private String shopCode;
+}

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

@@ -0,0 +1,23 @@
+package com.cool.store.response;
+
+import com.cool.store.dto.ShopNameAndCodeDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/09/13:43
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ShopResponse {
+
+    @ApiModelProperty(value = "当前店铺信息")
+    private ShopNameAndCodeDTO currentShop;
+
+    @ApiModelProperty(value = "所有店铺信息")
+    private List<ShopNameAndCodeDTO> shopList;
+}

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

@@ -6,6 +6,7 @@ import com.cool.store.request.*;
 import com.cool.store.response.BranchShopDetailResponse;
 import com.cool.store.response.BranchShopResponse;
 import com.cool.store.response.MiniShopsResponse;
+import com.cool.store.response.ShopResponse;
 import com.cool.store.vo.shop.MiniShopPageVO;
 import com.cool.store.vo.shop.ShopStageInfoVO;
 import com.cool.store.vo.shop.StageShopCountVO;
@@ -106,4 +107,6 @@ public interface ShopService {
     Boolean dataHandler(Long shopId);
 
     List<MiniShopsResponse> getShopListSuccessOpen(Long lineId);
+
+    ShopResponse  getShopNameAndCode(Long shopId,Long lineId);
 }

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

@@ -6,6 +6,7 @@ import com.cool.store.dao.*;
 import com.cool.store.dto.Preparation.PreparationDTO;
 import com.cool.store.dto.Preparation.ScheduleDTO;
 import com.cool.store.dto.RegionNode;
+import com.cool.store.dto.ShopNameAndCodeDTO;
 import com.cool.store.dto.openPreparation.PlanLineDTO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
@@ -17,6 +18,7 @@ import com.cool.store.request.*;
 import com.cool.store.response.BranchShopDetailResponse;
 import com.cool.store.response.BranchShopResponse;
 import com.cool.store.response.MiniShopsResponse;
+import com.cool.store.response.ShopResponse;
 import com.cool.store.service.*;
 import com.cool.store.utils.NumberConverter;
 import com.cool.store.utils.RandomEightCharCodeUtils;
@@ -573,5 +575,37 @@ public class ShopServiceImpl implements ShopService {
         return shopInfoDAO.getShopListSuccessOpen(eid, lineId);
     }
 
+    @Override
+    public ShopResponse getShopNameAndCode(Long shopId, Long lineId) {
+        boolean flag = false;
+        ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
+        ShopResponse response = new ShopResponse();
+        if (Objects.nonNull(shopInfo)) {
+            ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO();
+            currentShop.setShopName(shopInfo.getShopName());
+            currentShop.setShopCode(shopInfo.getShopCode());
+            response.setCurrentShop(currentShop);
+            flag = true;
+        }
+        List<ShopInfoDO> shopList = shopInfoDAO.getShopListByRegion(lineId, null, null);
+        List<ShopNameAndCodeDTO> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(shopList)) {
+            for (ShopInfoDO shopInfoDO : shopList) {
+                ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO();
+                dto.setShopName(shopInfoDO.getShopName());
+                dto.setShopCode(shopInfoDO.getShopCode());
+                list.add(dto);
+            }
+            response.setShopList(list);
+            flag = true;
+        }
+        if (flag) {
+            return response;
+        } else {
+            return null;
+        }
+
+    }
+
 
 }

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

@@ -1,5 +1,8 @@
 package com.cool.store.service.impl;
 
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.cool.store.dao.*;
 import com.cool.store.entity.*;
 import com.cool.store.enums.DownSystemTypeEnum;
@@ -10,7 +13,9 @@ import com.cool.store.mapper.ApplyLicenseMapper;
 import com.cool.store.mapper.SignFranchiseMapper;
 import com.cool.store.request.ZxjpApiRequest;
 import com.cool.store.service.SyncDataService;
+import com.cool.store.utils.poi.StringUtils;
 import com.cool.store.utils.poi.constant.Constants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +31,7 @@ import java.util.stream.Collectors;
  * @Version 1.0
  * @注释:
  */
+@Slf4j
 @Service
 public class SyncDataServiceImpl implements SyncDataService {
 
@@ -106,7 +112,10 @@ public class SyncDataServiceImpl implements SyncDataService {
         request.setCrmAccount(lineInfoDO.getMobile());
         request.setDownstreamSystemPassword(hyPartnerUserInfoDO.getDownstreamSystemPassword());
         request.setDownstreamSystemSalt(hyPartnerUserInfoDO.getDownstreamSystemSalting());
-        request.setCrmAccount(lineInfoDO.getMobile());
+        if (StringUtils.isNotBlank(shopInfo.getFranchiseBrand())) {
+            String[] split = shopInfo.getFranchiseBrand().split(Constants.COMMA);
+            request.setFranchiseBrand(split[0]);
+        }
         request.setFxyAccount(lineInfoDO.getMobile());
         request.setXzjAccount(shopInfo.getShopCode());
         request.setYlsAccount(shopInfo.getShopCode());
@@ -117,7 +126,7 @@ public class SyncDataServiceImpl implements SyncDataService {
         if (systemType.equals(DownSystemTypeEnum.POS)) {
             if (buildInformationDO != null) {
                 String brand = FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand());
-                request.setDownstreamSystemShopName(brand + "(" + buildInformationDO + ")");
+                request.setDownstreamSystemShopName(brand + "(" + buildInformationDO.getCShopName() + ")");
             }
         }
         if (orderSysInfoDO != null) {
@@ -159,15 +168,27 @@ public class SyncDataServiceImpl implements SyncDataService {
             request.setShopContactName(buildInformationDO.getShopContactName());
             request.setBusinessMobile(buildInformationDO.getBusinessMobile());
             request.setSettlerName(buildInformationDO.getSettlerName());
-            request.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerBankPhotoUrl())) {
-            request.setSettlerBankBackPhotoUrl(buildInformationDO.getSettlerBankBackPhotoUrl());
+                request.setSettlerBankPhotoUrl(getUrl(buildInformationDO.getSettlerBankPhotoUrl()));
+            }
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerBankBackPhotoUrl())) {
+                request.setSettlerBankBackPhotoUrl(getUrl(buildInformationDO.getSettlerBankBackPhotoUrl()));
+            }
             request.setSettlerBankBranchName(buildInformationDO.getSettlerBankName());
             request.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
             request.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
-            request.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerIdCardFront())) {
-            request.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
+                request.setSettlerIdCardFront(getUrl(buildInformationDO.getSettlerIdCardFront()));
-            request.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
+            }
-            request.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerIdCardReverse())) {
+                request.setSettlerIdCardReverse(getUrl(buildInformationDO.getSettlerIdCardReverse()));
+            }
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerInHandBackPicture())) {
+                request.setSettlerInHandBackPicture(getUrl(buildInformationDO.getSettlerInHandBackPicture()));
+            }
+            if (StringUtils.isNotBlank(buildInformationDO.getSettlerInHandFrontPicture())) {
+                request.setSettlerInHandFrontPicture(getUrl(buildInformationDO.getSettlerInHandFrontPicture()));
+            }
             request.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
 
         }
@@ -191,4 +212,23 @@ public class SyncDataServiceImpl implements SyncDataService {
 
         return request;
     }
+
+    private static String getUrl(String json) {
+        if (StringUtils.isBlank(json)) {
+            return null;
+        }
+        try {
+            // 将 JSON 字符串解析为 JSONArray
+            JSONArray jsonArray = JSONArray.parseArray(json);
+
+            // 获取第一个对象
+            JSONObject jsonObject = jsonArray.getJSONObject(0);
+
+            // 提取 "url" 的值
+            return jsonObject.getString("url");
+        } catch (Exception e) {
+            log.info("getUrl error:{},JSON:{}", e.getMessage(), json);
+        }
+        return null;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.request.*;
 import com.cool.store.response.MiniShopsResponse;
 import com.cool.store.response.ResponseResult;
+import com.cool.store.response.ShopResponse;
 import com.cool.store.service.PointService;
 import com.cool.store.service.ShopService;
 import com.cool.store.vo.PartnerUserInfoVO;
@@ -125,4 +126,11 @@ public class MiniShopController {
         request.setLineId(PartnerUserHolder.getUser().getLineId());
         return ResponseResult.success(pointService.getRecommendedOrMyPointList( request));
     }
+
+    @ApiOperation("给bot的门店信息")
+    @GetMapping("/getShopNameAndCode")
+    public ResponseResult<ShopResponse> getShopNameAndCode(@RequestParam("shopId")Long shopId, @RequestParam("lineId")Long lineId) {
+        return ResponseResult.success(shopService.getShopNameAndCode(shopId,lineId));
+    }
+
 }