Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -24,6 +24,7 @@ use App\Models\Refund;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 use Intervention\Image\Facades\Image;
 use SimpleSoftwareIO\QrCode\Facades\QrCode;
 
@@ -725,23 +726,26 @@ class OrdersController extends CommonController
         switch (request()->type) {
             case "weixin":
                 $res = (new WxMicroPay())->pay($recharge);
-                if ($res !== true) {
+                if ($res === true) {
+                    return response()->json(true);
+                } else {
                     return response()->json([
                         "errorcode" => 60003,
                         "errormsg" => $res->getMessage()
                     ]);
                 }
-                return response()->json(true);
                 break;
             case "alipay":
                 $res = (new AlipayF2F())->test();
-                if (!$res["status"]) {
+                Log::info($res);
+                if ($res["status"]) {
+                    return response()->json(true);
+                } else {
                     return response()->json([
                         "errorcode" => $res["code"],
                         "errormsg" => $res["msg"]
                     ]);
                 }
-                return response()->json(true);
                 break;
             default:
                 return response()->json([