|
@@ -344,7 +344,7 @@ class Payment extends Base{
|
|
|
if(!$valid->check($params)) return error($valid->getError());
|
|
|
$pay = $this->model->where(['payNo'=>$params['payNo'],"is_del"=>0])->findOrEmpty();
|
|
|
if($pay->isEmpty()) return error("对账单不存在");
|
|
|
- $payinfo= PayInfo::where(['payNo'=>$params['payNo'],"is_del"=>0,"status"=>1])->select();
|
|
|
+ $payinfo= PayInfo::where(['payNo'=>$params['payNo'],"is_del"=>0])->select();
|
|
|
if($payinfo->isEmpty()) return error("对账单明细不存在");
|
|
|
$cgdNo = $payinfo->column('cgdNo');
|
|
|
$pay['cgd_inv_tag_total']=0;
|
|
@@ -368,7 +368,7 @@ class Payment extends Base{
|
|
|
}
|
|
|
|
|
|
}else{
|
|
|
- $cgdInfo = Track::where(['TrackCode'=>$cgdNo,'is_del'=>0,'status'=>1])->select();
|
|
|
+ $cgdInfo = Track::where(['TrackCode'=>$cgdNo,'is_del'=>0])->select();
|
|
|
if(!$cgdInfo->isEmpty()){
|
|
|
$fhds = FhdChild::where(['outChildCode'=>$cgdInfo->column("outChildCode")])->column("outCode,good_name,spuCode,post_name,post_code","outChildCode");
|
|
|
$cgdInfo = $cgdInfo->toArray();
|