修改云存+AI套标题和内容

AdminController/ServeManagementController.py

@@ -2028,7 +2028,11 @@ class serveManagement(View):
                         if not unused_meal_qs.exists():
                             UID_Bucket.objects.filter(uid=uid).update(has_unused=0, updateTime=nowTime)
                         return response.json(0)
-                    uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1).values('endTime')
+                    uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1, orderId=orderID)
+                    if uid_bucket_qs.exists():  # 如果通过订单号查询正在使用的套餐，则删除套餐
+                        uid_bucket_qs.delete()
+                        return response.json(0)
+                    uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1, orderId='').values('endTime')
                     if uid_bucket_qs.exists():  # 如果通过uid查询正在使用的套餐，则更新过期时间和使用状态
                         end_time = pay_time + uid_bucket_qs[0]['endTime'] - CommonService.calcMonthLater(expire, pay_time)
                         use_status = 2 if end_time < nowTime else 1

Controller/CloudStorage.py

@@ -965,11 +965,11 @@ class CloudStorageView(View):
                         else:
                             UID_Bucket.objects.filter(id=uid_bucket_id).update(channel=channel, bucket_id=bucket_id,
                                                                                endTime=end_time, updateTime=now_time,
-                                                                               use_status=1)
+                                                                               use_status=1, orderId=order_id)
                     else:
                         uid_bucket = UID_Bucket.objects.create(uid=uid, channel=channel, bucket_id=bucket_id,
                                                                endTime=end_time, addTime=now_time, updateTime=now_time,
-                                                               use_status=1)
+                                                               use_status=1, orderId=order_id)
                         uid_bucket_id = uid_bucket.id
 
                     device_info_qs = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
@@ -1136,11 +1136,12 @@ class CloudStorageView(View):
                                                                                            bucket_id=bucket_id,
                                                                                            endTime=end_time,
                                                                                            updateTime=now_time,
-                                                                                           use_status=1)
+                                                                                           use_status=1,
+                                                                                           orderId=order_id)
                 else:
                     uid_bucket = UID_Bucket.objects.create(uid=uid, channel=channel, bucket_id=bucket_id,
                                                            endTime=end_time, addTime=now_time, updateTime=now_time,
-                                                           use_status=1)
+                                                           use_status=1, orderId=order_id)
                     update_status = True
                     uid_bucket_id = uid_bucket.id
 
@@ -1294,11 +1295,11 @@ class CloudStorageView(View):
                         else:
                             UID_Bucket.objects.filter(id=uid_bucket_id).update(channel=channel, bucket_id=bucket_id,
                                                                                endTime=end_time, updateTime=now_time,
-                                                                               use_status=1)
+                                                                               use_status=1, orderId=order_id)
                     else:
                         uid_bucket = UID_Bucket.objects.create(uid=uid, channel=channel, bucket_id=bucket_id,
                                                                endTime=end_time, addTime=now_time,
-                                                               updateTime=now_time, use_status=1)
+                                                               updateTime=now_time, use_status=1, orderId=order_id)
                         uid_bucket_id = uid_bucket.id
 
                     device_info_qs = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
@@ -1852,11 +1853,11 @@ class CloudStorageView(View):
                     else:
                         UID_Bucket.objects.filter(id=uid_bucket_id).update(channel=channel, bucket_id=bucket_id,
                                                                            endTime=end_time, updateTime=now_time,
-                                                                           use_status=1)
+                                                                           use_status=1, orderId=order_id)
                 else:
                     uid_bucket = UID_Bucket.objects.create(uid=uid, channel=channel, bucket_id=bucket_id,
                                                            endTime=end_time, addTime=now_time, updateTime=now_time,
-                                                           use_status=1)
+                                                           use_status=1, orderId=order_id)
                     uid_bucket_id = uid_bucket.id
 
                 #  开通云盘体验
@@ -2043,7 +2044,8 @@ class CloudStorageView(View):
         store_list = []
         uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values("id", "uid", "bucket__content",
                                                                                          "use_status", "endTime",
-                                                                                         "has_unused", "bucket__id")
+                                                                                         "has_unused", "bucket__id",
+                                                                                         "orderId")
         if not uid_bucket_qs:
             return response.json(10030)
 
@@ -2065,7 +2067,8 @@ class CloudStorageView(View):
                                                                                                        "uid",
                                                                                                        "bucket__content",
                                                                                                        "bucket__id",
