Merge branch 'dev' of http://192.168.136.99:3000/SERVER/AnsjerServer into bin

Controller/CloudStorage.py

@@ -327,7 +327,7 @@ class CloudStorageView(View):
         now_time = int(time.time())
         ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=now_time). \
                    values("bucket__mold", "bucket__bucket", "bucket__endpoint",
-                          "bucket__region", "endTime").order_by('endTime')[:1]
+                          "bucket__region", "endTime").order_by('addTime')[:1]
         if ubqs.exists():
             if ubqs[0]["bucket__mold"] == 0:
                 # 阿里云 oss sts
@@ -478,7 +478,7 @@ class CloudStorageView(View):
         if not dv_qs.exists():
             return response.json(12)
         now_time = int(time.time())
-        bv_qs = UID_Bucket.objects.filter(uid=uid,channel=channel, endTime__gte=now_time).order_by('endTime')
+        bv_qs = UID_Bucket.objects.filter(uid=uid,channel=channel, endTime__gte=now_time).order_by('addTime')
         if not bv_qs.exists():
             return response.json(10030)
         vh_qs = VodHlsModel.objects.filter \
@@ -565,7 +565,7 @@ class CloudStorageView(View):
         now_time = int(time.time())
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
                    values("bucket__mold", "bucket__bucket", "bucket__endpoint",
-                          "bucket__region", "status", "bucket__storeDay", "bucket__id").order_by('endTime')[:1]
+                          "bucket__region", "status", "bucket__storeDay", "bucket__id").order_by('addTime')[:1]
         if ubqs.exists():
             ub_qs_data = ubqs[0]
             store_day = ub_qs_data['bucket__storeDay']
@@ -656,7 +656,7 @@ class CloudStorageView(View):
         dvqs = Device_Info.objects.filter(UID=uid, userID_id=userID, isShare=False)
         if not dvqs.exists():
             return response.json(12)
-        ubqs = UID_Bucket.objects.filter(channel=channel, uid=uid).order_by('endTime')
+        ubqs = UID_Bucket.objects.filter(channel=channel, uid=uid).order_by('addTime')
         if not ubqs.exists():
             return response.json(10030)
         now_time = int(time.time())
@@ -878,9 +878,8 @@ class CloudStorageView(View):
             if not smqs.exists():
                 return response.json(173)
             ubqs = UID_Bucket.objects.filter(bucket__id=bucketId, uid=UID, channel=channel, endTime__gte=nowTime). \
-                       values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('endTime')[:1]
+                       values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('addTime')[:1]
             nowTime = int(time.time())
-
             expire = smqs[0]['expire']
             if order_list[0]['isSelectDiscounts'] == 1:
                 expire = smqs[0]['expire'] * 2
@@ -889,12 +888,12 @@ class CloudStorageView(View):
                 endTime = CommonService.calcMonthLater(expire, ubq['endTime'])
                 ub_cqs = UID_Bucket.objects.filter(id=ubq['id']).update \
                     (uid=UID, channel=channel, bucket_id=bucketId,
-                     endTime=endTime)
+                     endTime=endTime,updateTime=nowTime)
                 uid_bucket_id = ubq['id']
             else:
                 endTime = CommonService.calcMonthLater(expire)
                 ub_cqs = UID_Bucket.objects.create \
-                    (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime)
+                    (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
                 uid_bucket_id = ub_cqs.id
 
             order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
@@ -931,7 +930,7 @@ class CloudStorageView(View):
             return response.json(173)
         # ##
         ubqs = UID_Bucket.objects.filter(bucket__id=bucketId, uid=UID, channel=channel, endTime__gte=nowTime). \
-                   values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('endTime')[:1]
+                   values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('addTime')[:1]
         expire = smqs[0]['expire']
         if order_list[0]['isSelectDiscounts'] == 1:
             expire = smqs[0]['expire'] * 2
@@ -940,12 +939,12 @@ class CloudStorageView(View):
             endTime = CommonService.calcMonthLater(expire,ubq['endTime'])
             ub_cqs = UID_Bucket.objects.filter(id=ubq['id']).update \
                 (uid=UID, channel=channel, bucket_id=bucketId,
-                 endTime=endTime)
+                 endTime=endTime,updateTime=nowTime)
             uid_bucket_id = ubq['id']
         else:
             endTime = CommonService.calcMonthLater(expire)
             ub_cqs = UID_Bucket.objects.create \
-                (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime)
+                (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
             uid_bucket_id = ub_cqs.id
         order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
 
@@ -975,7 +974,7 @@ class CloudStorageView(View):
                 return HttpResponse(WechatPayObject.xml_to_dict({'return_code':'FAIL', 'return_msg':'套餐不存在'}))
             # ##
             ubqs = UID_Bucket.objects.filter(bucket__id=bucketId, uid=UID, channel=channel, endTime__gte=nowTime). \
-                       values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('endTime')[:1]
+                       values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('addTime')[:1]
             expire = smqs[0]['expire']
             if order_list[0]['isSelectDiscounts'] == 1:
                 expire = smqs[0]['expire'] * 2
@@ -984,12 +983,12 @@ class CloudStorageView(View):
                 endTime = CommonService.calcMonthLater(expire,ubq['endTime'])
                 ub_cqs = UID_Bucket.objects.filter(id=ubq['id']).update \
                     (uid=UID, channel=channel, bucket_id=bucketId,
-                     endTime=endTime)
+                     endTime=endTime, updateTime=nowTime)
                 uid_bucket_id = ubq['id']
             else:
                 endTime = CommonService.calcMonthLater(expire)
                 ub_cqs = UID_Bucket.objects.create \
-                    (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime)
+                    (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
                 uid_bucket_id = ub_cqs.id
             order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
             return HttpResponse(WechatPayObject.xml_to_dict({'return_code':'SUCCESS', 'return_msg':'OK'}))
@@ -1263,7 +1262,7 @@ class CloudStorageView(View):
         uid = request_dict.get('uid',None)
         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('endTime')
+                                                                                      "bucket__content").order_by('addTime')
         if not uid_bucket.exists():
             return response.json(10030)
         for index, value in enumerate(uid_bucket):
@@ -1278,8 +1277,8 @@ class CloudStorageView(View):
         switch_commodity_id = request_dict.get('switch_commodity_id',None)
         if switch_commodity_id:
             #切换设备套餐关联
-            using_uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=int(time.time())).values("id", "uid", "endTime",
-                                                                                                        "bucket__content").order_by('endTime')
+            using_uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=int(time.time())).values("id", "uid",
+                                                                        "endTime","bucket__content").order_by('addTime')
 
             if not using_uid_bucket.exists():
                 return response.json(10030)

Model/models.py

@@ -637,6 +637,8 @@ class UID_Bucket(models.Model):
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
     status = models.SmallIntegerField(default=0, verbose_name='状态[0:开启,1:关闭]')
     endTime = models.IntegerField(verbose_name='套餐结束时间', default=0)
+    addTime = models.IntegerField(verbose_name='添加时间', default=0)
+    updateTime = models.IntegerField(verbose_name='更新时间', default=0)
     # is_use = models.IntegerField(verbose_name='是否使用中[0:未使用,1:使用中]', default=0)
 
     class Meta: