diff --git a/app/Admin/Forms/Settings/Dealer.php b/app/Admin/Forms/Settings/Dealer.php index bb653bfe..7ebf1b22 100644 --- a/app/Admin/Forms/Settings/Dealer.php +++ b/app/Admin/Forms/Settings/Dealer.php @@ -2,6 +2,7 @@ namespace App\Admin\Forms\Settings; +use App\Enums\DealerLvl; use App\Models\Setting; use App\Services\SettingService; use Carbon\Carbon; @@ -37,6 +38,9 @@ class Dealer extends Form public function form() { $this->currency('fee_rate', '手续费比例(百分比)')->symbol('%'); + $this->currency('upgrade_amount_'.DealerLvl::Contracted->value, '签约门槛')->symbol('¥'); + $this->currency('upgrade_amount_'.DealerLvl::Special->value, '特邀门槛')->symbol('¥'); + $this->currency('upgrade_amount_'.DealerLvl::Gold->value, '金牌门槛')->symbol('¥'); $this->table('purchase_rules', '进货补贴规则', function ($table) { $table->number('price', '阶梯(万)'); $table->currency('rate', '比例(百分比)')->symbol('%'); @@ -80,6 +84,9 @@ class Dealer extends Form $dealerSettings = (array) Setting::where('key', 'dealer')->value('value'); return [ 'fee_rate'=>$dealerSettings['fee_rate'] ?? '', + 'upgrade_amount_'.DealerLvl::Contracted->value => $dealerSettings['upgrade_amount_'.DealerLvl::Contracted->value], + 'upgrade_amount_'.DealerLvl::Special->value => $dealerSettings['upgrade_amount_'.DealerLvl::Special->value], + 'upgrade_amount_'.DealerLvl::Gold->value => $dealerSettings['upgrade_amount_'.DealerLvl::Gold->value], 'bank'=>$dealerSettings['bank'] ?? [], 'alipay'=>$dealerSettings['alipay'] ?? [], 'wechat' =>$dealerSettings['wechat'] ?? [], diff --git a/app/Endpoint/Api/Http/Resources/Dealer/DealerResource.php b/app/Endpoint/Api/Http/Resources/Dealer/DealerResource.php index 3313df7e..d64f3f5b 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/DealerResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/DealerResource.php @@ -19,7 +19,7 @@ class DealerResource extends JsonResource 'lvl_name'=> $this->lvl_text, 'sale_values'=> '0.00', //todo-当前团队业绩 'guanli_values'=> '0.00', //todo-预计管理津贴 - 'pay_info'=>$this->pay_info??null, + 'pay_info'=>$this->pay_info ?: null, ]; } } diff --git a/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php b/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php index da974bcb..ea808ec0 100644 --- a/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php +++ b/app/Endpoint/Api/Http/Resources/Dealer/OrderResource.php @@ -21,7 +21,7 @@ class OrderResource extends JsonResource 'total_amount' => $this->total_amount, 'created_at' => $this->created_at->toDateTimeString(), 'status' => $this->status, - 'pay_info' => $this->getConsignorPayInfo()??null, + 'pay_info' => $this->getConsignorPayInfo(), 'pay_image'=> $this->pay_image, 'is_consignor' => $request->user()->id == $this->consignor_id, //是否发货人身份 'consignee_name'=>$this->consignee_name, diff --git a/app/Models/DealerOrder.php b/app/Models/DealerOrder.php index fd7116d6..8696edbe 100644 --- a/app/Models/DealerOrder.php +++ b/app/Models/DealerOrder.php @@ -230,6 +230,6 @@ class DealerOrder extends Model } else { $payInfo = $this->pay_info; } - return $payInfo; + return $payInfo ?: null; } }