mkm/erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '后台添加商铺是新增联系人姓名' (#4) from dev into master

Browse Source 
Reviewed-on: #4
This commit is contained in:
weiz 2024-05-07 11:19:26 +08:00
commit 1113b18e4f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/lists/merchat/MerchantLists.php
View File

@ -26,7 +26,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array
{
return [
'=' => ['category_id', 'type_id', 'mer_name', 'credit_buy', 'status', 'commission_rate', 'service_phone', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'],
'=' => ['category_id', 'type_id', 'mer_name', 'credit_buy', 'status', 'commission_rate', 'service_phone','service_user', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'],
];
}
@ -43,7 +43,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface
public function lists(): array
{
return Merchant::where($this->searchWhere)
->field(['mer_id', 'category_id', 'type_id', 'mer_name', 'credit_buy', 'settle_cycle', 'interest_rate', 'city_id', 'area_id', 'street_id', 'village_id', 'mer_address', 'mer_avatar', 'mark', 'commission_rate', 'service_phone', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'])
->field(['mer_id', 'category_id', 'type_id', 'mer_name', 'credit_buy', 'settle_cycle', 'interest_rate', 'city_id', 'area_id', 'street_id', 'village_id', 'mer_address', 'mer_avatar', 'mark', 'commission_rate', 'service_phone','service_user', 'mer_money', 'financial_bank', 'financial_wechat', 'financial_alipay'])
->limit($this->limitOffset, $this->limitLength)
->order(['mer_id' => 'desc'])
->select()

2
app/admin/logic/merchat/MerchantLogic.php
View File

@ -50,6 +50,7 @@ class MerchantLogic extends BaseLogic
'long' => $params['long'],
'lat' => $params['lat'],
'service_phone' => $params['service_phone'],
'service_user' => $params['service_user'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],
@ -99,6 +100,7 @@ class MerchantLogic extends BaseLogic
'long' => $params['long'],
'lat' => $params['lat'],
'service_phone' => $params['service_phone'],
'service_user' => $params['service_user'],
'mer_money' => $params['mer_money'],
'financial_bank' => $params['financial_bank'],
'financial_wechat' => $params['financial_wechat'],

6
app/admin/validate/merchat/MerchantValidate.php
View File

@ -30,6 +30,7 @@ class MerchantValidate extends BaseValidate
'sort' => 'require',
'status' => 'require',
'service_phone' => 'require',
'service_user' => 'require',
'mer_money' => 'require',
];
@ -50,6 +51,7 @@ class MerchantValidate extends BaseValidate
'sort' => 'sort',
'status' => '商户是否禁用0锁定,1正常',
'service_phone' => '店铺电话',
'service_user' => '店主姓名',
'mer_money' => '商户余额',
];
@ -62,7 +64,7 @@ class MerchantValidate extends BaseValidate
*/
public function sceneAdd()
{
return $this->only(['category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','mer_money']);
return $this->only(['category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
}
@ -74,7 +76,7 @@ class MerchantValidate extends BaseValidate
*/
public function sceneEdit()
{
return $this->only(['mer_id','category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','mer_money']);
return $this->only(['mer_id','category_id','mer_name','credit_buy','settle_cycle','interest_rate','mer_address','mark','sort','status','service_phone','service_user','mer_money']);
}