Merge remote-tracking branch 'origin/master'

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 . "元");//商品描述
+        try {
-        $unifiedOrder->setParameter("out_trade_no", $recharge->serial);//商户订单号
+            $unifiedOrder->setParameter("openid", $openid);//openid
-        $unifiedOrder->setParameter("total_fee", $recharge->money * 100);//总金额
+            $unifiedOrder->setParameter("body", "充值" . request()->money . "元");//商品描述
-        $unifiedOrder->setParameter("notify_url", get_http_type() . $_SERVER["HTTP_HOST"] . "/customer/pay-callback");//通知地址
+            $unifiedOrder->setParameter("out_trade_no", $recharge->serial);//商户订单号
-        $unifiedOrder->setParameter("trade_type", "JSAPI");//交易类型
+            $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");//子商户号

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")

resources/views/plugins/datatable.blade.php

@@ -17,8 +17,8 @@
     <script src="/plugins/datatables/buttons.print.min.js"></script>
     <script src="/plugins/datatables/dataTables.keyTable.min.js"></script>
     <script src="/plugins/datatables/dataTables.select.min.js"></script>
-    <script src="/plugins/pdfmake/pdfmake.min.js"></script>
+{{--    <script src="/plugins/pdfmake/pdfmake.min.js"></script>--}}
-    <script src="/plugins/pdfmake/vfs_fonts.js"></script>
+{{--    <script src="/plugins/pdfmake/vfs_fonts.js"></script>--}}
     <!-- third party js ends -->
     <script>
         $(function () {