ad

app/admin/controller/Payment.php

@@ -4,7 +4,7 @@ declare (strict_types = 1);
 namespace app\admin\controller;
 
 
-use app\admin\model\CgdInfo;use app\admin\model\FhdChild;use app\admin\model\GoodCombind;use app\admin\model\InvoicePay;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\PayInfo;use app\admin\model\ReportCode;
+use app\admin\model\CgdInfo;use app\admin\model\FhdChild;use app\admin\model\GoodCombind;use app\admin\model\InvoicePay;use app\admin\model\InvoicePool;use app\admin\model\OrderCategory;use app\admin\model\Pay;use app\admin\model\PayInfo;use app\admin\model\ReportCode;
 use think\App;use think\Exception;
 use think\facade\Config;
 use think\facade\Db;
@@ -1093,6 +1093,7 @@ class Payment extends Base
         $cgdinfo['goodNum'] =$cgdinfo['goodNum']- $cgdinfo['thNum'];
         $cgdinfo['sendNum'] =$cgdinfo['sendNum']- $cgdinfo['thNum'];
         $cgdinfo['child']=[];
+        $cgdinfo['orderTax'] =OrderCategory::GetTaxInfoByCode($sequenceNo);
         $list=(new GoodCombind())->where("spuCode",$cgdinfo['goodNo'])->visible(["child"])->with(["child"])
         ->select();
         if($list->isEmpty()==false)$cgdinfo['child']=array_column($list->toArray(),'child');
@@ -1115,6 +1116,7 @@ class Payment extends Base
 	        ->where(["a.is_del"=>0,"b.is_del"=>0,"a.payNo"=>$payNo])->field("b.*")
 	        ->select()->toArray();
 	        foreach ($pay as &$value){
+	            $value['orderTax'] =OrderCategory::GetTaxInfoByCode($value['sequenceNo']);
 	            $value['catInfo'] = json_decode($value['catInfo'],true);
 	            $value['goodNum'] =$value['goodNum']- $value['thNum'];
 	            $value['sendNum'] =$value['sendNum']- $value['thNum'];
@@ -1130,15 +1132,15 @@ class Payment extends Base
 		        ->field('b.*,c.outCode,c.good_name,c.spuCode,c.post_name,c.post_code')
 		        ->select()->toArray();
 	        }
-        $payinfo['pay_type']=Db::name('supplier_info')->where('code',$payinfo['supplierNo'])->value('pay_method','');
-        $payinfo['inv_tag_name']='';
-                            $payinfo['pay_tag_name']='';
-                            $payinfo['pay_tag_img']='';
-                            $payinfo['inv_tag_id']='0';
-                            $payinfo['pay_tag_id']='0';
-                            $payinfo['pay_tag_remark']='';
-                            $payinfo['inv_tag_img']='';
-                            $payinfo['inv_tag_remark']='';
+            $payinfo['pay_type']=Db::name('supplier_info')->where('code',$payinfo['supplierNo'])->value('pay_method','');
+            $payinfo['inv_tag_name']='';
+            $payinfo['pay_tag_name']='';
+            $payinfo['pay_tag_img']='';
+            $payinfo['inv_tag_id']='0';
+            $payinfo['pay_tag_id']='0';
+            $payinfo['pay_tag_remark']='';
+            $payinfo['inv_tag_img']='';
+            $payinfo['inv_tag_remark']='';
              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,"a.status"=>[1,2]])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a

app/admin/controller/Sale.php

@@ -3,7 +3,7 @@
 
 namespace app\admin\controller;
 
-use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\QrdInfo;use app\admin\model\TradePool;use think\App;
+use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\OrderCategory;use app\admin\model\Pay;use app\admin\model\QrdInfo;use app\admin\model\TradePool;use think\App;
 use think\facade\Db;use think\facade\Validate;
 class Sale extends Base{
     public function __construct(App $app) {
@@ -158,7 +158,9 @@ class Sale extends Base{
         ->order("a.createdTime desc")
         ->where($condition)->page($page,$size)->select();
         $data=[];
+
         foreach ( $list as $ky=>$value){
+            $value['taxInfo'] = $orderTax[$value['sequenceNo']]??[];
             $value['catInfo'] = json_decode($value['catInfo'],true);
                             $value['inv_tag_name']='';
                             $value['pay_tag_name']='';
@@ -434,14 +436,15 @@ class Sale extends Base{
         $goodinfo = Db::name("good")->where(["spuCode"=>$qrdinfo["goodNo"]])->findOrEmpty();
         $qrdinfo['goodinfo'] =$goodinfo;
         $qrdinfo['catInfo'] = json_decode($qrdinfo['catInfo'],true);
-                $qrdinfo['inv_tag_name']='';
-                $qrdinfo['pay_tag_name']='';
-                $qrdinfo['pay_tag_img']='';
-                $qrdinfo['inv_tag_id']='0';
-                $qrdinfo['pay_tag_id']='0';
-                $qrdinfo['pay_tag_remark']='';
-                $qrdinfo['inv_tag_img']='';
-                $qrdinfo['inv_tag_remark']='';
+        $qrdinfo['inv_tag_name']='';
+        $qrdinfo['pay_tag_name']='';
+        $qrdinfo['pay_tag_img']='';
+        $qrdinfo['inv_tag_id']='0';
+        $qrdinfo['pay_tag_id']='0';
+        $qrdinfo['pay_tag_remark']='';
+        $qrdinfo['inv_tag_img']='';
+        $qrdinfo['inv_tag_remark']='';
+        $qrdinfo['orderTax'] =OrderCategory::GetTaxInfoByCode($post['sequenceNo']);
         if($qrdinfo['pay_tag']==1 || $qrdinfo['inv_tag']==1){
 	        $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')
 	        ->where(['code'=>$qrdinfo['sequenceNo'],'a.status'=>[1,2]])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');

app/admin/model/OrderCategory.php

@@ -10,7 +10,9 @@ class OrderCategory extends Model{
     use SoftDelete;
     protected $createTime = 'createTime';
     protected $deleteTime='delete_time';
-
+    public function GoodInfo(){
+        return $this->belongsTo(Good::class,"spuCode","spuCode")->bind(["good_name"]);
+    }
     public static function checkInfo($code,$orderType,$info){
         if(!empty($info)){
             $save=[];
@@ -34,4 +36,15 @@ class OrderCategory extends Model{
             }
         }
     }
+
+    public static function GetTaxInfoByCode($code){
+        $info=self::with(['GoodInfo'])->where(["code"=>$code])->field(["code","spuCode","cat_code","cat_name","tax","inv_good_name"])->select();
+        $temp=[];
+        if(!empty($info)){
+            foreach ($info as $value){
+                $temp[$value['code']][]=$value;
+            }
+        }
+        return $temp;
+    }
 }