WIN-2308041133\Administrator 5 月之前
父节点
当前提交
baef24b7f7

+ 10 - 4
app/common/repositories/store/order/StoreOrderRepository.php

@@ -127,7 +127,7 @@ class StoreOrderRepository extends BaseRepository
         if (in_array($type, ['weixin', 'alipay'], true) && $isApp) {
         if (in_array($type, ['weixin', 'alipay'], true) && $isApp) {
             $type .= 'App';
             $type .= 'App';
         }
         }
-
+        @file_put_contents('quanju.txt',"-456\r\n",8);
         // 在支付前触发一个事件,允许其他功能模块对支付行为进行干预或附加操作
         // 在支付前触发一个事件,允许其他功能模块对支付行为进行干预或附加操作
         event('order.pay.before', compact('groupOrder', 'type', 'isApp'));
         event('order.pay.before', compact('groupOrder', 'type', 'isApp'));
 
 
@@ -137,7 +137,7 @@ class StoreOrderRepository extends BaseRepository
         } else {
         } else {
             $service = new PayService($type, $groupOrder->getPayParams($type === 'alipay' ? $return_url : '', $authCode));
             $service = new PayService($type, $groupOrder->getPayParams($type === 'alipay' ? $return_url : '', $authCode));
         }
         }
-
+        @file_put_contents('quanju.txt',"-789\r\n",8);
         // 生成支付配置
         // 生成支付配置
         $config = $service->pay($user);
         $config = $service->pay($user);
         if ($authCode) {
         if ($authCode) {
@@ -152,7 +152,7 @@ class StoreOrderRepository extends BaseRepository
                 $redis->lPush('bar_code_pay', json_encode($setData));
                 $redis->lPush('bar_code_pay', json_encode($setData));
             }
             }
         }
         }
-
+        @file_put_contents('quanju.txt',"-159\r\n",8);
         // 返回支付配置和订单ID,支付配置中包含支付方式的状态信息
         // 返回支付配置和订单ID,支付配置中包含支付方式的状态信息
         return app('json')->status($type, $config + ['order_id' => $groupOrder['group_order_id'], 'pay_price' => $groupOrder['pay_price']]);
         return app('json')->status($type, $config + ['order_id' => $groupOrder['group_order_id'], 'pay_price' => $groupOrder['pay_price']]);
     }
     }
@@ -264,6 +264,9 @@ class StoreOrderRepository extends BaseRepository
      */
      */
     public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [], $isListen = 0)
     public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [], $isListen = 0)
     {
     {
+        try {
+
+
         $groupOrder->append(['user']);
         $groupOrder->append(['user']);
         //修改订单状态
         //修改订单状态
         $res = Db::transaction(function () use ($subOrders, $is_combine, $groupOrder, $isListen) {
         $res = Db::transaction(function () use ($subOrders, $is_combine, $groupOrder, $isListen) {
@@ -540,7 +543,10 @@ class StoreOrderRepository extends BaseRepository
             Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
             Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->uid, 'type' => 'pay_num', 'inc' => 1]);
             app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id, $groupOrder->pay_price);
             app()->make(UserBrokerageRepository::class)->incMemberValue($groupOrder->uid, 'member_pay_num', $groupOrder->group_order_id, $groupOrder->pay_price);
         }
         }
-
+        }catch (Exception $e) {
+            @file_put_contents('quanju.txt',$e->getMessage()."-123\r\n",8);
+            @file_put_contents('quanju.txt',$e->getLine()."-123\r\n",8);
+        }
         event('order.paySuccess', compact('groupOrder'));
         event('order.paySuccess', compact('groupOrder'));
         event('data.screen.send', []);
         event('data.screen.send', []);
     }
     }

+ 1 - 1
app/common/repositories/user/UserRepository.php

@@ -2710,7 +2710,7 @@ class UserRepository extends BaseRepository
             // 实例化用户账单仓库,用于处理用户账单相关操作。
             // 实例化用户账单仓库,用于处理用户账单相关操作。
             $userBillRepository = app()->make(UserBillRepository::class);
             $userBillRepository = app()->make(UserBillRepository::class);
             $price = $this->awardIntegralPrice();
             $price = $this->awardIntegralPrice();
-            @file_put_contents('quanju.txt',json_encode($price),"-积分金额\r\n",8);
+            @file_put_contents('quanju.txt',json_encode($price)."-积分金额\r\n",8);
             $all_price = bcmul($num, $price['price']);
             $all_price = bcmul($num, $price['price']);
             if ($all_price > $info['award_range']) $all_price = $info['award_range'];
             if ($all_price > $info['award_range']) $all_price = $info['award_range'];
 
 

+ 1 - 1
app/controller/api/store/order/StoreOrder.php

@@ -271,7 +271,7 @@ class StoreOrder extends BaseController
             }
             }
             return app('json')->status('success', '线下支付,请告知收银员', ['order_id' => $groupOrder['group_order_id']]);
             return app('json')->status('success', '线下支付,请告知收银员', ['order_id' => $groupOrder['group_order_id']]);
         }
         }
-
+        @file_put_contents('quanju.txt',"-123\r\n",8);
         try {
         try {
             return $this->repository->pay($type, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());
             return $this->repository->pay($type, $this->request->userInfo(), $groupOrder, $this->request->param('return_url'), $this->request->isApp());
         } catch (\Exception $e) {
         } catch (\Exception $e) {