|
|
@@ -131,9 +131,9 @@ class Trade extends Base{
|
|
|
|
|
|
public function list(){
|
|
|
$params = $this->request->param(["tradNo"=>"","status"=>[],"name"=>"","bank"=>"","start"=>"","end"=>"","companyNo"=>"",
|
|
|
- 'poCode'=>'',"page"=>1,"size"=>20,'used_lower'=>"",'used_upper'=>'','total_lower'=>'','total_upper'=>'',"relaComNo"=>"",'trade_in_code'=>'',
|
|
|
+ 'poCode'=>'','pcCode'=>'',"page"=>1,"size"=>20,'used_lower'=>"",'used_upper'=>'','total_lower'=>'','total_upper'=>'',"relaComNo"=>"",'trade_in_code'=>'',
|
|
|
"trade_type"=>"","palt_po"=>"","skuCode"=>"","goodName"=>"","plat_total_lower"=>"",'plat_total_upper'=>'',"com_total_lower"=>"",
|
|
|
- "com_total_upper"=>"","trade_used"=>"","create_start"=>"","create_end"=>""],"post","trim");
|
|
|
+ "com_total_upper"=>"","trade_used"=>"","create_start"=>"","create_end"=>"",'customerName'=>''],"post","trim");
|
|
|
$where=[["is_del","=",0]];
|
|
|
if($params['tradNo']!=="")$where[]=["tradNo","like","%".$params['tradNo']."%"];
|
|
|
if(!empty($params['status']))$where[]=["status","in",$params['status']];
|
|
|
@@ -142,6 +142,7 @@ class Trade extends Base{
|
|
|
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']."%"];
|
|
|
+ if($params['customerName']!=="")$where[]=["customerName","like","%".$params['customerName']."%"];
|
|
|
if($params['trade_in_code']!=="") $where[]=["trade_in_code","like","%".$params['trade_in_code']."%"];
|
|
|
if($params['relaComNo']!=="")$where[]=["companyNo","like","%".$params['relaComNo']."%"];
|
|
|
if($params['used_lower']!=="") $where[]=["used_fee",">=",$params['used_lower']];
|
|
|
@@ -149,6 +150,7 @@ class Trade extends Base{
|
|
|
if($params['total_lower']!=="") $where[]=["total_fee",">=",$params['total_lower']];
|
|
|
if($params['total_upper']!=="") $where[]=["total_fee","<=",$params['total_upper']];
|
|
|
if($params['poCode']!=="") $where[]=["poCode","like","%".$params['poCode']."%"];
|
|
|
+ if($params['pcCode']!=="") $where[]=["pcCode","like","%".$params['pcCode']."%"];
|
|
|
if($params['trade_type']!=="") $where[]=["trade_type","=",$params['trade_type']];
|
|
|
if($params['palt_po']!=="") $where[]=["palt_po","like","%".$params['palt_po']."%"];
|
|
|
if($params['skuCode']!=="") $where[]=["skuCode","like","%".$params['skuCode']."%"];
|
