优化，新片的信息从排片当天改为目标日期到排片日期中的全部

ai/utils/show_func.py

@@ -136,14 +136,25 @@ def get_all_movie_hot_info(req_date: str = 'today', show_type: str = 'old', get_
 # 模拟用户设置的新片推荐数量
 def get_new_suggestion(cinema, show_date):
     data = GetData(cinema)
-    movie = data.get_movie_info(show_date, 'new')
+    tomorrow = datetime.datetime.today() + datetime.timedelta(days=-1)
+    show_date_obj = datetime.datetime.strptime(show_date, '%Y-%m-%d')
+    delta = (show_date_obj - tomorrow).days
+    date_list = [datetime.datetime.strftime(tomorrow + datetime.timedelta(days=i), "%Y-%m-%d") for i in
+                 range(0, delta + 2)]
+    print('get_new_suggestion-date_list', date_list)
     new_movie_list = []
-    for m in movie:
+    for date in date_list:
-        new_movie = NewMovieSuggestion.objects.filter(
+        movie = data.get_movie_info(date, 'new')
-            Q(movie_name=m['cinema_movie_cn_name']) & Q(zz_code=cinema.zz_code) & Q(delete_flag=False)).first()
+        for m in movie:
-        if new_movie is not None:
+            print(m['cinema_movie_cn_name'])
-            new_movie_list.append(
+            new_movie = NewMovieSuggestion.objects.filter(
-                f"\t《{m['cinema_movie_cn_name']}》的不同制式版本总计建议排片占比为{new_movie.suggestion}%;")
+                Q(movie_name=m['cinema_movie_cn_name']) & Q(zz_code=cinema.zz_code) & Q(delete_flag=False)).first()
+            if new_movie is not None:
+                if new_movie.suggestion == '0':
+                    text = f"\t《{m['cinema_movie_cn_name']}》建议排一些场次;"
+                else:
+                    text = f"\t《{m['cinema_movie_cn_name']}》的不同制式版本总计建议排片占比为{new_movie.suggestion}%;"
+                new_movie_list.append(text)
     if len(new_movie_list) > 0:
         return '\n'.join(new_movie_list)
     return None
@@ -187,10 +198,11 @@ def get_new_movie(start_date):
 
 # 模拟用户设置的新片推荐数量
 def get_movie_guidance(cinema, show_date):
-    movie_guidance = MovieGuidance.objects.filter(Q(zz_code=cinema.zz_code) & Q(show_date=show_date) & Q(delete_flag=False)).all()
+    movie_guidance = MovieGuidance.objects.filter(
+        Q(zz_code=cinema.zz_code) & Q(show_date=show_date) & Q(delete_flag=False)).all()
     if movie_guidance:
         movie_list = []
         for m in movie_guidance:
             movie_list.append(f"\t《{m.movie_name}》强制排片占比为{m.guidance}%;")
         return '\n'.join(movie_list)
-    return '\t无'
+    return '\t无'