'appid调整'

src/Controllers/CompanyAuth/AppController.php

@@ -13,6 +13,7 @@ use General\Controllers\CompanyAuth\Transformers\OrderDayStatsTransformer;
 use General\Controllers\CompanyAuth\Transformers\OrderTransformer;
 use General\Controllers\CompanyAuth\Transformers\SendOrderTransformer;
 use General\Helpers\CommonHelper;
+use General\Models\OfficialAccount\OfficialAccount;
 use General\Requests\CompanyAuth\BookQueryRequest;
 use General\Requests\CompanyAuth\CustomSendMsgRequest;
 use General\Requests\CompanyAuth\ChannelQueryRequest;
@@ -244,7 +245,12 @@ class AppController extends Controller
         } else {
             $service = new OrderService;
             $result = $service->companyAuthOrders(compact('channel_id', 'status', 'begin_date', 'end_date'));
-            return response()->pagination(new OrderTransformer, $result);
+            $appIds = OfficialAccount::where('distribution_channel_id',$channel_id)->get()->pluck('app_id')->toArray();
+            foreach($result as $key => $item){
+                $result[$key]['app_ids'] = count($appIds) > 0 ? array_filter($appIds) : [];
+            }
+
+            return response()->pagination(new OrderTransformer(), $result);
         }
     }
 

src/Controllers/CompanyAuth/Transformers/OrderTransformer.php

@@ -24,9 +24,13 @@ class OrderTransformer
         $uid     = $item->uid;
         $app_id  = $item->user && $item->user->force_subscribe_user ? $item->user->force_subscribe_user->appid : '';
         $opend_id = $item->user && $item->user->force_subscribe_user ? $item->user->force_subscribe_user->openid : '';
+
+        if($app_id == ''){
+            $app_id = empty($item->app_ids) ? '' : $item->app_ids[0];
+        }
+
         if ($opend_id == ''){
-            $appIds = OfficialAccount::where('distribution_channel_id',$item->distribution_channel_id)->get()->pluck('app_id')->toArray();
-            $res = $service->getUserOpenidsData($uid,$appIds);
+            $res = $service->getUserOpenidsData($uid,$app_id);
             if ($res){
                 $opend_id = $res['openid'];
             }

src/Services/Order/OrderService.php

@@ -40,7 +40,7 @@ class OrderService
 
     public function getUserOpenidsData($uid,$app_id)
     {
-        $res = UserOpenids::where('uid', $uid)->whereIn('app_id',$app_id)->first();
+        $res = UserOpenids::where('uid', $uid)->where('app_id',$app_id)->first();
         return $res ? $res->toArray() : [];
     }