Merge remote-tracking branch '99/dev'

# Conflicts:
#	Controller/AdminManage.py
#	Model/models.py

Controller/CloudStorage.py

@@ -805,6 +805,9 @@ class CloudStorageView(View):
         PayerID = request_dict.get('PayerID', None)
         orderID = request_dict.get('orderID', None)
         lang = request_dict.get('lang', 'en')
+
+        logger = logging.getLogger('log')
+
         try:
             order_qs = Order_Model.objects.filter(orderID=orderID, status=0)
 
@@ -821,6 +824,8 @@ class CloudStorageView(View):
             payres = payment.execute({"payer_id": PayerID})
             print(payres)
             if not payres:
+                logger.info("--------------------pay fail")
+                logger.info(payres)
                 red_url = "{SERVER_DOMAIN_SSL}web/paid2/fail.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
                 if lang != 'cn':
                     red_url = "{SERVER_DOMAIN_SSL}web/paid2/en_fail.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
@@ -901,6 +906,8 @@ class CloudStorageView(View):
                 return HttpResponseRedirect(red_url)
         except Exception as e:
             print(repr(e))
+            logger.info("--------------------pay fail")
+            logger.info(repr(e))
             if order_qs:
                 order_qs.update(status=10)
             red_url = "{SERVER_DOMAIN_SSL}web/paid2/fail.html".format(SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)