|
@@ -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,
|