Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

2 years ago · 17a09937be
parent 83ad91e27e 149b108f41
commit 17a09937be
1 changed files with 3 additions and 3 deletions
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@ -1430,10 +1430,10 @@ class OrdersController extends CommonController
                break;
            case "alipay":
                $res = (new AlipayF2F())->pay($recharge);
+                $recharge->update([
+                    "merchant_id" => env("ALI_APP_ID")
+                ]);
                if ($res["status"]) {
-                    $recharge->update([
-                        "merchant_id" => env("ALI_APP_ID")
-                    ]);
                    return response()->json(true);
                } else {
                    return response()->json([