ad

app/admin/controller/ComonOrder.php

@@ -8,7 +8,7 @@ use app\admin\model\CompanyInfo;
 use app\admin\model\InvoicePay;
 use app\admin\model\InvoicePool;
 use app\admin\model\InvoicePoolInfo;
-use app\admin\model\Pay;
+use app\admin\model\OrderCategory;use app\admin\model\Pay;
 use app\admin\model\PayInfo;
 use app\admin\model\QrdInfo;
 use app\admin\model\ReportCode;
@@ -270,6 +270,17 @@ class ComonOrder extends Base
         ->toArray();
         $qrdArr= array_column($list,"qrd","cgdNo");
         $cgdArr= array_column($list,"cgd","cgdNo");
+        array_walk($qrdArr,function (&$item){
+            $item['catInfo'] = json_decode($item['catInfo'],true);
+            $item['orderTax'] = OrderCategory::where(['code' => $item['sequenceNo'], 'spuCode' => $item['goodNo']])
+               ->field(['cat_code', 'cat_name', 'merge_code', 'short_name', 'tax', 'inv_good_name'])->findOrEmpty();
+        });
+
+       array_walk($cgdArr,function (&$item){
+            $item['catInfo'] = json_decode($item['catInfo'],true);
+            $item['orderTax'] = OrderCategory::where(['code' => $item['sequenceNo'], 'spuCode' => $item['goodNo']])
+               ->field(['cat_code', 'cat_name', 'merge_code', 'short_name', 'tax', 'inv_good_name'])->findOrEmpty();
+        });
         foreach ($pay as $item){
         	
         	if(isset($qrdArr[$item['cgdNo']])==false)continue;