Skip to content

G
goods
Commit c6c61bdf authored by luhongguang's avatar luhongguang
Browse files
Options

Merge branch 'colonel' into test

parents 22165a5c c961677c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 421 additions and 277 deletions
application/models/marketing/mysql/ColonelDistributorColonel.php
View file @ c6c61bdf
...@@ -20,6 +20,12 @@ class ColonelDistributorColonel extends MysqlBase ...@@ -20,6 +20,12 @@ class ColonelDistributorColonel extends MysqlBase
const DEFAULT_COLUMN = ['colonel_id','user_id','take_place_id','phone','contact_name','colonel_source']; const DEFAULT_COLUMN = ['colonel_id','user_id','take_place_id','phone','contact_name','colonel_source'];
public static function getColonelUserIds()
{
$colonelUserData = ColonelDistributorColonel::select(['user_id']);
return array_column((array)$colonelUserData, 'user_id');
}
public static function getRecord(array $where, $column = '*') public static function getRecord(array $where, $column = '*')
{ {
return self::get($column, $where); return self::get($column, $where);
......
application/models/marketing/mysql/ColonelDistributorInviteOrderNum.php
View file @ c6c61bdf
...@@ -18,6 +18,11 @@ class ColonelDistributorInviteOrderNum extends MysqlBase ...@@ -18,6 +18,11 @@ class ColonelDistributorInviteOrderNum extends MysqlBase
return self::get($columns, $where, $options); return self::get($columns, $where, $options);
} }
public static function getRecords(array $where, $column = '*')
{
return (array)self::select($column, $where);
}
public static function getRecordMaster($where, $columns = [], $options = []) public static function getRecordMaster($where, $columns = [], $options = [])
{ {
if (empty($columns)) { if (empty($columns)) {
...@@ -48,4 +53,4 @@ class ColonelDistributorInviteOrderNum extends MysqlBase ...@@ -48,4 +53,4 @@ class ColonelDistributorInviteOrderNum extends MysqlBase
{ {
return self::delete($where); return self::delete($where);
} }
} }
\ No newline at end of file
application/models/marketing/mysql/ColonelDistributorPayInfo.php
View file @ c6c61bdf
...@@ -21,6 +21,11 @@ class ColonelDistributorPayInfo extends MysqlBase ...@@ -21,6 +21,11 @@ class ColonelDistributorPayInfo extends MysqlBase
self::TYPE_FINISH_TARGET => "完成目标单数", self::TYPE_FINISH_TARGET => "完成目标单数",
]; ];
public static function getRecords(array $where, $column = '*')
{
return (array)self::select($column, $where);
}
public static function getRecord($where, $columns = [], $options = []) public static function getRecord($where, $columns = [], $options = [])
{ {
if (empty($columns)) { if (empty($columns)) {
...@@ -44,7 +49,7 @@ class ColonelDistributorPayInfo extends MysqlBase ...@@ -44,7 +49,7 @@ class ColonelDistributorPayInfo extends MysqlBase
public static function updateRecord($columns, $where) public static function updateRecord($columns, $where)
{ {
return self::update($columns, $where); return (int)self::update($columns, $where);
} }
public static function save($data, $where = [], $options = []) public static function save($data, $where = [], $options = [])
...@@ -59,4 +64,4 @@ class ColonelDistributorPayInfo extends MysqlBase ...@@ -59,4 +64,4 @@ class ColonelDistributorPayInfo extends MysqlBase
{ {
return self::delete($where); return self::delete($where);
} }
} }
\ No newline at end of file
application/services/marketing/ColonelService.php
View file @ c6c61bdf
...@@ -66,7 +66,8 @@ class ColonelService ...@@ -66,7 +66,8 @@ class ColonelService
*/ */
public static function isApply($userId): array public static function isApply($userId): array
{ {
$applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId], ['colonel_apply_id','audit_status']); $applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId],
['colonel_apply_id', 'audit_status']);
return [ return [
// -1.未申请 0.未审核 1.审核通过 2.审核未通过 // -1.未申请 0.未审核 1.审核通过 2.审核未通过
'apply_status' => isset($applyInfo['audit_status']) ? intval($applyInfo['audit_status']) : -1 'apply_status' => isset($applyInfo['audit_status']) ? intval($applyInfo['audit_status']) : -1
...@@ -83,12 +84,13 @@ class ColonelService ...@@ -83,12 +84,13 @@ class ColonelService
*/ */
public static function getManageApplyList(array $params): array public static function getManageApplyList(array $params): array
{ {
$params = self::getPageParams($params); $params = self::getPageParams($params);
$result = ColonelDistributorColonelApply::getPages([], ColonelDistributorColonelApply::DEFAULT_COLUMN, $params['page'], $params['page_size']); $result = ColonelDistributorColonelApply::getPages([], ColonelDistributorColonelApply::DEFAULT_COLUMN,
$params['page'], $params['page_size']);
if (empty($result['count'])) { if (empty($result['count'])) {
return $result; return $result;
} }
$userMap = self::getUserMap(array_column($result['result'], 'user_id')); $userMap = self::getUserMap(array_column($result['result'], 'user_id'));
$takePlaceMap = self::getColonelTakePlaceMap(array_column($result['result'], 'colonel_apply_id')); $takePlaceMap = self::getColonelTakePlaceMap(array_column($result['result'], 'colonel_apply_id'));
foreach ($result['result'] as &$applyVal) { foreach ($result['result'] as &$applyVal) {
$applyVal['user_avatar'] = !empty($userMap[$applyVal['user_id']]['user_avatar']) ? $userMap[$applyVal['user_id']]['user_avatar'] : ''; $applyVal['user_avatar'] = !empty($userMap[$applyVal['user_id']]['user_avatar']) ? $userMap[$applyVal['user_id']]['user_avatar'] : '';
...@@ -114,8 +116,9 @@ class ColonelService ...@@ -114,8 +116,9 @@ class ColonelService
*/ */
public static function getManageList(array $params): array public static function getManageList(array $params): array
{ {
$params = self::getPageParams($params); $params = self::getPageParams($params);
$result = ColonelDistributorColonel::getPages([], ColonelDistributorColonel::DEFAULT_COLUMN, $params['page'], $params['page_size']); $result = ColonelDistributorColonel::getPages([], ColonelDistributorColonel::DEFAULT_COLUMN, $params['page'],
$params['page_size']);
if (empty($result['count'])) { if (empty($result['count'])) {
return $result; return $result;
} }
...@@ -124,9 +127,9 @@ class ColonelService ...@@ -124,9 +127,9 @@ class ColonelService
$incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]); $incomeMap = PindanActivityInviteOrderService::incomeStatistics(["user_ids" => $userIds]);
foreach ($result['result'] as &$colonelVal) { foreach ($result['result'] as &$colonelVal) {
$userId = $colonelVal['user_id']; $userId = $colonelVal['user_id'];
$colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : ''; $colonelVal['user_avatar'] = !empty($userMap[$userId]['user_avatar']) ? $userMap[$userId]['user_avatar'] : '';
$colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0; $colonelVal['yesterday_income'] = !empty($incomeMap[$userId]['yesterday_reward']) ? $incomeMap[$userId]['yesterday_reward'] : 0;
$colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0; $colonelVal['total_income'] = !empty($incomeMap[$userId]['all_reward']) ? $incomeMap[$userId]['all_reward'] : 0;
} }
unset($colonelVal); unset($colonelVal);
return $result; return $result;
...@@ -144,7 +147,8 @@ class ColonelService ...@@ -144,7 +147,8 @@ class ColonelService
public static function handleManageAudit($applyId, $auditStatus): bool public static function handleManageAudit($applyId, $auditStatus): bool
{ {
// 审核状态参数检测 // 审核状态参数检测
if (!in_array($auditStatus, [ColonelDistributorColonelApply::STATUS_PASS,ColonelDistributorColonelApply::STATUS_REJECT])) { if (!in_array($auditStatus,
[ColonelDistributorColonelApply::STATUS_PASS, ColonelDistributorColonelApply::STATUS_REJECT])) {
throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS); throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS);
} }
// 审核状态数据检测 // 审核状态数据检测
...@@ -155,7 +159,8 @@ class ColonelService ...@@ -155,7 +159,8 @@ class ColonelService
try { try {
ColonelDistributorColonelApply::beginTransaction(); ColonelDistributorColonelApply::beginTransaction();
// 修改申请状态 // 修改申请状态
$updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus], ['colonel_apply_id' => $applyId,'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]); $updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus],
['colonel_apply_id' => $applyId, 'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]);
if (empty($updateStatus)) { if (empty($updateStatus)) {
throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED); throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
} }
...@@ -265,7 +270,7 @@ class ColonelService ...@@ -265,7 +270,7 @@ class ColonelService
*/ */
private static function getUserMap(array $userIds): array private static function getUserMap(array $userIds): array
{ {
$userWechatList = UserWechatBind::getRecords(['user_id' => $userIds], ['user_id','user_nick','user_avatar']); $userWechatList = UserWechatBind::getRecords(['user_id' => $userIds], ['user_id', 'user_nick', 'user_avatar']);
return array_column((array)$userWechatList, null, 'user_id'); return array_column((array)$userWechatList, null, 'user_id');
} }
...@@ -278,7 +283,8 @@ class ColonelService ...@@ -278,7 +283,8 @@ class ColonelService
*/ */
private static function getColonelTakePlaceMap(array $colonelApplyIds): array private static function getColonelTakePlaceMap(array $colonelApplyIds): array
{ {
$colonels = ColonelDistributorColonel::getRecords(['colonel_apply_id' => $colonelApplyIds], ['colonel_apply_id','take_place_id']); $colonels = ColonelDistributorColonel::getRecords(['colonel_apply_id' => $colonelApplyIds],
['colonel_apply_id', 'take_place_id']);
return array_column((array)$colonels, 'take_place_id', 'colonel_apply_id'); return array_column((array)$colonels, 'take_place_id', 'colonel_apply_id');
} }
...@@ -291,8 +297,8 @@ class ColonelService ...@@ -291,8 +297,8 @@ class ColonelService
*/ */
private static function getPageParams(array $params = []): array private static function getPageParams(array $params = []): array
{ {
$params['page'] = !empty($params['page']) ? $params['page'] : 1; $params['page'] = !empty($params['page']) ? $params['page'] : 1;
$params['page_size'] = !empty($params['page_size']) ? $params['page_size'] : 20; $params['page_size'] = !empty($params['page_size']) ? $params['page_size'] : 20;
return $params; return $params;
} }
} }
application/services/marketing/PindanActivityColonelConfigService.php
View file @ c6c61bdf
...@@ -99,14 +99,8 @@ class PindanActivityColonelConfigService ...@@ -99,14 +99,8 @@ class PindanActivityColonelConfigService
*/ */
public static function getTaskData($params = []) public static function getTaskData($params = [])
{ {
$hour = date("H"); $timeRange = self::getActivityTimeRange();
if ($hour < 10 && $hour > 0) { $date = date("Y-m-d", strtotime($timeRange["start_time"]));
$date = date("Y-m-d", strtotime("-1 day"));
} elseif ($hour > 16) {
$date = date("Y-m-d");
} else {
$date = date("Y-m-d");
}
$configList = self::colonelConfig(["date" => $date, "type" => ColonelDistributorConfig::TYPE_COLONEL]); $configList = self::colonelConfig(["date" => $date, "type" => ColonelDistributorConfig::TYPE_COLONEL]);
$marketingId = empty($configList[0]["marketing_id"]) ? 0 : $configList[0]["marketing_id"]; $marketingId = empty($configList[0]["marketing_id"]) ? 0 : $configList[0]["marketing_id"];
...@@ -144,15 +138,38 @@ class PindanActivityColonelConfigService ...@@ -144,15 +138,38 @@ class PindanActivityColonelConfigService
public static function getActivityTimeRange() : array public static function getActivityTimeRange() : array
{ {
// 获取活动时间范围 例如活动时间（2021-09-03） --- 2021-09-03:12:00:00 - 2021-09-04:12:00:00 // 获取活动时间范围 例如活动时间（2021-09-03） --- 2021-09-03:12:00:00 - 2021-09-04:12:00:00
$hour = ' '.self::ACTIVITY_DEFAULT_HOUR . ":00:00"; $hour = ' '.self::ACTIVITY_DEFAULT_HOUR . ':00:00';
if (date("H") >= 12) { if (date('H') >= self::ACTIVITY_DEFAULT_HOUR) {
$startTime = date("Y-m-d").$hour; $startTime = date('Y-m-d').$hour;
$endTime = date("Y-m-d", strtotime("+1 day")).$hour; $endTime = date('Y-m-d', strtotime('+1 day')).$hour;
} else { } else {
$startTime = date("Y-m-d", strtotime("-1 day")).$hour; $startTime = date('Y-m-d', strtotime('-1 day')).$hour;
$endTime = date("Y-m-d").$hour; $endTime = date('Y-m-d').$hour;
} }
return ['start_time' => $startTime,'end_time' => $endTime]; return [
'start_time' => $startTime,
'end_time' => $endTime,
'date' => date('Y-m-d', strtotime($startTime))
];
}
/**
* Notes: 获取结算时间范围
* User: pengfei@yidian-inc.com
* Date: 2021/9/3 2:50 下午
* @return string[]
*/
public static function getSettlementTimeRange() : array
{
// 获取活动时间范围 例如当前时间（2021-09-03 12:00:00） 应结算时间为 2021-08-31-:12:00:00 - 2021-09-01:12:00:00
$hour = ' '.self::ACTIVITY_DEFAULT_HOUR . ':00:00';
$startTime = date('Y-m-d', strtotime('-3 day')).$hour;
$endTime = date('Y-m-d', strtotime('-2 day')).$hour;
return [
'start_time' => $startTime,
'end_time' => $endTime,
'date' => date('Y-m-d', strtotime($startTime))
];
} }
} }
\ No newline at end of file
composer.json
View file @ c6c61bdf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"require": { "require": {
"php": "7.2.*", "php": "7.2.*",
"ext-json": "*", "ext-json": "*",
"api/php_utils":"1.0.14", "api/php_utils":"1.0.15",
"api/php_services":"1.0.13", "api/php_services":"1.0.13",
"ext-openssl": "*" "ext-openssl": "*"
}, },
......
composer.lock
View file @ c6c61bdf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "27230da37f9a20daffbb900882abde53", "content-hash": "a7741f079784d6a5d991f5e205ec4307",
"packages": [ "packages": [
{ {
"name": "api/php_services", "name": "api/php_services",
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
}, },
{ {
"name": "api/php_utils", "name": "api/php_utils",
"version": "v1.0.14", "version": "v1.0.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git", "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "a7bc4caaaee7aa1650e3055630860699c7fbc506" "reference": "feb1de3de8f74171202237e1443f8a395038b8d7"
}, },
"require": { "require": {
"elasticsearch/elasticsearch": "~7.0", "elasticsearch/elasticsearch": "~7.0",
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
}, },
"description": "bp api php_utils", "description": "bp api php_utils",
"time": "2021-09-01T03:11:17+00:00" "time": "2021-09-03T08:58:11+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",
......
vendor/api/php_utils/src/Http/HttpUtil.php
View file @ c6c61bdf
...@@ -61,7 +61,7 @@ class HttpUtil ...@@ -61,7 +61,7 @@ class HttpUtil
{ {
// 增加traceId // 增加traceId
if(is_array($headers)) { if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId(); $headers[] = 'X-TRACE-ID: ' . Tracer::getTraceId();
} }
$url = $url ."?". http_build_query($params); $url = $url ."?". http_build_query($params);
return self::curl($url, $timeout, $retries, $headers, [], $proxy, 'GET', $curl_opts); return self::curl($url, $timeout, $retries, $headers, [], $proxy, 'GET', $curl_opts);
...@@ -97,7 +97,7 @@ class HttpUtil ...@@ -97,7 +97,7 @@ class HttpUtil
{ {
// 增加traceId // 增加traceId
if(is_array($headers)) { if(is_array($headers)) {
$headers['X-TRACE-ID'] = Tracer::getTraceId(); $headers[] = 'X-TRACE-ID: ' . Tracer::getTraceId();
} }
return self::curl($url, $timeout, $retries, $headers, $post, $proxy, 'POST', $curl_opts); return self::curl($url, $timeout, $retries, $headers, $post, $proxy, 'POST', $curl_opts);
} }
......
vendor/composer/InstalledVersions.php
View file @ c6c61bdf
...@@ -32,7 +32,7 @@ private static $installed = array ( ...@@ -32,7 +32,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb', 'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
'name' => 'yidian/yaf_demo', 'name' => 'yidian/yaf_demo',
), ),
'versions' => 'versions' =>
...@@ -48,12 +48,12 @@ private static $installed = array ( ...@@ -48,12 +48,12 @@ private static $installed = array (
), ),
'api/php_utils' => 'api/php_utils' =>
array ( array (
'pretty_version' => 'v1.0.14', 'pretty_version' => 'v1.0.15',
'version' => '1.0.14.0', 'version' => '1.0.15.0',
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => 'a7bc4caaaee7aa1650e3055630860699c7fbc506', 'reference' => 'feb1de3de8f74171202237e1443f8a395038b8d7',
), ),
'bacon/bacon-qr-code' => 'bacon/bacon-qr-code' =>
array ( array (
...@@ -332,7 +332,7 @@ private static $installed = array ( ...@@ -332,7 +332,7 @@ private static $installed = array (
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb', 'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
), ),
), ),
); );
......
vendor/composer/installed.json
View file @ c6c61bdf
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
}, },
{ {
"name": "api/php_utils", "name": "api/php_utils",
"version": "v1.0.14", "version": "v1.0.15",
"version_normalized": "1.0.14.0", "version_normalized": "1.0.15.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.yidian-inc.com:8021/bp/php_utils.git", "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
"reference": "a7bc4caaaee7aa1650e3055630860699c7fbc506" "reference": "feb1de3de8f74171202237e1443f8a395038b8d7"
}, },
"require": { "require": {
"elasticsearch/elasticsearch": "~7.0", "elasticsearch/elasticsearch": "~7.0",
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
"mongodb/mongodb": "1.4.3", "mongodb/mongodb": "1.4.3",
"php": "7.2.*" "php": "7.2.*"
}, },
"time": "2021-09-01T03:11:17+00:00", "time": "2021-09-03T08:58:11+00:00",
"type": "library", "type": "library",
"installation-source": "source", "installation-source": "source",
"autoload": { "autoload": {
......
vendor/composer/installed.php
View file @ c6c61bdf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb', 'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
'name' => 'yidian/yaf_demo', 'name' => 'yidian/yaf_demo',
), ),
'versions' => 'versions' =>
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
), ),
'api/php_utils' => 'api/php_utils' =>
array ( array (
'pretty_version' => 'v1.0.14', 'pretty_version' => 'v1.0.15',
'version' => '1.0.14.0', 'version' => '1.0.15.0',
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => 'a7bc4caaaee7aa1650e3055630860699c7fbc506', 'reference' => 'feb1de3de8f74171202237e1443f8a395038b8d7',
), ),
'bacon/bacon-qr-code' => 'bacon/bacon-qr-code' =>
array ( array (
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
'aliases' => 'aliases' =>
array ( array (
), ),
'reference' => '5b271e605f425df64cb7d8d019fa921c045caceb', 'reference' => 'bdf89778ba6a83a43c24ce687bdd41b5057a7532',
), ),
), ),
); );
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