Merge branch 'sit' into uat

alien-entity/src/main/java/shop/alien/entity/store/dto/StoreInfoDto.java

@@ -195,6 +195,9 @@ public class StoreInfoDto {
     @ApiModelProperty(value = "娱乐经营许可证状态")
     private Integer entertainmentLicenceStatus;
 
+    @ApiModelProperty(value = "娱乐经营许可证")
+    private List<String> entertainmentLicenseAddress;
+
     @ApiModelProperty(value = "娱乐经营许可证原因")
     private String entertainmentLicenceReason;
 

alien-job/src/main/java/shop/alien/job/store/AiTagJob.java

@@ -587,5 +587,4 @@ public class AiTagJob {
             this.end_time = end_time;
         }
     }
-
 }

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

@@ -768,6 +768,15 @@ public class StoreInfoController {
     public R<List<StoreCommentVo>> getStoreEvaluateTagsList(@RequestParam("mainId") int mainId) {
         log.info("StoreInfoController.getStoreEvaluateTagsList?mainId={}", mainId);
         List<StoreCommentVo> list = tagsMainMapper.getstoreCommentList(mainId);
+        if(list!=null && list.size()>0){
+            for(int i = 0; i<list.size(); i++){
+                if(list.get(i).getImgId()!=null){
+                    List<String> imgIds = Arrays.asList(list.get(i).getImgId().split(","));
+                    List<StoreImg> storeImgs = storeImgMapper.selectList(new LambdaQueryWrapper<StoreImg>().in(StoreImg::getId, imgIds));
+                    list.get(i).setImgList(storeImgs);
+                }
+            }
+        }
         return R.data(list);
     }
     @ApiOperation(value = "AI服务-门店趣味信息")
@@ -813,19 +822,19 @@ public class StoreInfoController {
     @ApiOperation(value = "AI服务-门头识别")
     @ApiOperationSupport(order = 16)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "storeUserId", value = "门店用户id", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "imageUrl", value = "图片URL", dataType = "String", paramType = "query", required = true)
+            @ApiImplicitParam(name = "imageUrl", value = "图片URL", dataType = "String", paramType = "query", required = true),
+            @ApiImplicitParam(name = "merchantName", value = "门店名称", dataType = "String", paramType = "query", required = true)
     })
     @GetMapping("/getStoreOcrData")
-    public R<Map<String, Object>> getStoreOcrData(@RequestParam("storeUserId") String storeUserId,
-                                                  @RequestParam("imageUrl") String imageUrl) {
-        log.info("StoreInfoController.getStoreOcrData?storeId={},imageUrl={}", storeUserId, imageUrl);
-        if (storeUserId == null || storeUserId.trim().isEmpty() || imageUrl == null || imageUrl.trim().isEmpty()) {
-            return R.fail("门店ID与图片URL不能为空");
+    public R<Map<String, Object>> getStoreOcrData(@RequestParam("imageUrl") String imageUrl,
+                                                  @RequestParam("merchantName") String merchantName) {
+        log.info("StoreInfoController.getStoreOcrData?imageUrl={},merchantName{}", imageUrl, merchantName);
+        if (merchantName == null || merchantName.trim().isEmpty() || imageUrl == null || imageUrl.trim().isEmpty()) {
+            return R.fail("门店名称与图片URL不能为空");
         }
         Map<String, Object> ocrData = null;
         try {
-            ocrData = storeInfoService.getStoreOcrData(storeUserId, imageUrl);
+            ocrData = storeInfoService.getStoreOcrData(imageUrl, merchantName);
         } catch (Exception e) {
             return R.fail("未查询到OCR识别数据");
         }
@@ -844,8 +853,6 @@ public class StoreInfoController {
         StoreInfoVo storeDetail = storeInfoService.getClientStoreDetail(id, userId, jingdu, weidu);
         return R.data(storeDetail);
     }
-
-
     /**
      * 查询四种类型店铺（酒吧、ktv、洗浴汗蒸、按摩足浴）并按距离筛选
      *

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

@@ -293,11 +293,10 @@ public interface StoreInfoService extends IService<StoreInfo> {
     /**
      * 根据门店及图片地址查询最新OCR识别数据
      *
-     * @param storeUserId  门店ID
      * @param imageUrl 图片URL
      * @return OCR识别记录
      */
-    Map<String, Object> getStoreOcrData(String storeUserId, String imageUrl);
+    Map<String, Object> getStoreOcrData(String imageUrl, String merchantName);
 
     void aiApproveStoreInfo(AiApproveStoreInfo aiApproveStoreInfo);
 

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

@@ -1516,11 +1516,11 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         }
         // TODO 之后修改********** 正常OcrType由前端传存储ocr表要加新字段。传参要由前端传。
         // 查询并设置各类证件OCR信息
-        result.setJyxkz(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "娱乐", true));
+        result.setJyxkz(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "营业执照", true));
         result.setIdcardFace(convertOcrResultToJson(storeUser.getId(), "ID_CARD", "face", true));
         result.setIdcardBack(convertOcrResultToJson(storeUser.getId(), "ID_CARD", "back", true));
         result.setFoodLicence(convertOcrResultToJson(storeUser.getId(), "FOOD_MANAGE_LICENSE", null, true));
