Merge remote-tracking branch 'remotes/origin/peng' into test

Controller/CloudStorage.py

@@ -1758,15 +1758,15 @@ class CloudStorageView(View):
 
         redis_obj = RedisObject()
         is_lock = redis_obj.CONN.setnx(uid + 'do_experience_order', 1)
-        redis_obj.CONN.expire(uid + 'do_experience_order', 60)
         logger = logging.getLogger('info')
         if not is_lock:
             return response.json(5)
+        redis_obj.CONN.expire(uid + 'do_experience_order', 60)
 
         if pay_type == 10:  # 判断是否已体验过套餐
             experience_context_qs = ExperienceContextModel.objects.filter(uid=uid, experience_type=0)
             if experience_context_qs.exists():
-                return response.json(5)
+                return response.json(10062)
 
         if cdk is not None and pay_type == 11:
             cdk_qs = CDKcontextModel.objects.filter(cdk=cdk).values('is_activate', 'rank__id', 'rank__commodity_code')