Commit 6a398fcf authored by pengfei's avatar pengfei

update 团长分销-奖励脚本

parent 7deddc45
......@@ -7,7 +7,6 @@
use App\Base\Job;
use Api\PhpServices\Idgen\Idgen;
use Api\PhpUtils\Log\FileLog;
use App\Models\marketing\mysql\ColonelDistributorColonel;
use App\Models\marketing\mysql\ColonelDistributorConfig;
use App\Models\marketing\mysql\ColonelDistributorInviteOrderNum;
......@@ -16,6 +15,7 @@ use App\Exception\custom\InterfaceException;
use Api\PhpUtils\Http\HttpUtil;
use App\Models\user\mysql\UserWechatBind;
use App\Services\marketing\PindanActivityColonelConfigService;
use Api\PhpUtils\Log\JobLog;
class ColonelorderController extends Job
{
......@@ -83,7 +83,7 @@ class ColonelorderController extends Job
if (!ColonelDistributorPayInfo::commit()) {
throw new Exception(sprintf("事务提交失败 %s", json_encode($data)));
}
$this->loggerError('success');
$this->loggerInfo('success');
} catch (Exception $e) {
ColonelDistributorPayInfo::rollback();
$this->loggerError('error=' . $e->getMessage());
......@@ -101,7 +101,7 @@ class ColonelorderController extends Job
*/
private function getInviteNewUserData($userIds, &$colonelPayInfoData)
{
if ($inviteNewUserList = $this->getInviteNewUserList($userIds,$this->startTime,$this->endTime)) {
if ($inviteNewUserList = $this->getInviteNewUserList($userIds, $this->startTime, $this->endTime)) {
$userNickList = $this->getUserList(array_column($inviteNewUserList, 'user_id'));
foreach ($inviteNewUserList as $newUser) {
$colonelPayInfoData[] = [
......@@ -155,7 +155,7 @@ class ColonelorderController extends Job
{
$config = ColonelDistributorConfig::getRecord([
'date[<=]' => $settlementDate,
'type' => ColonelDistributorConfig::TYPE_COLONEL,
'type' => ColonelDistributorConfig::TYPE_COLONEL,
'ORDER' => ['date' => 'DESC'],
'LIMIT' => 1
]);
......@@ -193,7 +193,7 @@ class ColonelorderController extends Job
* @return array
* @throws InterfaceException
*/
private function getInviteNewUserList($userIds,$startTime,$endTime): array
private function getInviteNewUserList($userIds, $startTime, $endTime): array
{
$url = config('interface', 'coupon.background.wx_invite_relation_list_by_user_ids');
if (empty($url)) {
......@@ -265,7 +265,7 @@ class ColonelorderController extends Job
*/
private function loggerInfo($log)
{
FileLog::info('colonel_distributor_order', 'colonel_distributor_order:' . $log, false, true);
JobLog::getInstance()->info('colonel_distributor_order', $log)->output();
}
/**
......@@ -276,6 +276,6 @@ class ColonelorderController extends Job
*/
private function loggerError($log)
{
FileLog::error('colonel_distributor_order', $log, null, 'bp-server@yidian-inc.com', true);
JobLog::getInstance()->error('colonel_distributor_order', $log, null, 'bp-server@yidian-inc.com')->output();
}
}
......@@ -6,10 +6,10 @@
*/
use App\Base\Job;
use Api\PhpUtils\Log\FileLog;
use App\Models\marketing\mysql\ColonelDistributorPayInfo;
use App\Exception\custom\InterfaceException;
use Api\PhpUtils\Http\HttpUtil;
use Api\PhpUtils\Log\JobLog;
class ColonelwalletController extends Job
{
......@@ -35,7 +35,7 @@ class ColonelwalletController extends Job
if ($this->handlePayInfoStatus(array_column($payInfoList, 'pay_info_id'))) {
$this->loggerInfo('success');
} else {
$this->loggerInfo('更新状态失败');
$this->loggerError('更新状态失败');
}
}
}
......@@ -202,7 +202,7 @@ class ColonelwalletController extends Job
*/
private function loggerInfo($log)
{
FileLog::info('colonel_distributor_wallet', 'colonel_distributor_wallet:' . $log, false, true);
JobLog::getInstance()->info('colonel_distributor_wallet', $log, false)->output();
}
/**
......@@ -213,6 +213,6 @@ class ColonelwalletController extends Job
*/
private function loggerError($log)
{
FileLog::error('colonel_distributor_wallet', $log, null, 'bp-server@yidian-inc.com', true);
JobLog::getInstance()->error('colonel_distributor_wallet', $log, null, 'bp-server@yidian-inc.com')->output();
}
}
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