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

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -770,19 +770,19 @@ public class StoreInfoController {
     @ApiOperation(value = "AI服务-门头识别")
     @ApiOperationSupport(order = 16)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "storeId", value = "门店id", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "storeId", value = "门店用户id", dataType = "String", paramType = "query", required = true),
             @ApiImplicitParam(name = "imageUrl", value = "图片URL", dataType = "String", paramType = "query", required = true)
     })
     @GetMapping("/getStoreOcrData")
-    public R<Map<String, Object>> getStoreOcrData(@RequestParam("storeId") String storeId,
+    public R<Map<String, Object>> getStoreOcrData(@RequestParam("storeId") String storeUserId,
                                              @RequestParam("imageUrl") String imageUrl) {
-        log.info("StoreInfoController.getStoreOcrData?storeId={},imageUrl={}", storeId, imageUrl);
-        if (storeId == null || storeId.trim().isEmpty() || imageUrl == null || imageUrl.trim().isEmpty()) {
+        log.info("StoreInfoController.getStoreOcrData?storeId={},imageUrl={}", storeUserId, imageUrl);
+        if (storeUserId == null || storeUserId.trim().isEmpty() || imageUrl == null || imageUrl.trim().isEmpty()) {
             return R.fail("门店ID与图片URL不能为空");
         }
         Map<String, Object> ocrData = null;
         try {
-            ocrData = storeInfoService.getStoreOcrData(storeId, imageUrl);
+            ocrData = storeInfoService.getStoreOcrData(storeUserId, imageUrl);
         } catch (Exception e) {
             return R.fail("未查询到OCR识别数据");
         }

alien-store/src/main/java/shop/alien/store/service/StoreInfoService.java

@@ -294,11 +294,11 @@ public interface StoreInfoService extends IService<StoreInfo> {
     /**
      * 根据门店及图片地址查询最新OCR识别数据
      *
-     * @param storeId  门店ID
+     * @param storeUserId  门店ID
      * @param imageUrl 图片URL
      * @return OCR识别记录
      */
-    Map<String, Object> getStoreOcrData(String storeId, String imageUrl);
+    Map<String, Object> getStoreOcrData(String storeUserId, String imageUrl);
 
     /**
      * 查询四种类型店铺（酒吧、ktv、洗浴汗蒸、按摩足浴）并按距离筛选

alien-store/src/main/java/shop/alien/store/service/impl/StoreInfoServiceImpl.java

@@ -3445,10 +3445,10 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     }
 
     @Override
-    public Map<String, Object> getStoreOcrData(String storeId, String imageUrl) {
+    public Map<String, Object> getStoreOcrData(String storeUserId, String imageUrl) {
         Map<String, Object> map = new HashMap<>();
         LambdaQueryWrapper<OcrImageUpload> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OcrImageUpload::getStoreId, storeId)
+        queryWrapper.eq(OcrImageUpload::getStoreUserId, storeUserId)
                 .eq(OcrImageUpload::getOcrType, OcrTypeEnum.BUSINESS_LICENSE.getCode());
         OcrImageUpload ocrImageUploads = ocrImageUploadMapper.selectOne(queryWrapper);
         if(ocrImageUploads== null){