fix order more add

Signed-off-by: chenjunkai <chenjunkai@163.com>

Ansjer/test/osstest.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-import oss2
-from var_dump import var_dump
-# 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
-host = "oss-cn-shenzhen.aliyuncs.com"  # just for example
-access_key_id = 'LTAIpezLGJWqmrwR'
-access_key_secret = 'S6vx8nZQw8pwoX07qMMnLdA61TMvX5'
-# access_key_id = 'LTAIyMkGfEdogyL9'
-# access_key_secret = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
-bucket_name = "cnvod1"
-auth = oss2.Auth(access_key_id, access_key_secret)
-# Endpoint以杭州为例，其它Region请按实际情况填写。
-bucket = oss2.Bucket(auth, host, bucket_name)
-
-# 设置Delimiter参数为正斜线（/）。
-# for obj in oss2.ObjectIterator(bucket, delimiter='/',prefix='vod/'):
-# for obj in oss2.ObjectIterator(bucket, prefix='FTSLL8HM437Z38WU111A/vod4/',delimiter='/'):
-res=bucket.list_objects(prefix='/',delimiter='/',max_keys=5)
-# var_dump()
-var_dump(res.object_list)
-exit()
-
-for obj in oss2.ObjectIterator(bucket, prefix='/',delimiter='/',max_keys=50):
-    # 通过is_prefix方法判断obj是否为文件夹。
-    if obj.is_prefix():  # 文件夹
-        print('directory: ' + obj.key)
-    else:  # 文件
-        pass
-        print('file: ' + obj.key)
-

Controller/CloudVod.py

@@ -214,6 +214,11 @@ class CloudVodView(View):
             elif ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
                 return response.json(10,'区域不一致')
             # 续费流程
+        nowTime = CommonService.get_utc()
+        # 判断是否存在未完成订单
+        hasOrder = Order_Model.objects.filter(UID=uid,channel=channel,addTime__gte=3600+nowTime,status=0,rank_id=rank).values('paypal')
+        if hasOrder.exists():
+            return response.json(0, {"redirectUrl": hasOrder[0].paypal})
         # 新增流程
         orderID = CommonService.createOrderID()
         call_sub_url = "{SERVER_DOMAIN}cloudVod/payExecute?orderID={orderID}". \
@@ -244,7 +249,6 @@ class CloudVodView(View):
             print(payment.error)
             return response.json(10, payment.error)
         print(payment)
-        nowTime = CommonService.get_utc()
         for link in payment.links:
             if link.rel == "approval_url":
                 approval_url = str(link.href)