|
|
@@ -173,7 +173,7 @@ class CloudStorageView(View):
|
|
|
@staticmethod
|
|
|
def do_commodity_list(request_dict, user_id, response): # 查询套餐列表
|
|
|
"""
|
|
|
- 查询套餐列表
|
|
|
+ 查询云存套餐列表
|
|
|
@param user_id: 用户id
|
|
|
@param request_dict: 请求数据
|
|
|
@request_dict mold: 存储区域类型
|
|
|
@@ -188,6 +188,8 @@ class CloudStorageView(View):
|
|
|
is_ai = request_dict.get('is_ai', 0)
|
|
|
app_type = request_dict.get('app_type', None)
|
|
|
ios_version = request_dict.get('ios_version', "")
|
|
|
+ app_bundle_id = request_dict.get('app_bundle_id', None)
|
|
|
+
|
|
|
if not all([uid]):
|
|
|
return response.json(444)
|
|
|
# 苹果内购,app_type:1 或 app_type:2
|
|
|
@@ -276,8 +278,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']
|
