Merge remote-tracking branch 'origin/master'

app/czg/app/controller/WuyouController.php

@@ -214,6 +214,7 @@ class WuyouController extends BaseController
                 Log::info("无忧支付回调，验签失败， 签名结果: {$sign}");
 //            return 'success';
             }
+            throw new SysException("1");
 
             if ($params['callbacks'] != 'CODE_SUCCESS') {
                 Log::info("无忧支付回调，支付失败");
@@ -244,9 +245,7 @@ class WuyouController extends BaseController
             $payDetail = $payDetails[0];
             if ($payDetail['state'] == 1) {
                 Log::info("无忧支付回调，重复回调");
-                // TODO 测试
-
-//            return 'success';
+            return 'success';
             }
 
             $order = DatabaseRoute::getDb('orders', $userId)->where([
@@ -261,9 +260,7 @@ class WuyouController extends BaseController
 
             if ($order['status'] != 0) {
                 Log::info("无忧支付回调，订单已支付");
-                // TODO 测试
-
-//            return '订单已支付';
+            return '订单已支付';
             }
 
             $payDetail['third_order_no'] = $params['order_sn'];