-        result.setEntertainmentLicence(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "营业执照", false));
+        result.setEntertainmentLicence(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "娱乐", false));
 
         return result;
     }
@@ -2647,15 +2647,8 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
     }
 
     @Override
-    public Map<String, Object> getStoreOcrData(String storeUserId, String imageUrl) {
+    public Map<String, Object> getStoreOcrData(String imageUrl, String merchantName) {
         Map<String, Object> map = new HashMap<>();
-        LambdaQueryWrapper<OcrImageUpload> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(OcrImageUpload::getStoreUserId, storeUserId)
-                .eq(OcrImageUpload::getOcrType, OcrTypeEnum.BUSINESS_LICENSE.getCode());
-        OcrImageUpload ocrImageUploads = ocrImageUploadMapper.selectOne(queryWrapper);
-        if(ocrImageUploads== null){
-            throw new RuntimeException("未找到OCI识别数据！");
-        }
         String accessToken = aiAuthTokenUtil.getAccessToken();
 
         HttpHeaders aiHeaders = new HttpHeaders();
@@ -2665,9 +2658,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         List<String> imageUrls = new ArrayList<>();
         imageUrls.add(imageUrl);
         jsonBody.put("image_urls", imageUrls);
-        String ocrResult = ocrImageUploads.getOcrResult();
-        JSONObject jsonObject = JSONObject.parseObject(ocrResult);
-        jsonBody.put("merchant_name", jsonObject.get("companyName"));
+        jsonBody.put("merchant_name", merchantName);
 
         HttpEntity<Map<String, Object>> request = new HttpEntity<>(jsonBody, aiHeaders);
         ResponseEntity<String> response = null;
@@ -4628,11 +4619,11 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
         }
         // TODO 之后修改********** 正常OcrType由前端传存储ocr表要加新字段。传参要由前端传。
         // 查询并设置各类证件OCR信息
-        result.setJyxkz(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "娱乐", true));
+        result.setJyxkz(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "营业执照", true));
         result.setIdcardFace(convertOcrResultToJson(storeUser.getId(), "ID_CARD", "face", true));
         result.setIdcardBack(convertOcrResultToJson(storeUser.getId(), "ID_CARD", "back", true));
         result.setFoodLicence(convertOcrResultToJson(storeUser.getId(), "FOOD_MANAGE_LICENSE", null, true));
-        result.setEntertainmentLicence(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "营业执照", false));
+        result.setEntertainmentLicence(convertOcrResultToJson(storeUser.getId(), "BUSINESS_LICENSE", "娱乐", false));
         return result;
     }