Prechádzať zdrojové kódy

修复非处方接口,app端增加接口对营业执照检查

Guos 1 týždeň pred
rodič
commit
972e0147f3

+ 9 - 6
fs-service/src/main/java/com/fs/hisStore/service/categoryVal/CommonCheck.java

@@ -40,15 +40,18 @@ public class CommonCheck extends AbstractHandler {
      */
     public ContainsResult check(String cateName, Long storeId, String medicalDeviceCode) {
         FsStoreScrm fsStoreScrm = fsStoreScrmService.selectFsStoreByStoreId(storeId);
-
-        //通过店铺id获取上传的药品经营许可证。
-        String drugLicenseUrl = fsStoreScrm.getDrugLicense();
-
-        FsStoreScrmOcr fsStoreScrmOcr = fsStoreScrmOcrMapper.selectByIdAndUrl(storeId, drugLicenseUrl, null);
         //没有搜索到就调用一次识别
         ContainsResult result = new ContainsResult();
         result.setKeywords(cateName);
-
+        if(cateName.contains("非处方") && fsStoreScrm.getBusinessScope().contains(cateName)){
+            result.setFlag(true);
+            result.setMessage("包含所属!");
+            result.setBusinessStr(fsStoreScrm.getBusinessScope());
+            return result;
+        }
+        //通过店铺id获取上传的药品经营许可证。
+        String drugLicenseUrl = fsStoreScrm.getDrugLicense();
+        FsStoreScrmOcr fsStoreScrmOcr = fsStoreScrmOcrMapper.selectByIdAndUrl(storeId, drugLicenseUrl, null);
         if(ObjectUtil.isEmpty(fsStoreScrmOcr)){
             String ocrResult = TxOcrClient.ExtractDocBasic(drugLicenseUrl);
             if(null != ocrResult){

+ 31 - 0
fs-user-app/src/main/java/com/fs/app/controller/store/StoreInfoCheckController.java

@@ -0,0 +1,31 @@
+package com.fs.app.controller.store;
+
+import com.fs.common.core.domain.R;
+import com.fs.common.utils.txocr.TxOcrClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description: 新加一个controller主要用于验证
+ * @author: Guos
+ * @time: 2025/12/1 上午10:46
+ */
+@RestController
+@RequestMapping(value="/store/app/storeAfterSales")
+public class StoreInfoCheckController {
+
+    /**
+     * 新增或修改时候校验上传的营业执照是否包含药品零售
+     * @param imageUrl 图片url
+     */
+    @GetMapping("/businessLicenseCheck")
+    public R businessLicenseCheck(String imageUrl){
+        return R.ok().put("data", TxOcrClient.isContains(imageUrl, null));
+    }
+
+
+
+
+
+}