|
@@ -135,7 +135,7 @@ class Trade extends Base{
|
|
"trade_type"=>"","palt_po"=>"","skuCode"=>"","goodName"=>"","plat_total_lower"=>"",'plat_total_upper'=>'',"com_total_lower"=>"",
|
|
"trade_type"=>"","palt_po"=>"","skuCode"=>"","goodName"=>"","plat_total_lower"=>"",'plat_total_upper'=>'',"com_total_lower"=>"",
|
|
"com_total_upper"=>"","trade_used"=>"","create_start"=>"","create_end"=>"",'customerName'=>''],"post","trim");
|
|
"com_total_upper"=>"","trade_used"=>"","create_start"=>"","create_end"=>"",'customerName'=>''],"post","trim");
|
|
$where=[["is_del","=",0]];
|
|
$where=[["is_del","=",0]];
|
|
- if($params['tradNo']!=="")$where[]=["tradNo","like","%".$params['tradNo']."%"];
|
|
|
|
|
|
+ if($params['tradNo']!=="")$where[]=["trade.tradNo","like","%".$params['tradNo']."%"];
|
|
if(!empty($params['status']))$where[]=["status","in",$params['status']];
|
|
if(!empty($params['status']))$where[]=["status","in",$params['status']];
|
|
if($params['name']!=="")$where[]=["trade_out","like","%".$params['name']."%"];
|
|
if($params['name']!=="")$where[]=["trade_out","like","%".$params['name']."%"];
|
|
if($params['bank']!=="")$where[]=["trade_bank","like","%".$params['bank']."%"];
|
|
if($params['bank']!=="")$where[]=["trade_bank","like","%".$params['bank']."%"];
|
|
@@ -279,11 +279,11 @@ class Trade extends Base{
|
|
$this->model->startTrans();
|
|
$this->model->startTrans();
|
|
try{
|
|
try{
|
|
$logInfo->each(function($item) use($params){
|
|
$logInfo->each(function($item) use($params){
|
|
|
|
+ Assoc::CheckTrad($item->logNo,$params['status']);
|
|
$item->status = $params['status'];
|
|
$item->status = $params['status'];
|
|
$item->remark = $params['remark'];
|
|
$item->remark = $params['remark'];
|
|
$save=$item->save();
|
|
$save=$item->save();
|
|
if(!$save) throw new \Exception("资金认领信息更新失败");
|
|
if(!$save) throw new \Exception("资金认领信息更新失败");
|
|
- Assoc::CheckTrad($item->logNo,$params['status']);
|
|
|
|
if($params['status']==3){
|
|
if($params['status']==3){
|
|
$trade = $this->model->where(["tradNo"=>$item->tradNo,"is_del"=>0])->findOrEmpty();
|
|
$trade = $this->model->where(["tradNo"=>$item->tradNo,"is_del"=>0])->findOrEmpty();
|
|
if($trade->used_fee<$item->total_fee) throw new \Exception('资金流水已使用金额不足');
|
|
if($trade->used_fee<$item->total_fee) throw new \Exception('资金流水已使用金额不足');
|