ad

app/admin/controller/Payment.php

@@ -232,11 +232,11 @@ class Payment extends Base
         foreach ($list as $key=>$value){
             $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0]])->count();
             $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
-            (["code"=>$value['payNo'],"a.status"=>1])->column("a.key_id,b.tag_name,a.tag_img,a.tag_remark","b.type");
+            (["code"=>$value['payNo'],"a.status"=>1])->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
             $value['inv_tag_name']=$tag[2]['tag_name']??'';
-            $value['inv_tag_id']=$tag[2]['key_id']??'0';
+            $value['inv_tag_id']=$tag[2]['id']??'0';
             $value['pay_tag_name']=$tag[1]['tag_name']??'';
-            $value['pay_tag_id']=$tag[1]['key_id']??'0';
+            $value['pay_tag_id']=$tag[1]['id']??'0';
             $value['pay_tag_img']=$tag[1]['tag_img']??'';
             $value['inv_tag_img']=$tag[2]['tag_img']??'';
             $value['inv_tag_remark']=$tag[2]['tag_remark']??'';
@@ -1109,7 +1109,9 @@ class Payment extends Base
 	        }
         $payinfo['pay_type']=Db::name('supplier_info')->where('code',$payinfo['supplierNo'])->value('pay_method','');
         $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
-            (["code"=>$payNo,"a.status"=>1])->column("b.tag_name,a.tag_img,a.tag_remark","b.type");
+            (["code"=>$payNo,"a.status"=>1])->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
+            $payinfo['inv_tag_id']=$tag[2]['id']??'0';
+            $payinfo['pay_tag_id']=$tag[1]['id']??'0';
             $payinfo['inv_tag_name']=$tag[2]['tag_name']??'';
             $payinfo['pay_tag_name']=$tag[1]['tag_name']??'';
             $payinfo['pay_tag_img']=$tag[1]['tag_img']??'';

app/admin/controller/Sale.php

@@ -153,10 +153,12 @@ class Sale extends Base{
         foreach ( $list as $ky=>$value){
             $value['catInfo'] = json_decode($value['catInfo'],true);
             $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
-            (["code"=>$value['sequenceNo'],"a.status"=>1])->column("b.tag_name,a.tag_img,a.tag_remark","b.type");
+            (["code"=>$value['sequenceNo'],"a.status"=>1])->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
             $value['goodNum'] = $value['goodNum'] -$value['thNum'];
             $value['sendNum'] = $value['sendNum'] -$value['thNum'];
             $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']??'';
@@ -371,10 +373,12 @@ class Sale extends Base{
         $qrdinfo['goodinfo'] =$goodinfo;
         $qrdinfo['catInfo'] = json_decode($qrdinfo['catInfo'],true);
         $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")
-        ->where(["code"=>$qrdinfo['sequenceNo'],"a.status"=>1])->column("b.tag_name,a.tag_img,a.tag_remark","b.type");
+        ->where(["code"=>$qrdinfo['sequenceNo'],"a.status"=>1])->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
         $qrdinfo['inv_tag_name']=$tag[4]['tag_name']??'';
         $qrdinfo['pay_tag_name']=$tag[3]['tag_name']??'';
         $qrdinfo['pay_tag_img']=$tag[3]['tag_img']??'';
+         $qrdinfo['inv_tag_id']=$tag[4]['id']??'0';
+          $qrdinfo['pay_tag_id']=$tag[3]['id']??'0';
         $qrdinfo['pay_tag_remark']=$tag[3]['tag_remark']??'';
         $qrdinfo['inv_tag_img']=$tag[4]['tag_img']??'';
         $qrdinfo['inv_tag_remark']=$tag[4]['tag_remark']??'';