fix(config): 校验提示信息动态适配自定义角色别名
这个提交包含在:
@@ -268,14 +268,16 @@ class Config extends Common
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if ($prev !== null && $val < $prev) {
|
if ($prev !== null && $val < $prev) {
|
||||||
$this->error('创客 V1–V6 单笔基数必须递增');
|
$makerName = !empty($save['partner_role_name_maker']) ? $save['partner_role_name_maker'] : '创客';
|
||||||
|
$this->error($makerName . ' V1–V6 单笔基数必须递增');
|
||||||
}
|
}
|
||||||
$prev = $val;
|
$prev = $val;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isset($save['partner_team_total'], $save['partner_venue_split'])
|
if (isset($save['partner_team_total'], $save['partner_venue_split'])
|
||||||
&& (float) $save['partner_venue_split'] > (float) $save['partner_team_total']) {
|
&& (float) $save['partner_venue_split'] > (float) $save['partner_team_total']) {
|
||||||
$this->error('酒道馆份额不能大于团队拆分总额');
|
$venueName = !empty($save['partner_role_name_venue']) ? $save['partner_role_name_venue'] : '酒道馆';
|
||||||
|
$this->error($venueName . '份额不能大于团队拆分总额');
|
||||||
}
|
}
|
||||||
$configs = ShoproConfig::setConfigs('shop.commission', $save);
|
$configs = ShoproConfig::setConfigs('shop.commission', $save);
|
||||||
$this->success('规则已更新,仅对之后的新订单生效。', null, $configs);
|
$this->success('规则已更新,仅对之后的新订单生效。', null, $configs);
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户