mkm/nk-lihaink-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

退回保证金bug修复中

Browse Source
This commit is contained in:
liuxiaoquan 2023-03-16 01:18:12 +08:00
parent 568534719e
commit 3e2a2915e4
5 changed files with 261 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/admin/controller/merchant/system/financial/Financial.php
View File

@ -10,31 +10,55 @@ declare (strict_types = 1);
namespace app\admin\controller\merchant\system\financial;
use think\App;
use think\Request;
use app\admin\BaseController;
use app\common\model\merchant\system\financial\Financial as FinancialModel;
class Financial extends BaseController
{
protected $model;
public function __construct(App $app, FinancialModel $model)
{
parent::__construct($app);
$this->model = $model;
}
/**
* 保证金退还记录
*/
public function lst()
{
[$page, $limit] = $this->getPage();
$where = $this->request->params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$page = get_params('page');
$limit = get_params('limit');
// 查询条件
$where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$where['type'] = 0;
$data = $this->repository->getAdminList($where,$page,$limit);
return app('json')->success($data);
// 获取记录
$data = $this->model->getAdminList($where,$page,$limit);
return to_assign(0, '', $data);
}
/**
* 获取保证金退还记录列表
*/
public function getMarginLst()
{
[$page, $limit] = $this->getPage();
$where = $this->request->params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$page = (int)get_params('page');
$limit = (int)get_params('limit');
$where = get_params(['date','status','financial_type','financial_status','keyword','is_trader','mer_id']);
$where['type'] = 1;
$data = $this->repository->getAdminList($where,$page,$limit);
return app('json')->success($data);
// 获取记录
$data = $this->model->getAdminList($where, $page, $limit);
return to_assign(0, '', $data);
}

12
app/admin/route/merchant.php
View File

@ -164,30 +164,30 @@ Route::group(function(){
// 保证金退还
Route::group('margin/refund', function(){
//退款申请
Route::get('lst', 'financial.Financial/getMarginLst')->name('systemMarginRefundList')->option([
Route::get('lst', '/getMarginLst')->name('systemMarginRefundList')->option([
'_alias' => '退款申请列表',
]);
Route::get('refund/show/:id', 'financial.Financial/refundShow')->name('systemMarginRefundShow')->option([
Route::get('refund/show/:id', '/refundShow')->name('systemMarginRefundShow')->option([
'_alias' => '退款申请详情',
]);
// //审核
Route::get('refund/status/:id/form', 'financial.Financial/statusForm')->name('systemMarginRefundSwitchStatusForm')->option([
Route::get('refund/status/:id/form', '/statusForm')->name('systemMarginRefundSwitchStatusForm')->option([
'_alias' => '审核表单',
'_auth' => false,
'_form' => 'systemMarginRefundSwitchStatus',
]);
Route::post('refund/status/:id', 'financial.Financial/switchStatus')->name('systemMarginRefundSwitchStatus')->append(['type' => 1])->option([
Route::post('refund/status/:id', '/switchStatus')->name('systemMarginRefundSwitchStatus')->append(['type' => 1])->option([
'_alias' => '审核',
]);
// //备注
Route::get('refund/mark/:id/form', 'financial.Financial/markMarginForm')->name('systemMarginRefundMarkForm')->option([
Route::get('refund/mark/:id/form', '/markMarginForm')->name('systemMarginRefundMarkForm')->option([
'_alias' => '备注表单',
'_auth' => false,
'_form' => 'systemMarginRefundMark',
]);
Route::post('refund/mark/:id', 'financial.Financial/mark')->name('systemMarginRefundMark')->option([
Route::post('refund/mark/:id', '/mark')->name('systemMarginRefundMark')->option([
'_alias' => '备注',
]);
})->prefix('merchant.system.financial.Financial')->option([

44
app/common/model/merchant/system/admin/Admin.php Normal file
View File

@ -0,0 +1,44 @@
<?php
declare (strict_types = 1);
/**
* 管理 model
* 说明： 店铺类型 相关（不同类型需要不同的保证金）
* @author：刘孝全
* @email：q8197264@126.com
* @date ：2023年03月3日
*/
namespace app\common\model\merchant\system\admin;
use think\Model;
use app\common\model\merchant\system\auth\Role;
/**
* @mixin \think\Model
*/
class Admin extends Model
{
protected $connection = 'shop';
protected $table = 'system_admin';
protected $pk = 'admin_id';
public function getRolesAttr($value)
{
return array_map('intval', explode(',', $value));
}
public function setRolesAttr($value)
{
return implode(',', $value);
}
public function roleNames($isArray = false)
{
$roleNames = Role::whereIn('role_id', $this->roles)->column('role_name');
return $isArray ? $roleNames : implode(',', $roleNames);
}
public function searchRealNameAttr($query,$value)
{
$query->whereLike('real_name',"%{$value}%");
}
}

8
app/common/model/merchant/system/auth/Role.php
View File

@ -1,6 +1,12 @@
<?php
declare (strict_types = 1);
/**
* 用户角色 model
* 说明： 店铺类型 相关（不同类型需要不同的保证金）
* @author：刘孝全
* @email：q8197264@126.com
* @date ：2023年03月3日
*/
namespace aapp\common\model\merchant\system\auth;
use think\Model;

172
app/common/model/merchant/system/financial/Financial.php Normal file
View File

@ -0,0 +1,172 @@
<?php
declare (strict_types = 1);
/**
* 保证金退款 model
* 说明： 店铺类型 相关（不同类型需要不同的保证金）
* @author：刘孝全
* @email：q8197264@126.com
* @date ：2023年03月3日
*/
namespace app\common\model\merchant\system\financial;
use think\Model;
use app\common\model\merchant\system\admin\Admin;
use app\common\model\merchant\system\merchant\Merchant;
use app\common\model\merchant\system\merchant\MerchantAdmin;
/**
* 商户财务申请提现 model
*/
class Financial extends Model
{
protected $connection = 'shop';
protected $table = 'eb_financial';
protected $pk = 'financial_id';
public function getFinancialAccountAttr($value)
{
return json_decode($value);
}
public function getImageAttr($value)
{
return explode(',',$value);
}
public function getAdminIdAttr($value)
{
return Admin::where('admin_id',$value)->value('real_name');
}
public function getMerAdminIdAttr($value)
{
return MerchantAdmin::where('merchant_admin_id',$value)->value('real_name');
}
public function searchFinancialIdAttr($query,$value)
{
$query->where('financial_id',$value);
}
public function searchMerIdAttr($query,$value)
{
$query->where('mer_id',$value);
}
public function searchStatusAttr($query,$value)
{
$query->where('status',$value);
}
public function searchFinancailStatusAttr($query,$value)
{
$query->where('financial_status',$value);
}
public function searchFinancailTypeAttr($query,$value)
{
$query->where('financial_type',$value);
}
public function searchKeywordsAttr($query,$value)
{
$query->whereLike('keywords',"%{$value}%");
}
public function searchDateAttr($query,$value)
{
getModelTime($query,$value);
}
public function searchIsDelAttr($query,$value)
{
$query->where('is_del',$value);
}
public function merchant()
{
return $this->hasOne(Merchant::class,'mer_id','mer_id');
}
/**
* TODO 商户列表
* @param array $where
* @param int $page
* @param int $limit
*
* @return array
*/
public function getAdminList(array $where,int $page,int $limit)
{
$where['is_del'] = 0;
$query = $this->search($where)->with([
'merchant' => function($query){
$query->field('mer_id,mer_name,is_trader,mer_avatar,type_id,mer_phone,mer_address,is_margin,margin,real_name');
$query->with([
'merchantType',
'marginOrder' => function($query){
$query->field('order_id,order_sn,pay_price')->where('status',10);
}
]);
}
]);
$count = $query->count();
$list = $query->page($page, $limit)->select();
return compact('count','list');
}
/**
* 组合sql条件
* @param array $where
* @return object Query
*/
protected function search(array $where)
{
$query = Financial::hasWhere('merchant',function($query) use ($where){
$query->when(isset($where['is_trader']) && $where['is_trader'] !=='',function($query) use($where){
$query->where('is_trader',$where['is_trader']);
});
$query->when(isset($where['type_id']) && $where['type_id'] !=='',function($query) use($where){
$query->where('type_id',$where['type_id']);
});
$query->when(isset($where['category_id']) && $where['category_id'] !=='',function($query) use($where){
$query->where('category_id',$where['category_id']);
});
$query->where('is_del',0);
});
$query->when(isset($where['status']) && $where['status'] !=='',function($query) use($where){
$query->where('Financial.status',$where['status']);
})
->when(isset($where['financial_type']) && $where['financial_type'] !=='',function($query) use($where){
$query->where('Financial.financial_type',$where['financial_type']);
})
->when(isset($where['mer_id']) && $where['mer_id'] !=='',function($query) use($where){
$query->where('Financial.mer_id',$where['mer_id']);
})
->when(isset($where['financial_status']) && $where['financial_status'] !=='',function($query) use($where){
$query->where('Financial.financial_status',$where['financial_status']);
})
->when(isset($where['keyword']) && $where['keyword'] !=='',function($query) use($where){
$query->join('SystemAdmin A','Financial.admin_id = A.admin_id')
->field('A.real_name,A.admin_id,A.account')
->whereLike('A.real_name|A.account',"%{$where['keyword']}%");
})
->when(isset($where['keywords_']) && $where['keywords_'] !=='',function($query) use($where){
$query->join('MerchantAdmin M','Financial.mer_admin_id = M.merchant_admin_id')
->field('M.real_name,M.account,M.merchant_admin_id')
->whereLike('M.real_name|M.account',"%{$where['keywords_']}%");
})
->when(isset($where['financial_id']) && $where['financial_id'] !=='',function($query) use($where){
$query->where('Financial.financial_id',$where['financial_id']);
})
->when(isset($where['date']) && $where['date'] !=='',function($query) use($where){
getModelTime($query,$where['date'],'Financial.create_time');
})
->when(isset($where['is_del']) && $where['is_del'] !=='',function($query) use($where){
$query->where('Financial.is_del',$where['is_del']);
})
->when(isset($where['type']) && $where['type'] !=='',function($query) use($where){
$query->where('Financial.type',$where['type']);
});;
$query->order('Financial.create_time DESC');
return $query;
}
}