Commit 9b098d34 authored by luhongguang's avatar luhongguang

update: colonelconfig

parent 1ec788b3
......@@ -19,7 +19,7 @@ class PindanActivityColonelConfigService
{
$date = $params["date"];
$type = empty($params["type"]) ? ColonelDistributorConfig::TYPE_COLONEL : $params["type"];
$configList = json_decode($params["config"], true);
$configList = $params["config"];
if (empty($configList)) {
throw new MarketingException(['cus' => MarketingException::COLONEL_CONFIG_NULL]);
......@@ -30,21 +30,21 @@ class PindanActivityColonelConfigService
}
ColonelDistributorConfig::beginTransaction();
$idsRes = ColonelDistributorConfig::select(["colonel_config_id"], ["date" => $date, "type" => $type], []);
if (!empty($idsRes)) {
$ids = array_column($idsRes, "colonel_config_id");
ColonelDistributorConfig::deleteRecord(["colonel_config_id" => $ids]);
$idRes = ColonelDistributorConfig::getRecord(["date" => $date, "type" => $type], ["colonel_config_id"]);
if (!empty($idRes)) {
ColonelDistributorConfig::save([
"date" => $date,
"type" => $type,
"data" => $configList,
], $idRes["colonel_config_id"]);
} else {
ColonelDistributorConfig::save([
"date" => $date,
"type" => $type,
"data" => $configList,
]);
}
$data = [];
foreach ($configList as $key => $item) {
$data[$key]["date"] = $date;
$data[$key]["level"] = $item["level"];
$data[$key]["assess_order_num"] = $item["assess_order_num"];
$data[$key]["reward_amount"] = $item["reward_amount"];
}
ColonelDistributorConfig::save($data);
if (!ColonelDistributorConfig::commit()) {
ColonelDistributorConfig::rollback();
throw new MarketingException(["cus" => 5]);
......@@ -62,13 +62,13 @@ class PindanActivityColonelConfigService
{
$day = empty($params["date"]) ? date("Y-m-d") : $params["date"];
$type = empty($params["type"]) ? ColonelDistributorConfig::TYPE_COLONEL : $params["type"];
$list = ColonelDistributorConfig::select("*", ["date" => $day, "type" => $type], []);
$config = ColonelDistributorConfig::getRecord(["date" => $day, "type" => $type]);
$data = [];
if (!empty($list)) {
foreach ($list as $key => $item) {
$data[$key]["colonel_config_id"] = $item["colonel_config_id"];
$data[$key]["date"] = $item["date"];
if (!empty($config)) {
$configData = json_decode($config["data"], true);
foreach ($configData as $key => $item) {
$data[$key]["date"] = $config["date"];
$data[$key]["level"] = $item["level"];
$data[$key]["assess_order_num"] = $item["assess_order_num"];
$data[$key]["reward_amount"] = $item["reward_amount"];
......
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