修改药瓶商品提示，已下架商品，药品。gsp的证书都需要删除

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

@@ -298,12 +298,11 @@ public class FsStoreProductScrmController extends BaseController {
         return R.ok("操作完成");
     }
 
-    @Log(title = "总后台商品协议过期提醒", businessType = BusinessType.OTHERe)
     /**
      * 商品资质信息提示
-     *
      * @return
      */
+    @Log(title = "总后台商品协议过期提醒", businessType = BusinessType.OTHERe)
     @GetMapping("/productNoticeInfo")
     public R getProductNoticeInfo() {
         List<String> productNoticeInfo = fsStoreProductService.getProductNoticeInfo(null);
@@ -313,7 +312,6 @@ public class FsStoreProductScrmController extends BaseController {
         return R.ok().put("code", 0);
     }
 
-
     /**
      * 商品审核日志
      * */

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

@@ -723,10 +723,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE business_end IS NOT NULL
           AND business_end <= DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
           AND is_business_permanent != 1
+        and is_show = 1 and is_audit = 1 and is_drug = 1
         <if test="storeId != null">AND store_id = #{storeId}</if>
-
         UNION ALL
-
         SELECT
             CONCAT(
                     product_name,
@@ -741,10 +740,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE license_end IS NOT NULL
           AND license_end &lt;= DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
           AND is_license_permanent != 1
+        and is_show = 1 and is_audit = 1 and is_drug = 1
         <if test="storeId != null">AND store_id = #{storeId}</if>
-
         UNION ALL
-
         SELECT
             CONCAT(
                     product_name,
@@ -759,23 +757,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE certificate_end IS NOT NULL
           AND certificate_end &lt;= DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
           AND is_certificate_permanent != 1
-        <if test="storeId != null">AND store_id = #{storeId}</if>
-
-        UNION ALL
-        SELECT
-            CONCAT(
-                    product_name,
-                    '商品的',
-                    'GMP/GSP认证证书有效期',
-                    CASE
-                        WHEN gmp_auth_end &lt; CURDATE() THEN '已过期'
-                        ELSE '即将1个月内过期'
-                        END
-                ) AS status_text
-        FROM fs_store_product_scrm
-        WHERE  gmp_auth_end IS NOT NULL
-          AND gmp_auth_end &lt;= DATE_ADD(CURDATE(), INTERVAL 1 MONTH)
-          AND is_gmp_auth_permanent != 1
+            and is_show = 1 and is_audit = 1 and is_drug = 1
         <if test="storeId != null">AND store_id = #{storeId}</if>
     </select>
     <select id="getDrugExportList" resultType="com.fs.hisStore.vo.FsDrugExportVO">