Эх сурвалжийг харах

优化Vsees云存套餐返回

linhaohong 7 сар өмнө
parent
commit
c4642949ca

+ 7 - 4
Controller/CloudStorage.py

@@ -251,10 +251,6 @@ class CloudStorageView(View):
                 else:
                     store_qs = store_qs.exclude(pay_type=5)
 
-                # 判断是否支持微信支付
-                if app_bundle_id == "com.cloudlife.commissionf_a":
-                    store_qs = store_qs.exclude(pay_type=3)
-
                 if uid not in ["VXJ267WU5NZ1S89H111A", "18SM4J9DYWB2AEG1111A",
                                "517J385BNUGP3CPP111A", "5Z1LZLK7D5Y6WKDE111A"] and CONFIG_INFO == CONFIG_TEST:
                     store_qs = store_qs.exclude(id__in=[88, 102])
@@ -289,8 +285,15 @@ class CloudStorageView(View):
                 items_list = list(items)
                 for i in range(len(items_list) - 1, -1, -1):
                     item = items_list[i]
+
+                    # 判断是否支持微信支付
                     pay_type_qs = Pay_Type.objects.filter(store_meal=item['id']).values("id", "payment")
+                    if app_bundle_id == "com.cloudlife.commissionf_a":
+                        pay_type_qs = pay_type_qs.exclude(id=3)
                     item['pay_type'] = list(pay_type_qs)
+                    # 没有支付类型则跳过这个套餐
+                    if not item['pay_type']:
+                        continue
                     item['is_pay_cycle'] = 1 if item['cycle_config_id'] else 0
                     del item['cycle_config_id']
                     # 检查优惠券是否可用,并赋值给 item['isCoupon']