fix some bug

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

@@ -31,10 +31,13 @@ public class StoreCombinationMapperImpl {
         String sql = " SELECT msc.product_id " +
                 " FROM m_store_flash_activity msfa " +
                 " LEFT JOIN m_store_combination msc ON msfa.id = msc.activity_id " +
-                " WHERE msfa.active_state != 2 " +
-                " AND msc.product_id IN (${productIds})" +
-                " AND msfa.id != #{activityId} " +
-                " GROUP BY msc.product_id ";
+                " WHERE 1 = 1 " +
+                " AND msfa.active_state != 2 " +
+                " 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() ";
         return sql;
     }