-                                                                                                       "expire")
+                                                                                                       "expire",
+                                                                                                       "order_id")
             month = 'month' if lang != 'cn' else '个月'
             for unused_uid in unused_uid_qs:
                 storage_time = unused_uid['expire']
@@ -2080,6 +2083,7 @@ class CloudStorageView(View):
                     "endTime": 0,
                     "bucket__id": unused_uid['bucket__id'],
                     "storage": storage,
+                    "orderId": unused_uid['order_id'],
                 }
                 store_list.append(unused_dict)
                 bucket_id_list.append(unused_uid['bucket__id'])
@@ -2087,6 +2091,35 @@ class CloudStorageView(View):
             title=F('lang__title'), content=F('lang__content')).values('lang__content', 'lang__lang',
                                                                        'bucket__id', 'lang__title')
         for index, value in enumerate(store_list):
+            if value['orderId']:
+                order_qs = Order_Model.objects.filter(orderID=value['orderId'], rank__lang__lang=lang).values('payType',
+                                                                                                              'rank__is_ai',
+                                                                                                              'rank__pixel_level',
+                                                                                                              'rank__commodity_code',
+                                                                                                              'rank__lang__new_title')
+                if order_qs.exists():
+                    if order_qs[0]['payType'] not in [10, 11]:
+                        if order_qs[0]['rank__pixel_level'] == 0 and order_qs[0]['rank__is_ai'] == 0:
+                            if order_qs[0]['rank__commodity_code']:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('5', '')
+                            else:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('1', '')
+                        elif order_qs[0]['rank__pixel_level'] == 1 and order_qs[0]['rank__is_ai'] == 0:
+                            if order_qs[0]['rank__commodity_code']:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('6', '')
+                            else:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('2', '')
+                        elif order_qs[0]['rank__pixel_level'] == 0 and order_qs[0]['rank__is_ai'] == 1:
+                            if order_qs[0]['rank__commodity_code']:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('7', '')
+                            else:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('3', '')
+                        elif order_qs[0]['rank__pixel_level'] == 1 and order_qs[0]['rank__is_ai'] == 1:
+                            if order_qs[0]['rank__commodity_code']:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('8', '')
+                            else:
+                                value['bucket__content'] = order_qs[0]['rank__lang__new_title'].get('4', '')
+                        continue
             for store in store_qs:
                 if value['bucket__id'] == store['bucket__id']:
                     value['bucket__content'] = store['lang__title'] + '-' + store['lang__content']

Controller/Cron/CronTaskController.py

@@ -467,7 +467,8 @@ class CronUpdateDataView(View):
                         bucket_id=unused['bucket_id'],
                         updateTime=now_time,
                         use_status=1,
-                        has_unused=has_unused)
+                        has_unused=has_unused,
+                        ordersId=unused['order_id'])
                     if unused['is_ai']:
                         ai_service = AiService.objects.filter(uid=expired_uid_bucket['uid'], channel=unused['channel'])
                         if ai_service.exists():

Controller/PaymentCycle.py

@@ -244,12 +244,13 @@ class PaypalCycleNotify(View):
                                                                                            bucket_id=bucketId,
                                                                                            endTime=endTime,
                                                                                            updateTime=nowTime,
-                                                                                           use_status=1)
+                                                                                           use_status=1,
+                                                                                           orderId=orderID)
 
                 else:
                     ub_cqs = UID_Bucket.objects.create \
                         (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime,
-                         updateTime=nowTime, use_status=1)
+                         updateTime=nowTime, use_status=1, orderId=orderID)
                     update_status = True
                     uid_bucket_id = ub_cqs.id
                 dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
@@ -474,11 +475,13 @@ class PaypalCycleNotify(View):
                                                                                            bucket_id=bucketId,
                                                                                            endTime=endTime,
                                                                                            updateTime=nowTime,
-                                                                                           use_status=1)
+                                                                                           use_status=1,
+                                                                                           orderId=orderID)
 
                 else:
                     ub_cqs = UID_Bucket.objects.create(uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime,
-                                                       addTime=nowTime, updateTime=nowTime, use_status=1)
+                                                       addTime=nowTime, updateTime=nowTime, use_status=1,
+                                                       orderId=orderID)
                     uid_bucket_id = ub_cqs.id
                     update_status = True
                 PAY_LOGGER.info(