|
@@ -232,14 +232,14 @@ class Payment extends Base
|
|
|
if($value['pay_tag']==1 || $value['inv_tag']==1){
|
|
|
$tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
(['code'=>$payNo])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
|
|
|
- $value['inv_tag_name']=$tag[4]['tag_name']??'';
|
|
|
- $value['inv_tag_id']=$tag[4]['id']??'0';
|
|
|
- $value['pay_tag_id']=$tag[3]['id']??'0';
|
|
|
- $value['pay_tag_name']=$tag[3]['tag_name']??'';
|
|
|
- $value['pay_tag_img']=$tag[3]['tag_img']??'';
|
|
|
- $value['inv_tag_img']=$tag[4]['tag_img']??'';
|
|
|
- $value['inv_tag_remark']=$tag[4]['tag_remark']??'';
|
|
|
- $value['pay_tag_remark']=$tag[3]['tag_remark']??'';
|
|
|
+ $value['inv_tag_name']=$tag[2]['tag_name']??'';
|
|
|
+ $value['inv_tag_id']=$tag[2]['id']??'0';
|
|
|
+ $value['pay_tag_id']=$tag[1]['id']??'0';
|
|
|
+ $value['pay_tag_name']=$tag[1]['tag_name']??'';
|
|
|
+ $value['pay_tag_img']=$tag[1]['tag_img']??'';
|
|
|
+ $value['inv_tag_img']=$tag[2]['tag_img']??'';
|
|
|
+ $value['inv_tag_remark']=$tag[2]['tag_remark']??'';
|
|
|
+ $value['pay_tag_remark']=$tag[1]['tag_remark']??'';
|
|
|
}
|
|
|
$value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
|
|
|
$data[]=$value;
|
|
@@ -1135,14 +1135,14 @@ class Payment extends Base
|
|
|
if($payinfo['pay_tag']==1 || $payinfo['inv_tag']==1){
|
|
|
$tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
(['code'=>$payNo])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
|
|
|
- $payinfo['inv_tag_name']=$tag[4]['tag_name']??'';
|
|
|
- $payinfo['inv_tag_id']=$tag[4]['id']??'0';
|
|
|
- $payinfo['pay_tag_id']=$tag[3]['id']??'0';
|
|
|
- $payinfo['pay_tag_name']=$tag[3]['tag_name']??'';
|
|
|
- $payinfo['pay_tag_img']=$tag[3]['tag_img']??'';
|
|
|
- $payinfo['inv_tag_img']=$tag[4]['tag_img']??'';
|
|
|
- $payinfo['inv_tag_remark']=$tag[4]['tag_remark']??'';
|
|
|
- $payinfo['pay_tag_remark']=$tag[3]['tag_remark']??'';
|
|
|
+ $payinfo['inv_tag_name']=$tag[2]['tag_name']??'';
|
|
|
+ $payinfo['inv_tag_id']=$tag[2]['id']??'0';
|
|
|
+ $payinfo['pay_tag_id']=$tag[1]['id']??'0';
|
|
|
+ $payinfo['pay_tag_name']=$tag[1]['tag_name']??'';
|
|
|
+ $payinfo['pay_tag_img']=$tag[1]['tag_img']??'';
|
|
|
+ $payinfo['inv_tag_img']=$tag[2]['tag_img']??'';
|
|
|
+ $payinfo['inv_tag_remark']=$tag[2]['tag_remark']??'';
|
|
|
+ $payinfo['pay_tag_remark']=$tag[1]['tag_remark']??'';
|
|
|
}
|
|
|
$payinfo['cgdlist'] = $pay;
|
|
|
return app_show(0,"获取成功",$payinfo);
|