ad

app/admin/controller/Payment.php

@@ -1115,8 +1115,9 @@ class Payment extends Base
 	        $pay =Db::name("pay_info")->alias("a")->leftJoin("cgd_info b","a.cgdNo=b.sequenceNo")
 	        ->where(["a.is_del"=>0,"b.is_del"=>0,"a.payNo"=>$payNo])->field("b.*")
 	        ->select()->toArray();
+	        $orderTax = OrderCategory::GetTaxInfoByCode(array_column($pay,"sequenceNo"));
 	        foreach ($pay as &$value){
-	            $value['orderTax'] =OrderCategory::GetTaxInfoByCode($value['sequenceNo']);
+	            $value['orderTax'] = $orderTa[$value['sequenceNo']]??[];
 	            $value['catInfo'] = json_decode($value['catInfo'],true);
 	            $value['goodNum'] =$value['goodNum']- $value['thNum'];
 	            $value['sendNum'] =$value['sendNum']- $value['thNum'];

app/admin/model/OrderCategory.php

@@ -25,8 +25,8 @@ class OrderCategory extends Model{
                       "spuCode"=>$value['spuCode'],
                       "cat_code"=>$value['cat_code'],
                       "cat_name"=>$value['cat_name'],
-                      "short_name"=>$value['short_name'],
-                      "merge_code"=>$value['merge_code'],
+                      "short_name"=>$value['short_name']??"",
+                      "merge_code"=>$value['merge_code']??"",
                       "tax"=>$value['tax'],
                       "inv_good_name"=>$value['inv_good_name']
                       ];
@@ -43,9 +43,12 @@ class OrderCategory extends Model{
         $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;
-            }
+            if (is_array($code)){
+                 foreach ($info as $value){
+                        $temp[$value['code']][]=$value;
+                }
+            }else $temp= $info->toArray();
+
         }
         return $temp;
     }