|
|
@@ -1028,7 +1028,7 @@ class Payment extends Base
|
|
|
$value['inv_tag_remark']='';
|
|
|
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'=>$value['payNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
+ (['code'=>$value['sequenceNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
.tag_remark','b.type');
|
|
|
if($value['inv_tag']==1){
|
|
|
$value['inv_tag_name']=$tag[6]['tag_name']??'';
|
|
|
@@ -1118,7 +1118,7 @@ class Payment extends Base
|
|
|
$value['inv_tag_remark']='';
|
|
|
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'=>$value['payNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
+ (['code'=>$value['sequenceNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
.tag_remark','b.type');
|
|
|
if($value['inv_tag']==1){
|
|
|
$value['inv_tag_name']=$tag[6]['tag_name']??'';
|
|
|
@@ -1170,6 +1170,32 @@ class Payment extends Base
|
|
|
->field(['cat_code', 'cat_name', 'merge_code', 'short_name', 'tax', 'inv_good_name'])->findOrEmpty();
|
|
|
}
|
|
|
}
|
|
|
+ $cgdinfo['inv_tag_name']='';
|
|
|
+ $cgdinfo['pay_tag_name']='';
|
|
|
+ $cgdinfo['pay_tag_img']='';
|
|
|
+ $cgdinfo['inv_tag_id']='0';
|
|
|
+ $cgdinfo['pay_tag_id']='0';
|
|
|
+ $cgdinfo['pay_tag_remark']='';
|
|
|
+ $cgdinfo['inv_tag_img']='';
|
|
|
+ $cgdinfo['inv_tag_remark']='';
|
|
|
+ if($cgdinfo['pay_tag']==1 || $cgdinfo['inv_tag']==1){
|
|
|
+ $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
|
|
|
+ (['code'=>$cgdinfo['sequenceNo'],'a.status'=>[5,6]])->order('a.id desc')->column('a.id,b.tag_name,a.tag_img,a
|
|
|
+ .tag_remark','b.type');
|
|
|
+ if($cgdinfo['inv_tag']==1){
|
|
|
+ $cgdinfo['inv_tag_name']=$tag[6]['tag_name']??'';
|
|
|
+ $cgdinfo['inv_tag_id']=$tag[6]['id']??'0';
|
|
|
+ $cgdinfo['inv_tag_img']=$tag[6]['tag_img']??'';
|
|
|
+ $cgdinfo['inv_tag_remark']=$tag[6]['tag_remark']??'';
|
|
|
+ }
|
|
|
+
|
|
|
+ if($cgdinfo['pay_tag']==1){
|
|
|
+ $cgdinfo['pay_tag_id']=$tag[5]['id']??'0';
|
|
|
+ $cgdinfo['pay_tag_name']=$tag[5]['tag_name']??'';
|
|
|
+ $cgdinfo['pay_tag_img']=$tag[5]['tag_img']??'';
|
|
|
+ $cgdinfo['pay_tag_remark']=$tag[5]['tag_remark']??'';
|
|
|
+ }
|
|
|
+ }
|
|
|
return app_show(0,"获取成功",$cgdinfo);
|
|
|
}
|
|
|
//todo
|
