feat(regional_agent): 完善代理佣金配置逻辑和状态管理
这个提交包含在:
可乐加冰
2026-09-12 20:49:38 +08:00
父节点 87e863ae86
当前提交 a6415f7753
共有 2 个文件被更改,包括 21 次插入 和 3 次删除

查看文件

@@ -255,9 +255,13 @@ class Agent extends Base
protected function buildCommissionData($data)
{
$useCustom = isset($data['use_custom_commission'])
? boolval($data['use_custom_commission'])
: !empty($data['commission_type']);
if (array_key_exists('use_custom_commission', $data)) {
$useCustom = filter_var($data['use_custom_commission'], FILTER_VALIDATE_BOOLEAN);
} else {
$hasRate = isset($data['commission_rate']) && $data['commission_rate'] !== '' && $data['commission_rate'] !== null;
$hasMoney = isset($data['commission_money']) && $data['commission_money'] !== '' && $data['commission_money'] !== null;
$useCustom = !empty($data['commission_type']) && ($hasRate || $hasMoney);
}
if (!$useCustom) {
return [

查看文件

@@ -11,6 +11,20 @@ class Agent extends Model
protected $createTime = 'createtime';
protected $updateTime = 'updatetime';
const STATUS_NORMAL = 'normal';
const STATUS_PENDING = 'pending';
const STATUS_FORBIDDEN = 'forbidden';
public function scopeNormal($query)
{
return $query->where('status', self::STATUS_NORMAL);
}
public function scopeAvailable($query)
{
return $query->where('status', 'in', [self::STATUS_NORMAL]);
}
public function user()
{
return $this->belongsTo(\app\admin\model\shopro\user\User::class, 'user_id', 'id');