Merge branch 'lang' into dev

Controller/CloudStorage.py

@@ -863,10 +863,15 @@ class CloudStorageView(View):
             return HttpResponseRedirect(red_url)
 
     def do_pay_by_paypal_callback(self, request_dict, response):  # paypal支付回调
+        logger = logging.getLogger('info')
+        logger.info('---------进入paypay异步回调')
         paymentId = request_dict.get('paymentId', None)
         PayerID = request_dict.get('PayerID', None)
         orderID = request_dict.get('orderID', None)
         lang = request_dict.get('lang', 'en')
+
+        logger.info("paymentID={paymentId},payerID={PayerID}".format(paymentId=paymentId,PayerID=PayerID))
+
         # redis加锁，防止订单重复
         redisObj = RedisObject()
         isLock = redisObj.CONN.setnx(orderID + 'do_notify', 1)
@@ -887,6 +892,10 @@ class CloudStorageView(View):
             # ID of the payment. This ID is provided when creating payment.
             payment = paypalrestsdk.Payment.find(paymentId)
             print(payment)
+
+            logger.info("payment------")
+            logger.info(payment)
+
             payres = payment.execute({"payer_id": PayerID})
             print(payres)
             if not payres:

Controller/PaymentCycle.py

@@ -147,6 +147,12 @@ class PaypalCycleNotify(View):
     def do_paypal_cycle_return(self, request_dict, response):
         lang = request_dict.get('lang', 'en')
         token = request_dict.get('token',None)
+
+        logger = logging.getLogger('info')
+        logger.info('---------进入paypay自动续费异步回调')
+        logger.info(request_dict)
+
+
         paypalrestsdk.configure(PAYPAL_CRD)
         billing_agreement = paypalrestsdk.BillingAgreement()
         billing_agreement_response = billing_agreement.execute(token)