WIN-2308041133\Administrator 5 months ago
parent
commit
61344cddc7

+ 0 - 14
app/common/repositories/store/order/StoreOrderRepository.php

@@ -264,9 +264,6 @@ class StoreOrderRepository extends BaseRepository
      */
     public function paySuccess(StoreGroupOrder $groupOrder, $is_combine = 0, $subOrders = [], $isListen = 0)
     {
-        try {
-
-
         $groupOrder->append(['user']);
         //修改订单状态
         $res = Db::transaction(function () use ($subOrders, $is_combine, $groupOrder, $isListen) {
@@ -400,7 +397,6 @@ class StoreOrderRepository extends BaseRepository
 
                 if (!$presell) {
                     if ($order['extension_one'] > 0) {
-                        @file_put_contents('quanju.txt',  $groupOrder->user->ValidSpread->nickname ."-测试5?\r\n",8);
                         $finance[] = [
                             'order_id' => $order->order_id,
                             'order_sn' => $order->order_sn,
@@ -432,7 +428,6 @@ class StoreOrderRepository extends BaseRepository
                         ];
                     }
                     if ($order['commission_rate'] > 0) {
-                        @file_put_contents('quanju.txt',$groupOrder->user->nickname."-测试1?\r\n",8);
                         $finance[] = [
                             'order_id' => $order->order_id,
                             'order_sn' => $order->order_sn,
@@ -447,7 +442,6 @@ class StoreOrderRepository extends BaseRepository
                             'pay_type' => $groupOrder->pay_type
                         ];
                     }
-                    @file_put_contents('quanju.txt',$groupOrder->user->nickname."-测试2?\r\n",8);
                     $finance[] = [
                         'order_id' => $order->order_id,
                         'order_sn' => $order->order_sn,
@@ -462,7 +456,6 @@ class StoreOrderRepository extends BaseRepository
                         'pay_type' => $groupOrder->pay_type
                     ];
                     if ($order->platform_coupon_price > 0) {
-                        @file_put_contents('quanju.txt', $groupOrder->user->nickname ."-测试3?\r\n",8);
                         $finance[] = [
                             'order_id' => $order->order_id,
                             'order_sn' => $order->order_sn,
@@ -522,9 +515,7 @@ class StoreOrderRepository extends BaseRepository
             if (count($profitsharing)) {
                 $storeOrderProfitsharingRepository->insertAll($profitsharing);
             }
-            @file_put_contents('quanju.txt',json_encode($finance)."-是这里吗?\r\n",8);
             $financialRecordRepository->insertAll($finance);
-            @file_put_contents('quanju.txt',"-能到这里吗?\r\n",8);
             $storeOrderStatusRepository->batchCreateLog($orderStatus);
             if (count($groupOrder['give_coupon_ids']) > 0)
                 $groupOrder['give_coupon_ids'] = app()->make(StoreCouponRepository::class)->getGiveCoupon($groupOrder['give_coupon_ids'])->column('coupon_id');
@@ -550,11 +541,6 @@ class StoreOrderRepository extends BaseRepository
             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);
         }
-        }catch (Exception $e) {
-            @file_put_contents('quanju.txt',$e->getMessage()."-753\r\n",8);
-            @file_put_contents('quanju.txt',$e->getFile()."-741\r\n",8);
-            @file_put_contents('quanju.txt',$e->getLine()."-351\r\n",8);
-        }
         event('order.paySuccess', compact('groupOrder'));
         event('data.screen.send', []);
     }

+ 2 - 0
app/controller/api/Auth.php

@@ -28,6 +28,7 @@ use app\common\repositories\user\UserRepository;
 use app\common\repositories\user\UserSignRepository;
 use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
+use app\controller\api\user\User;
 use app\validate\api\ChangePasswordValidate;
 use app\validate\api\UserAuthValidate;
 use crmeb\basic\BaseController;
@@ -198,6 +199,7 @@ class Auth extends BaseController
         if ($data['gift_level'] > 0) {
             $data['gift_level_name'] = GiftLevel::where('id', $data['gift_level'])->value('name');
         }
+        $data['brokerage_price'] = User::where('uid', $user['uid'])->value('brokerage_price');
         return app('json')->success($data);
     }