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

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

@@ -90,7 +90,6 @@ public class FsStoreProductScrmController extends BaseController {
      * 判断该药店的经营许可证是否允许上架该商品
      * @param fsStoreProduct
      */
-    @Log(title = "商品管理", businessType = BusinessType.AUDIT, isStoreLog = true, logParam = {"商品", "判断该药店的经营许可证是否允许上架该商品"})
     @PostMapping("/checkStoreDrugLicense")
     public R checkStoreDrugLicense(@RequestBody FsStoreProductAddEditParam fsStoreProduct) {
         return R.ok().put("data", fsStoreProductService.checkStoreDrugLicense(fsStoreProduct.getStoreId(), fsStoreProduct.getCateId()));

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-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -306,7 +306,7 @@ public class FsUserController extends BaseController
     public R darkRoomCompanyList(FsUserPageListParam param) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
 
-        if(!loginUser.getPermissions().stream().anyMatch(permission -> permission.equals("users:user:darkRoomCompanyList"))){
+        if(!loginUser.getPermissions().stream().anyMatch(permission -> permission.equals("users:user:darkRoomCompanyList")) && !loginUser.getPermissions().contains("*:*:*")){
             return R.error("操作失败，权限不足！");
         }
 

fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -53,7 +53,7 @@ public class IpadSendServer {
     private void sendMiniProgram(BaseVo vo, QwSopCourseFinishTempSetting.Setting content, Map<String, FsCoursePlaySourceConfig> miniMap, Long companyId) {
         String appid = content.getMiniprogramAppid();
         if(companyId != null && content.getMiniType() != null){
-            log.error("1.打印企業信息------------------》:{}",companyId);
+            log.error("1.打印企业信息------------------》:{}",companyId);
             List<CompanyMiniapp> list = companyMiniappService.list(new QueryWrapper<CompanyMiniapp>().eq("company_id", companyId));
             log.error("2.打印企小程序信息------------------》:{}",companyId);
             List<CompanyMiniapp> collect = list.stream().filter(e -> e.getType().equals(content.getMiniType())).collect(Collectors.toList());
@@ -62,9 +62,9 @@ public class IpadSendServer {
             }
             if(!vo.isRoom()){
              try {
-                 log.error("3.打印查詢數據-------------------》{}",vo.getExId());
+                 log.error("3.打印查询id信息-------------------》{}",vo.getExId());
                  QwExternalContact qwExternalContact = qwExternalContactMapper.selectOne(new LambdaQueryWrapper<QwExternalContact>().eq(QwExternalContact::getQwUserId,vo.getQwUserId()).eq(QwExternalContact::getExternalUserId,vo.getExId()));
-                 log.error("4.打印外部聯係人ID-------------------》{}",qwExternalContact.getId());
+                 log.error("4.打印外部联系人ID-------------------》{}",qwExternalContact.getId());
                  LocalDateTime createTime = qwExternalContact.getCreateTime() == null ? LocalDateTime.now() : DateUtil.dateToLocalDateTime(qwExternalContact.getCreateTime());
                  LocalDateTime lastTime = LocalDateTime.of(2025, 11, 6, 23, 59, 59);
                  int listIndex = createTime.isAfter(lastTime) ? 1 : 0 ;

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/java/com/fs/hisStore/vo/FsStoreDetailsScrmVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -278,4 +279,9 @@ public class FsStoreDetailsScrmVo extends BaseEntity
      **/
     private Byte isMedicalDevice1ExpiryPermanent;
 
+    /**
+     * 资质上传到计时
+     **/
+    private Date qualificationUpdateTime;
+
 }

fs-service/src/main/resources/application-dev-yjb.yml

@@ -33,7 +33,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://nj-cdb-6306xy90.sql.tencentcdb.com:27077/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://nj-cdb-22nvjajz.sql.tencentcdb.com:29237/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz147..
                 # 初始连接数
@@ -81,7 +81,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                  url: jdbc:mysql://nj-cdb-4tbz4oqv.sql.tencentcdb.com:25247/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://nj-cdb-22nvjajz.sql.tencentcdb.com:29237/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: root
                   password: Ylrz147..
                 # 初始连接数

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));