美博会链接类型判断

src/main/java/com/caimei365/commodity/utils/AppletsLinkUtil.java

@@ -125,10 +125,11 @@ public class AppletsLinkUtil {
      */
     public static final Pattern pattern38 = Pattern.compile("/cmpage/info-5-301");
     /**
-     * 23活动专题
+     * 23活动专题(云上美博会)
      */
     public static final Pattern pattern39 = Pattern.compile("/cmpage/info-6");
     public static final Pattern pattern39_1 = Pattern.compile("/activity/activityTopic");
+    public static final Pattern pattern39_2 = Pattern.compile("/cmpage/info-7");
     /**
      * 24美博会优惠券页
      */
@@ -185,7 +186,7 @@ public class AppletsLinkUtil {
                 return 20;
             } else if (pattern37.matcher(link).find()) {
                 return 21;
-            } else if (pattern39.matcher(link).find() || pattern39_1.matcher(link).find()) {
+            } else if (pattern39.matcher(link).find() || pattern39_1.matcher(link).find() || pattern39_2.matcher(link).find()) {
                 return 23;
             } else if (pattern40.matcher(link).find()) {
                 return 24;

src/main/resources/mapper/ShopMapper.xml

@@ -546,10 +546,10 @@
     </select>
     <select id="getPcBeautyStatusById" resultType="java.lang.Integer">
         select i.productId from new_page_floor_image i left join cm_page_centre c on i.centreId = c.id left join cm_page p on c.pageId = p.id
-        where i.productId = #{productId} and p.type = 7 and c.enabledStatus = 1 and p.enabledStatus = 1 limit 1
+        where i.productId = #{productId} and i.pcStatus = 1 and p.type = 7 and c.enabledStatus = 1 and p.enabledStatus = 1 limit 1
     </select>
     <select id="getAppletsBeautyStatusById" resultType="java.lang.Integer">
         select i.productId from new_page_floor_image i left join cm_page_centre c on i.centreId = c.id left join cm_page p on c.pageId = p.id
-        where i.productId = #{productId} and p.type = 7 and c.crmEnabledStatus = 1 and p.enabledStatus = 1 limit 1
+        where i.productId = #{productId} and i.appletsStatus = 1  and p.type = 7 and c.crmEnabledStatus = 1 and p.enabledStatus = 1 limit 1
     </select>
 </mapper>