zhuchengjie 3 年之前
父节点
当前提交
71734aefad
共有 2 个文件被更改,包括 7 次插入9 次删除
  1. 5 7
      src/Controllers/CompanyAuth/Transformers/OrderTransformer.php
  2. 2 2
      src/Services/Order/OrderService.php

+ 5 - 7
src/Controllers/CompanyAuth/Transformers/OrderTransformer.php

@@ -9,8 +9,11 @@
 namespace General\Controllers\CompanyAuth\Transformers;
 namespace General\Controllers\CompanyAuth\Transformers;
 
 
 use General\Helpers\CommonHelper;
 use General\Helpers\CommonHelper;
+use General\Models\OfficialAccount\ForceSubscribeUsers;
+use General\Models\OfficialAccount\OfficialAccount;
 use General\Models\OfficialAccount\WechatKeywordMsgs;
 use General\Models\OfficialAccount\WechatKeywordMsgs;
 use General\Models\Order\Order;
 use General\Models\Order\Order;
+use General\Models\User\User;
 use General\Services\Order\OrderService;
 use General\Services\Order\OrderService;
 
 
 class OrderTransformer
 class OrderTransformer
@@ -22,17 +25,12 @@ class OrderTransformer
         $app_id  = $item->user && $item->user->force_subscribe_user ? $item->user->force_subscribe_user->appid : '';
         $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 : '';
         $opend_id = $item->user && $item->user->force_subscribe_user ? $item->user->force_subscribe_user->openid : '';
         if ($opend_id == ''){
         if ($opend_id == ''){
-            $res = $service->getUserOpenidsData($uid);
+            $appIds = OfficialAccount::where('distribution_channel_id',$item->distribution_channel_id)->get()->pluck('app_id')->toArray();
+            $res = $service->getUserOpenidsData($uid,$appIds);
             if ($res){
             if ($res){
                 $opend_id = $res['openid'];
                 $opend_id = $res['openid'];
             }
             }
         }
         }
-        if ($app_id == '') {
-            $res = $service->getUserOpenidsData($uid);
-            if ($res){
-                $app_id = $res['appid'];
-            }
-        }
         return [
         return [
             'uid' => $uid,
             'uid' => $uid,
             'price' => (float) $item->price,
             'price' => (float) $item->price,

+ 2 - 2
src/Services/Order/OrderService.php

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