fix some bug

mall-service/src/main/java/com/txz/mall/dao/impl/StoreCombinationMapperImpl.java

@@ -36,8 +36,9 @@ public class StoreCombinationMapperImpl {
                 " AND msfa.is_delete = 0 " +
                 " AND msc.is_delete = 0 " +
                 " AND msc.product_id IN (${productIds}) " +
-                " AND msfa.id != 30 " +
-                "GROUP BY msc.product_id AND msfa.start_time >= NOW() AND msfa.end_time <= NOW() ";
+                " AND msfa.id != #{activityId} " +
+                " AND (msfa.start_time <= NOW() OR msfa.end_time >= NOW()) " +
+                " GROUP BY msc.product_id ";
         return sql;
     }