|
|
@@ -1289,20 +1289,30 @@ class CloudStorageView(View):
|
|
|
# 设备关联套餐列表
|
|
|
def device_commodity(self, request_dict, userID, response):
|
|
|
uid = request_dict.get('uid', None)
|
|
|
+ lang = request_dict.get('lang', None)
|
|
|
dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1) \
|
|
|
.values('vodPrimaryUserID')
|
|
|
if not dv_qs.exists() or dv_qs[0]['vodPrimaryUserID'] != userID:
|
|
|
return response.json(12)
|
|
|
now_time = int(time.time())
|
|
|
uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values("id", "uid", "endTime",
|
|
|
- "bucket__content").order_by(
|
|
|
+ "bucket__content", "bucket__id").order_by(
|
|
|
'addTime')
|
|
|
- if not uid_bucket.exists():
|
|
|
- return response.json(10030)
|
|
|
+ bclist = []
|
|
|
+ for ub in uid_bucket:
|
|
|
+ bclist.append('bucket__id')
|
|
|
+
|
|
|
+ smqs = Store_Meal.objects.filter(bucket__id__in=bclist, lang__lang=lang).values('lang__lang','bucket__id','lang__title')
|
|
|
for index, value in enumerate(uid_bucket):
|
|
|
value['is_use'] = 0
|
|
|
if index == 0:
|
|
|
value['is_use'] = 1
|
|
|
+
|
|
|
+ for sm in smqs:
|
|
|
+
|
|
|
+ if value['bucket__id'] == sm['bucket__id']:
|
|
|
+ value['bucket__content'] = sm['lang__title']
|
|
|
+
|
|
|
return response.json(0, list(uid_bucket))
|
|
|
|
|
|
# 提前使用设备关联套餐
|
chenshibin