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

app/Http/Controllers/Manager/OrdersController.php

@@ -1431,6 +1431,9 @@ class OrdersController extends CommonController
             case "alipay":
                 $res = (new AlipayF2F())->pay($recharge);
                 if ($res["status"]) {
+                    $recharge->update([
+                        "merchant_id" => env("ALI_APP_ID")
+                    ]);
                     return response()->json(true);
                 } else {
                     return response()->json([
@@ -1708,8 +1711,19 @@ class OrdersController extends CommonController
                     $refund["paid_at"] = date("Y-m-d H:i:s");
                     break;
                 case "weixin":
+                    $recharge = Recharge::find(request()->recharge_id);
+                    $refund["payment"] = $recharge->payment;
+                    $refund["recharge_id"] = request()->recharge_id;
+                    $refund["merchant_id"] = $recharge->merchant_id;
+                    break;
                 case "alipay":
                     $recharge = Recharge::find(request()->recharge_id);
+                    if (!$recharge->merchant_id) {
+                        return response()->json([
+                            "errorcode" => "0",
+                            "errormsg" => "本单支付宝退款暂不支持"
+                        ]);
+                    }
                     $refund["payment"] = $recharge->payment;
                     $refund["recharge_id"] = request()->recharge_id;
                     $refund["merchant_id"] = $recharge->merchant_id;

app/Models/Orders.php

@@ -423,6 +423,7 @@ class Orders extends SoftDeletesModel
         $recharge = Recharge::where("order_id", $this->id)
             ->whereNotNull("paid_at")
             ->whereIn("payment", ["weixin", "alipay"])
+            ->whereNotNull("merchant_id")
             ->where("money", ">=", $amount)
             ->doesntHave("refunds")
             ->orderBy("id", "desc")