|
|
@@ -393,13 +393,13 @@ class Payment extends Base{
|
|
|
->where(['code'=>$pay['payNo'],'a.status'=>[1,2]])
|
|
|
->order('a.id desc')
|
|
|
->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
|
|
|
- if($tag['inv_tag']==1){
|
|
|
+ if($pay['inv_tag']==1){
|
|
|
$pay['inv_tag_name']=$tag['2']['tag_name']??'';
|
|
|
$pay['inv_tag_img']=$tag['2']['tag_img']??'';
|
|
|
$pay['inv_tag_remark']=$tag['2']['tag_remark']??'';
|
|
|
$pay['inv_tag_id']=$tag['2']['id']??'';
|
|
|
}
|
|
|
- if($tag['pay_tag']==1){
|
|
|
+ if($pay['pay_tag']==1){
|
|
|
$pay['pay_tag_name']=$tag['1']['tag_name']??'';
|
|
|
$pay['pay_tag_img']=$tag['1']['tag_img']??'';
|
|
|
$pay['pay_tag_remark']=$tag['1']['tag_remark']??'';
|
