补充orderCode并解决冲突

app/admin/controller/Purch.php

@@ -115,6 +115,9 @@ class Purch extends Base
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name("purchease_order")->where($where)->page($page,$size)->order("addtime desc")->select();
+        $all_orderCodes = Db::name('order_num')
+            ->whereIn('cgdNo',array_column($list,'cgdNo'))
+            ->column('orderCode','cgdNo');
         $data=[];
         foreach ($list as $value){
             $value['wsm_name']="";
@@ -157,6 +160,8 @@ class Purch extends Base
             $value['child']=empty($inorder)? [] : $inorder;
             $value['send_num'] -=$value['th_num'];
             $value['total_fee'] =round($value['total_fee']-$value['th_fee'],2);
+            //补充orderCode
+            $value['orderCode']=isset($all_orderCodes[$value['cgdNo']])?$all_orderCodes[$value['cgdNo']]:'';
             $data[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$data ,"count"=>$count]);
@@ -279,6 +284,11 @@ class Purch extends Base
         $data['company'] = isset($company['company'])?$company['company']:"";
         //$data['info'] = $var;
         $data['purcheaseback'] = $var;
+
+        //补充orderCode
+        $data['orderCode']=$all_orderCodes = Db::name('order_num')
+            ->where('cgdNo',$data['cgdNo'])
+            ->value('orderCode','');
         return app_show(0,"获取成功",$data);
     }