diff --git a/app/admin/lists/withdraw/MerchantWithdrawLists.php b/app/admin/lists/withdraw/MerchantWithdrawLists.php index d456884..0607ff6 100644 --- a/app/admin/lists/withdraw/MerchantWithdrawLists.php +++ b/app/admin/lists/withdraw/MerchantWithdrawLists.php @@ -48,7 +48,7 @@ class MerchantWithdrawLists extends BaseAdminDataLists implements ListsSearchInt public function lists(): array { return MerchantWithdraw::where($this->searchWhere) - ->field(['id', 'mer_id', 'supplier_id', 'merchant_bank_id', 'amount', 'is_check', 'is_arrival', 'arrival_proof', 'admin_id']) + ->field(['id', 'mer_id', 'supplier_id', 'merchant_bank_id', 'amount', 'is_check', 'is_arrival', 'arrival_proof', 'admin_id','create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ diff --git a/app/admin/logic/merchant/MerchantLogic.php b/app/admin/logic/merchant/MerchantLogic.php index a927e2a..7ca25d5 100644 --- a/app/admin/logic/merchant/MerchantLogic.php +++ b/app/admin/logic/merchant/MerchantLogic.php @@ -53,7 +53,6 @@ class MerchantLogic extends BaseLogic 'long' => $params['long'] ?? '', 'lat' => $params['lat'] ?? '', 'service_phone' => $params['phone'], - 'service_user' => $params['service_user'] ?? '', 'financial_bank' => $params['financial_bank'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '', 'financial_alipay' => $params['financial_alipay'] ?? '', @@ -110,7 +109,6 @@ class MerchantLogic extends BaseLogic 'long' => $params['long'] ?? '', 'lat' => $params['lat'] ?? '', 'service_phone' => $params['phone'], - 'service_user' => $params['service_user']??'', 'financial_bank' => $params['financial_bank'] ?? '', 'financial_wechat' => $params['financial_wechat'] ?? '', 'financial_alipay' => $params['financial_alipay'] ?? '', diff --git a/app/admin/validate/merchant/MerchantValidate.php b/app/admin/validate/merchant/MerchantValidate.php index f3a456e..b41166c 100644 --- a/app/admin/validate/merchant/MerchantValidate.php +++ b/app/admin/validate/merchant/MerchantValidate.php @@ -31,7 +31,6 @@ class MerchantValidate extends BaseValidate 'sort' => 'require', 'status' => 'require|in:0,1', 'service_phone' => 'require|mobile', - 'service_user' => 'require', 'mer_money' => 'require|float', 'commission_switch' => 'in:0,1', 'financial_type' => 'in:1,2,3', @@ -55,7 +54,6 @@ class MerchantValidate extends BaseValidate 'sort' => 'sort', 'status' => '商户是否禁用0锁定,1正常', 'service_phone' => '店铺电话', - 'service_user' => '店主姓名', 'mer_money' => '商户余额', 'commission_switch' => '商户手续费单独设置', 'financial_type' => '默认使用类型', diff --git a/app/api/lists/merchant/MerchantLists.php b/app/api/lists/merchant/MerchantLists.php index 5654e3e..897bcd6 100644 --- a/app/api/lists/merchant/MerchantLists.php +++ b/app/api/lists/merchant/MerchantLists.php @@ -53,7 +53,7 @@ class MerchantLists extends BaseAdminDataLists implements ListsSearchInterface ) ASC "); } return Merchant::where($this->searchWhere) - ->field('mer_id,mer_name,long,lat,service_phone,service_user,mer_address') + ->field('mer_id,mer_name,long,lat,service_phone,mer_address') ->limit($this->limitOffset, $this->limitLength) ->order($order) ->select()