diff --git a/app/Http/Controllers/Customer/OrdersController.php b/app/Http/Controllers/Customer/OrdersController.php index d0ae904..0af056e 100644 --- a/app/Http/Controllers/Customer/OrdersController.php +++ b/app/Http/Controllers/Customer/OrdersController.php @@ -626,6 +626,7 @@ class OrdersController extends CommonController public function recharge() { + Log::channel("daily_customer_order_request")->info($this->customer->openid); $openid = $this->customer->openid; $unifiedOrder = new \UnifiedOrderPub(); $jsApi = new \JsApiPub(); @@ -645,12 +646,20 @@ class OrdersController extends CommonController //noncestr已填,商户无需重复填写 //spbill_create_ip已填,商户无需重复填写 //sign已填,商户无需重复填写 - $unifiedOrder->setParameter("openid", $openid);//openid - $unifiedOrder->setParameter("body", "充值" . request()->money . "元");//商品描述 - $unifiedOrder->setParameter("out_trade_no", $recharge->serial);//商户订单号 - $unifiedOrder->setParameter("total_fee", $recharge->money * 100);//总金额 - $unifiedOrder->setParameter("notify_url", get_http_type() . $_SERVER["HTTP_HOST"] . "/customer/pay-callback");//通知地址 - $unifiedOrder->setParameter("trade_type", "JSAPI");//交易类型 + + try { + $unifiedOrder->setParameter("openid", $openid);//openid + $unifiedOrder->setParameter("body", "充值" . request()->money . "元");//商品描述 + $unifiedOrder->setParameter("out_trade_no", $recharge->serial);//商户订单号 + $unifiedOrder->setParameter("total_fee", $recharge->money * 100);//总金额 + $unifiedOrder->setParameter("notify_url", get_http_type() . $_SERVER["HTTP_HOST"] . "/customer/pay-callback");//通知地址 + $unifiedOrder->setParameter("trade_type", "JSAPI");//交易类型 + } catch (\Exception $exception) { + return response()->json([ + "errorcode" => $exception->getCode(), + "errormsg" => $exception->getMessage() + ]); + } //非必填参数,商户可根据实际情况选填 //$unifiedOrder->setParameter("sub_mch_id","XXXX");//子商户号 diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 4dda8fc..122747a 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -421,6 +421,7 @@ class Orders extends SoftDeletesModel //todo:根据交易状态是否可以退款、以及多次退款金额是否足够进行更精准筛选 //but:出问题的几率微乎其微可以忽略 $recharge = Recharge::where("order_id", $this->id) + ->where("merchant_id", "<>", "1621928535") //忽略微信支付的琳颖账户,2024-08-29 ->whereNotNull("paid_at") ->whereIn("payment", ["weixin", "alipay"]) ->whereNotNull("merchant_id") diff --git a/resources/views/plugins/datatable.blade.php b/resources/views/plugins/datatable.blade.php index 3e03fdf..45d7f24 100755 --- a/resources/views/plugins/datatable.blade.php +++ b/resources/views/plugins/datatable.blade.php @@ -17,8 +17,8 @@ - - +{{-- --}} +{{-- --}}