|
@@ -120,6 +120,7 @@ class serveManagement(View):
|
|
|
return self.deleteDevicePackage(userID, request_dict, response)
|
|
|
elif operation == 'experiencereset': # 重置设备云存体验
|
|
|
return self.do_experience_reset(request_dict, userID, response)
|
|
|
+ # 云存用户信息
|
|
|
elif operation == 'getCloudUserList': # 获取云存用户信息
|
|
|
return self.getCloudUserList(request_dict, response)
|
|
|
elif operation == 'paypal-cycle-cancel': # 取消循环扣款
|
|
@@ -166,8 +167,10 @@ class serveManagement(View):
|
|
|
|
|
|
@staticmethod
|
|
|
def distributeCoupons(request_dict, response):
|
|
|
+ user_id = request_dict.get('userID', None)
|
|
|
pass
|
|
|
|
|
|
+
|
|
|
def getVodBucketList(self, userID, request_dict, response):
|
|
|
# 查询存储桶数据
|
|
|
print('request_dict: ', request_dict)
|
|
@@ -697,6 +700,7 @@ class serveManagement(View):
|
|
|
|
|
|
@staticmethod
|
|
|
def getCouponList(request_dict, response):
|
|
|
+ combo_id = request_dict.get('comboID', None)
|
|
|
pageNo = request_dict.get('pageNo', None)
|
|
|
pageSize = request_dict.get('pageSize', None)
|
|
|
|
|
@@ -707,9 +711,13 @@ class serveManagement(View):
|
|
|
line = int(pageSize)
|
|
|
|
|
|
try:
|
|
|
- coupon_qs = CouponConfigModel.objects.filter().values(
|
|
|
- 'id', 'type', 'use_range', 'coupon_discount', 'lang__lang',
|
|
|
- 'lang__instruction', 'lang__quota', 'lang__unit', 'lang__remark')
|
|
|
+ if combo_id: # 根据套餐id查询
|
|
|
+ coupon_id_list = CouponCombo.objects.filter(combo_id=combo_id).values_list('coupon_id', flat=True)
|
|
|
+ coupon_qs = CouponConfigModel.objects.filter(id__in=coupon_id_list).values(
|
|
|
+ 'id', 'type', 'use_range', 'coupon_discount')
|
|
|
+ else:
|
|
|
+ coupon_qs = CouponConfigModel.objects.filter().values(
|
|
|
+ 'id', 'type', 'use_range', 'coupon_discount')
|
|
|
count = coupon_qs.count()
|
|
|
coupon_list = list(coupon_qs[(page - 1) * line:page * line])
|
|
|
for coupon in coupon_list:
|