|
|
@@ -19,7 +19,7 @@ class Trade extends Base{
|
|
|
if($trade->isEmpty()) return error("交易流水信息不存在");
|
|
|
$orderValid = Validate::rule([
|
|
|
"sequenceNo|关联订单编号"=>"require|max:255",
|
|
|
- "trad_fee|关联订单价格"=>"require|float|min:0.01"]);
|
|
|
+ "trad_fee|关联订单金额"=>"require|float|min:0.01"]);
|
|
|
$assoc=[];
|
|
|
$log_total = 0;
|
|
|
$logInfo=[];
|
|
|
@@ -128,8 +128,8 @@ class Trade extends Base{
|
|
|
$where=[["is_del","=",0]];
|
|
|
if($params['tradNo']!=="")$where[]=["tradNo","like","%".$params['tradNo']."%"];
|
|
|
if($params['status']!=="")$where[]=["status","=",$params['status']];
|
|
|
- if($params['name']!=="")$where[]=["name","like","%".$params['name']."%"];
|
|
|
- if($params['bank']!=="")$where[]=["bank","like","%".$params['bank']."%"];
|
|
|
+ if($params['name']!=="")$where[]=["trade_out","like","%".$params['name']."%"];
|
|
|
+ if($params['bank']!=="")$where[]=["trade_bank","like","%".$params['bank']."%"];
|
|
|
if($params['start']!=="") $where[]=["trade_time",">=",startTime($params['start'])];
|
|
|
if($params['end']!=="") $where[]=["trade_time","<=",endTime($params['end'])];
|
|
|
if($params['companyNo']!=="")$where[]=["companyNo","like","%".$params['companyNo']."%"];
|
|
|
@@ -143,7 +143,8 @@ class Trade extends Base{
|
|
|
}
|
|
|
|
|
|
public function delete(){
|
|
|
- $id = $this->request->param("id","post","int");
|
|
|
+ $id = $this->request->post("id","0","int");
|
|
|
+ if($id<=0) return error("参数错误");
|
|
|
$info = $this->model->where(["id"=>$id,"is_del"=>0])->findOrEmpty();
|
|
|
if($info->isEmpty()) return error("资金流水信息不存在");
|
|
|
if($info->status!=1) return error("当前状态不允许删除");
|
|
|
@@ -169,8 +170,8 @@ class Trade extends Base{
|
|
|
if($params['orderCode']!=="")$where[]=["d.orderCode","like","%".$params['orderCode']."%"];
|
|
|
if($params['platform_type']!=="")$where[]=["a.platform_type","like","%".$params['platform_type']."%"];
|
|
|
if($params['status']!=="")$where[]=["a.status","=",$params['status']];
|
|
|
- if($params['name']!=="")$where[]=["b.name","like","%".$params['name']."%"];
|
|
|
- if($params['bank']!=="")$where[]=["b.bank","like","%".$params['bank']."%"];
|
|
|
+ if($params['name']!=="")$where[]=["b.trade_out","like","%".$params['name']."%"];
|
|
|
+ if($params['bank']!=="")$where[]=["b.trade_bank","like","%".$params['bank']."%"];
|
|
|
if($params['start']!=="") $where[]=["a.addtime",">=",startTime($params['start'])];
|
|
|
if($params['end']!=="") $where[]=["a.addtime","<=",endTime($params['end'])];
|
|
|
if($params['companyNo']!=="")$where[]=["a.companyNo","like","%".$params['companyNo']."%"];
|
|
|
@@ -201,7 +202,7 @@ class Trade extends Base{
|
|
|
}
|
|
|
|
|
|
public function PoolInfo(){
|
|
|
- $logNo = $this->request->param("logNo","post","trim");
|
|
|
+ $logNo = $this->request->post("logNo","","trim");
|
|
|
if($logNo=="") return error("参数错误");
|
|
|
$info = TradePool::with(["trade"=>"company"])->where(["logNo"=>$logNo,"is_del"=>0])->findOrEmpty();
|
|
|
if($info->isEmpty()) return error("资金认领信息不存在");
|
|
|
@@ -305,7 +306,7 @@ class Trade extends Base{
|
|
|
}
|
|
|
|
|
|
public function BackInfo(){
|
|
|
- $returnCode = $this->request->param("returnCode","post","trim");
|
|
|
+ $returnCode = $this->request->post("returnCode","","trim");
|
|
|
if($returnCode=="") return error("参数错误");
|
|
|
$info = TradeReturn::with(["trade"=>"company","pool"])->where(["returnCode"=>$returnCode,"is_del"=>0])->findOrEmpty();
|
|
|
if($info->isEmpty()) return error("退款申请数据未找到");
|
