Commit e3fb63ed authored by luhongguang's avatar luhongguang

update: 团长分销接口调整

parent a73f91f5
...@@ -167,21 +167,25 @@ class ColonelController extends Base ...@@ -167,21 +167,25 @@ class ColonelController extends Base
(new ColonelCenterValidate())->validate(); (new ColonelCenterValidate())->validate();
$params = $this->params; $params = $this->params;
$userId = $params["user_id"]; $userId = $params["user_id"];
$wechatInfo = UserService::userWechatBind(["user_id" => $userId]);
$user = []; $user = [];
if (!empty($wechatInfo)) { if (!empty($userId)) {
$user = [ $wechatInfo = UserService::userWechatBind(["user_id" => $userId]);
"user_id" => $wechatInfo[0]["user_id"], if (!empty($wechatInfo)) {
"user_nick" => $wechatInfo[0]["user_nick"], $user = [
"user_avatar" => $wechatInfo[0]["user_avatar"] "user_id" => $wechatInfo[0]["user_id"],
]; "user_nick" => $wechatInfo[0]["user_nick"],
"user_avatar" => $wechatInfo[0]["user_avatar"]
];
}
$incomeData = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => [$userId]]);
$orderNumData = PindanActivityInviteOrderService::inviteOrderNumberStatistics(["user_ids" => [$userId]]);
return $this->success(["result" => [
"income" => $incomeData[$userId],
"order_num" => $orderNumData[$userId],
"user" => $user]]);
} }
$incomeData = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => [$userId]]); return $this->success(["result" => []]);
$orderNumData = PindanActivityInviteOrderService::inviteOrderNumberStatistics(["user_ids" => [$userId]]);
return $this->success(["result" => [
"income" => $incomeData[$userId],
"order_num" => $orderNumData[$userId],
"user" => $user]]);
} }
} }
...@@ -154,12 +154,12 @@ class PindanActivityInviteOrderService ...@@ -154,12 +154,12 @@ class PindanActivityInviteOrderService
$data = []; $data = [];
foreach ($userIds as $userId) { foreach ($userIds as $userId) {
$data[$userId]["yesterday_order_num"] = 0; $data[$userId]["yesterday_order_num"] = 0;
$data[$userId]["all_order_reward"] = 0; $data[$userId]["all_order_num"] = 0;
if (!empty($yesterdayData[$userId])) { if (!empty($yesterdayData[$userId])) {
$data[$userId]["yesterday_order_num"] = $yesterdayData[$userId]["num"]; $data[$userId]["yesterday_order_num"] = $yesterdayData[$userId]["num"];
} }
if (!empty($allData[$userId])) { if (!empty($allData[$userId])) {
$data[$userId]["all_order_reward"] = $allData[$userId]["num"]; $data[$userId]["all_order_num"] = $allData[$userId]["num"];
} }
} }
return $data; return $data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment