gorden 7 月之前
父節點
當前提交
5f4f1cb5bb
共有 2 個文件被更改,包括 9 次插入6 次删除
  1. 5 2
      app/admin/controller/order/WholeController.php
  2. 4 4
      app/admin/service/order/OrderService.php

+ 5 - 2
app/admin/controller/order/WholeController.php

@@ -990,7 +990,7 @@ class WholeController extends Curd
                     }
                 } else {
                     Db::rollBack();
-                    return json_fail('二维码错误');
+                    return json_fail('付款码无效');
                 }
 
                 // 组合支付,追加加一条支付记录 pay_detail
@@ -1390,7 +1390,7 @@ class WholeController extends Curd
                         }
                     } else {
                         Db::rollBack();
-                        return json_fail('二维码错误');
+                        return json_fail('付款码无效');
                     }
                 }
 
@@ -1908,6 +1908,9 @@ class WholeController extends Curd
                             $params['order_status_system'] = $systemStatus;
                             $params['order_status_payment'] = 'SUCCESS';
                         }
+                    }else{
+                        Db::rollBack();
+                        return json_fail('付款码无效');
                     }
 
                     // 组合支付,追加加一条支付记录 pay_detail

+ 4 - 4
app/admin/service/order/OrderService.php

@@ -279,8 +279,8 @@ class OrderService
     public static function findWxpay($orderId, $nbr = 0)
     {
         try {
-            $result = Pay::wechat(config('payment.wxpay'))->find($orderId, 'pos');
-            $result = json_decode(json_encode($result), true);
+//            $result = Pay::wechat(config('payment.wxpay'))->find($orderId, 'pos');
+//            $result = json_decode(json_encode($result), true);
         } catch (\Exception $e) {
             SupportLog::channel('pay')->error("FIND_WXPAY", ['msg' => $e->getMessage()]);
         }
@@ -312,8 +312,8 @@ class OrderService
     public static function findAlipay($orderId, $nbr = 0)
     {
         try {
-            $result = Pay::alipay(config('payment.alipay'))->find($orderId);
-            $result = json_decode(json_encode($result), true);
+//            $result = Pay::alipay(config('payment.alipay'))->find($orderId);
+//            $result = json_decode(json_encode($result), true);
         } catch (\Exception $e) {
             SupportLog::channel('pay')->error("FIND_ALIPAY", ['msg' => $e->getMessage()]);
         }