修改营业执照识别返回接口

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreScrmController.java

@@ -112,8 +112,7 @@ public class FsStoreScrmController extends BaseController
     /**
      * 新增或修改时候校验上传的营业执照是否包含药品零售
      */
-    @Log(title = "校验营业执照是否包含药品零售", businessType = BusinessType.INSERT,logParam = {"店铺","校验营业执照是否包含药品零售"},isStoreLog = true)
-    @GetMapping("/businessLicenseCheck")
+   @GetMapping("/businessLicenseCheck")
     public R businessLicenseCheck(String imageUrl){
         return R.ok().put("data", TxOcrClient.isContains(imageUrl, null));
     }

fs-common/src/main/java/com/fs/common/utils/txocr/ContainsResult.java

@@ -33,8 +33,32 @@ public class ContainsResult {
     private String imageUrl;
 
     /**
-     * 营业执照识别结果
+     * 营业执照经营范围识别结果
      */
     private String businessStr;
 
+    /**
+     * 统一社会信用代码
+     */
+    private String RegNum;
+
+    /**
+     * 法人
+     */
+    private String Person;
+
+    /**
+     * 地址
+     */
+    private String Address;
+
+    /**
+     * 有效期
+     */
+    private String Period;
+
+    /**
+     * 注册日期
+     */
+    private String SetDate;
 }

fs-common/src/main/java/com/fs/common/utils/txocr/TxOcrClient.java

@@ -116,6 +116,11 @@ public class TxOcrClient  {
                 result.setKeywords(YPLS);
                 result.setFlag(business.contains(YPLS));
                 result.setMessage(result.getFlag()?"包含":"不包含");
+                result.setPerson(resp.getPerson());
+                result.setRegNum(resp.getRegNum());
+                result.setAddress(resp.getAddress());
+                result.setPeriod(resp.getPeriod());
+                result.setSetDate(resp.getSetDate());
                 return result;
             }
             if(StringUtils.isNotEmpty(keywords) && StringUtils.isEmpty(business)){
@@ -123,6 +128,11 @@ public class TxOcrClient  {
                 result.setBusinessStr(business);
                 result.setFlag(business.contains(keywords));
                 result.setMessage(result.getFlag()?"包含":"不包含");
+                result.setPerson(resp.getPerson());
+                result.setRegNum(resp.getRegNum());
+                result.setAddress(resp.getAddress());
+                result.setPeriod(resp.getPeriod());
+                result.setSetDate(resp.getSetDate());
                 return result;
             }
         } catch (TencentCloudSDKException e) {

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreScrm.java

@@ -461,6 +461,11 @@ public class FsStoreScrm extends BaseEntity {
      * **/
     private LocalDate qualificationUpdateTime;
 
+    /**
+     * 资质更新剩余天数
+     **/
+    private Integer daysDiff;
+
     //标题名称
     private String titleNameOne;
     private String titleNameTwo;

fs-service/src/main/resources/mapper/hisStore/FsStoreScrmMapper.xml

@@ -928,6 +928,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         other_special_qualification_start,other_special_qualification_end,is_business_license_permanent,store_seq,merchant_id,business_code,
         drug_code,medical_device1_code,medical_device2_code,medical_device3_code,food_code,medical_code,other_special_qualification_code,
         quality_assurance_agreement_code,settlement_agreement_code,title_name_one,title_Name_two,title_Name_three,
+        qualification_update_time,
+        DATEDIFF(qualification_update_time, NOW()) AS days_diff,
         ( SELECT COUNT(*) FROM fs_store_product_scrm sps WHERE sps.store_id = ss.store_id ) AS productCount
         FROM
         fs_store_scrm ss

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreProductScrmController.java

@@ -89,6 +89,8 @@ public class FsStoreProductScrmController extends BaseController
 
     /**
      * 查询商品列表
+     * @param fsStoreProduct
+     * @return
      */
     @GetMapping("/list")
     public TableDataInfo list(FsStoreProductScrm fsStoreProduct)

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreScrmController.java

@@ -46,7 +46,6 @@ public class FsStoreScrmController extends BaseController {
     /**
      * 新增或修改时候校验上传的营业执照是否包含药品零售
      */
-    @Log(title = "店铺管理", businessType = BusinessType.AUDIT, logParam = {"店铺","校验营业执照是否包含药品零售"},isStoreLog = true)
     @GetMapping("/businessLicenseCheck")
     public R businessLicenseCheck(String imageUrl){
         return R.ok().put("data", TxOcrClient.isContains(imageUrl, null));