Skip to content

G
goods
Commit 74cacad8 authored by pengfei's avatar pengfei
Browse files
Options

update 团长分销-奖励结算脚本

parent ef4c6cbe
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 65 deletions
application/modules/Job/controllers/Colonelorder.php
View file @ 74cacad8
......@@ -104,16 +104,16 @@ class ColonelorderController extends Job
private function getInviteNewUserData($userIds, &$colonelPayInfoData)
{
if ($inviteNewUserList = $this->getInviteNewUserList($userIds)) {
$userNickList = $this->getUserList(array_column($inviteNewUserList, "user_id"));
$userNickList = $this->getUserList(array_column($inviteNewUserList, 'user_id'));
foreach ($inviteNewUserList as $newUser) {
$payInfo = [
"colonel_user_id" => $newUser["inviter_user_id"],
"date" => $this->settlementDate,
"type" => ColonelDistributorPayInfo::TYPE_NEW_USER,
"reward" => self::INVITE_NEW_USER_REWARD,
"finish_num" => 1,
"invite_user_id" => $newUser["user_id"],
"invite_user_nick" => empty($userNickList[$newUser["user_id"]]["user_nick"]) ? "" : $userNickList[$newUser["user_id"]]["user_nick"],
'colonel_user_id' => $newUser['inviter_user_id'],
'date' => $this->settlementDate,
'type' => ColonelDistributorPayInfo::TYPE_NEW_USER,
'reward' => self::INVITE_NEW_USER_REWARD,
'finish_num' => 1,
'invite_user_id' => $newUser['user_id'],
'invite_user_nick' => empty($userNickList[$newUser['user_id']]['user_nick']) ? '' : $userNickList[$newUser['user_id']]['user_nick'],
];
$colonelPayInfoData[] = $payInfo;
}
......@@ -133,15 +133,15 @@ class ColonelorderController extends Job
$inviteOrderNumList = $this->getInviteOrderNum($userIds, $this->settlementDate);
foreach ($inviteOrderNumList as $orderNum) {
foreach ($this->colonelConfigList as $config) {
if ($orderNum["num"] >= $config["assess_order_num"]) {
if ($orderNum['num'] >= $config['assess_order_num']) {
$payInfo = [
"colonel_user_id" => $orderNum["colonel_user_id"],
"date" => $this->settlementDate,
"type" => ColonelDistributorPayInfo::TYPE_FINISH_TARGET,
"reward" => $config["reward_amount"] * self::REWARD_UNIT,
"finish_num" => $config["assess_order_num"],
"invite_user_id" => 0,
"invite_user_nick" => "",
'colonel_user_id' => $orderNum['colonel_user_id'],
'date' => $this->settlementDate,
'type' => ColonelDistributorPayInfo::TYPE_FINISH_TARGET,
'reward' => $config['reward_amount'] * self::REWARD_UNIT,
'finish_num' => $config['assess_order_num'],
'invite_user_id' => 0,
'invite_user_nick' => '',
];
$colonelPayInfoData[] = $payInfo;
}
......@@ -157,13 +157,12 @@ class ColonelorderController extends Job
*/
private function getColonelConfig($yesterday): array
{
$type = empty($params["type"]) ? ColonelDistributorConfig::TYPE_COLONEL : $params["type"];
$config = ColonelDistributorConfig::getRecord(["date" => $yesterday, "type" => $type]);
$config = ColonelDistributorConfig::getRecord(['date' => $yesterday, 'type' => ColonelDistributorConfig::TYPE_COLONEL]);
if (empty($config)) {
$config = ColonelDistributorConfig::getRecord([
"date[<=]" => $yesterday,
"ORDER" => ["date" => "DESC"],
"LIMIT" => 1
'date[<=]' => $yesterday,
'ORDER' => ['date' => 'DESC'],
'LIMIT' => 1
]);
}
return (array)$config;
......@@ -179,10 +178,10 @@ class ColonelorderController extends Job
{
return ColonelDistributorInviteOrderNum::getRecords(
[
"colonel_user_id" => $colonelUserIds,
"date" => $date,
'colonel_user_id' => $colonelUserIds,
'date' => $date,
],
["colonel_user_id", "num"]
['colonel_user_id', 'num']
);
}
......@@ -219,12 +218,12 @@ class ColonelorderController extends Job
{
$count = count($data);
$res = Idgen::get(appConfig('idgen.partner'), appConfig('idgen.key'), [], [[
"type" => "goods",
'type' => 'goods',
'number' => 00,
"count" => $count]]);
$ids = $res['id_datetime']["goods"] ?? [];
'count' => $count]]);
$ids = $res['id_datetime']['goods'] ?? [];
foreach ($data as $key => $item) {
$data[$key]["colonel_distributor_pay_info_id"] = $ids[$key];
$data[$key]['colonel_distributor_pay_info_id'] = $ids[$key];
}
return $data;
}
......@@ -262,7 +261,7 @@ class ColonelorderController extends Job
*/
private function loggerInfo($log)
{
FileLog::info("colonel_distributor_order", 'colonel_distributor_order:'.$log, false, true);
FileLog::info('colonel_distributor_order', 'colonel_distributor_order:'.$log, false, true);
}
/**
......@@ -273,6 +272,6 @@ class ColonelorderController extends Job
*/
private function loggerError($log)
{
FileLog::info("colonel_distributor_order", 'colonel_distributor_order:'.$log, false, true);
FileLog::error('colonel_distributor_order', $log, null, 'bp-server@yidian-inc.com', true);
}
}
application/modules/Job/controllers/Colonelwallet.php
View file @ 74cacad8
......@@ -55,22 +55,22 @@ class ColonelwalletController extends Job
$data = [];
foreach ($payInfoList as $payInfo) {
$tmp = [];
$tmp["user_id"] = $payInfo["colonel_user_id"];
$tmp["service_name"] = self::WALLET_SERVICE_NAME;
$tmp["source_name"] = self::WALLET_SOURCE_NAME;
$tmp["third_order_id"] = $payInfo["colonel_distributor_pay_info_id"];
$tmp["third_order_id_type"] = $payInfo["type"];
$tmp["third_order_desc"] = self::getThirdOrderDesc($payInfo);
$tmp["amount"] = $payInfo["reward"];
$tmp["extra"] = $payInfo;
$tmp['user_id'] = $payInfo['colonel_user_id'];
$tmp['service_name'] = self::WALLET_SERVICE_NAME;
$tmp['source_name'] = self::WALLET_SOURCE_NAME;
$tmp['third_order_id'] = $payInfo['colonel_distributor_pay_info_id'];
$tmp['third_order_id_type'] = $payInfo['type'];
$tmp['third_order_desc'] = self::getThirdOrderDesc($payInfo);
$tmp['amount'] = $payInfo['reward'];
$tmp['extra'] = $payInfo;
$data[] = $tmp;
}
$res = HttpUtil::post($url, ["list" => $data]);
if (!empty($res['response']["result"]) && $res['code'] == 0) {
$res = HttpUtil::post($url, ['list' => $data]);
if (!empty($res['response']['result']) && $res['code'] == 0) {
$this->loggerInfo('写入钱包成功');
return true;
} else {
$msg = json_encode(["list" => $data]);
$msg = json_encode(['list' => $data]);
$this->loggerError($msg);
return false;
}
......@@ -90,23 +90,23 @@ class ColonelwalletController extends Job
if (!$url = config('interface', 'coupon.capitalpool.grant_user_amount')) {
throw new InterfaceException(['cus' => 0]);
}
$data["capital_pool_id"] = self::CAPITAL_POOL_ID;
$data['capital_pool_id'] = self::CAPITAL_POOL_ID;
foreach ($payInfoList as $payInfo) {
$tmp = [];
$tmp["op"] = self::CAPITAL_POOL_OP;
$tmp["user_id"] = $payInfo["colonel_user_id"];
$tmp["amount"] = $payInfo["reward"];
$tmp["third_order_id"] = $payInfo["colonel_distributor_pay_info_id"];
$tmp["third_order_id_type"] = $payInfo["type"];
$tmp["third_order_desc"] = self::getThirdOrderDesc($payInfo);
$data["body"][] = $tmp;
$tmp['op'] = self::CAPITAL_POOL_OP;
$tmp['user_id'] = $payInfo['colonel_user_id'];
$tmp['amount'] = $payInfo['reward'];
$tmp['third_order_id'] = $payInfo['colonel_distributor_pay_info_id'];
$tmp['third_order_id_type'] = $payInfo['type'];
$tmp['third_order_desc'] = self::getThirdOrderDesc($payInfo);
$data['body'][] = $tmp;
}
$res = HttpUtil::post($url, $data, 100000, 3);
if ($res['code'] == 0 && isset($res['response']["result"])) {
if ($res['code'] == 0 && isset($res['response']['result'])) {
$this->loggerInfo('资金池授予用户奖励成功,count='.count($payInfoList));
return true;
} else {
$msg = json_encode(["list" => $data]);
$msg = json_encode(['list' => $data]);
$this->loggerError("资金池授予用户奖励成功,$msg");
return false;
}
......@@ -127,9 +127,9 @@ class ColonelwalletController extends Job
private function getThirdOrderDesc($payInfo): string
{
$desc = '';
if ($payInfo["type"] == ColonelDistributorPayInfo::TYPE_NEW_USER) {
if ($payInfo['type'] == ColonelDistributorPayInfo::TYPE_NEW_USER) {
$desc = "邀请新用户（".$payInfo["invite_user_nick"]."）完成下单奖励";
} elseif ($payInfo["type"] == ColonelDistributorPayInfo::TYPE_FINISH_TARGET) {
} elseif ($payInfo['type'] == ColonelDistributorPayInfo::TYPE_FINISH_TARGET) {
$desc = "完成".$payInfo["finish_num"]."单用户下单奖励";
}
return $desc;
......@@ -155,7 +155,7 @@ class ColonelwalletController extends Job
*/
private function loggerInfo($log)
{
FileLog::error("colonel_distributor_wallet", 'colonel_distributor_wallet:'.$log, false, true);
FileLog::info('colonel_distributor_wallet', 'colonel_distributor_wallet:'.$log, false, true);
}
/**
......@@ -166,6 +166,6 @@ class ColonelwalletController extends Job
*/
private function loggerError($log)
{
FileLog::error("colonel_distributor_deducting_inventory", $log, null, 'bp-server@yidian-inc.com', true);
FileLog::error('colonel_distributor_wallet', $log, null, 'bp-server@yidian-inc.com', true);
}
}
application/services/marketing/PindanActivityColonelConfigService.php
View file @ 74cacad8
......@@ -144,13 +144,13 @@ class PindanActivityColonelConfigService
public static function getActivityTimeRange() : array
{
// 获取活动时间范围 例如活动时间（2021-09-03） --- 2021-09-03:12:00:00 - 2021-09-04:12:00:00
$hour = ' '.self::ACTIVITY_DEFAULT_HOUR . ":00:00";
if (date("H") >= 12) {
$startTime = date("Y-m-d").$hour;
$endTime = date("Y-m-d", strtotime("+1 day")).$hour;
$hour = ' '.self::ACTIVITY_DEFAULT_HOUR . ':00:00';
if (date('H') >= 12) {
$startTime = date('Y-m-d').$hour;
$endTime = date('Y-m-d', strtotime('+1 day')).$hour;
} else {
$startTime = date("Y-m-d", strtotime("-1 day")).$hour;
$endTime = date("Y-m-d").$hour;
$startTime = date('Y-m-d', strtotime('-1 day')).$hour;
$endTime = date('Y-m-d').$hour;
}
return [
'start_time' => $startTime,
......@@ -167,10 +167,10 @@ class PindanActivityColonelConfigService
*/
public static function getSettlementTimeRange() : array
{
// 获取活动时间范围 例如当前时间（2021-09-03 12:00:00） 应结算时间为 2021-09-01:12:00:00 - 2021-09-02: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;
// 获取活动时间范围 例如当前时间（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,
......
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