ad

app/cxinv/controller/Trade.php

@@ -212,8 +212,8 @@ class Trade extends Base{
          $pcData=['totalPrice'=>0,'usedPrice'=>0,'balancePrce'=>0,'tradPrice'=>0];// 统计数据
 
         if($params['pcCode']!==""){
-            $where[]=['e.pcCode','like','%'.$params['pcCode'].'%'];
-            $pc= $this->model->with(["lib"])->withJoin("Lib","left")->where('pcCode',$params['pcCode'])
+            $where[]=['a.pcCode','like','%'.$params['pcCode'].'%'];
+            $pc= $this->model->with(["lib"])->where('pcCode',$params['pcCode'])
             ->select();
             if(!$pc->isEmpty()){
                 $pcData['totalPrice'] = array_sum(array_column($pc->toArray(),"total_fee"));
@@ -495,6 +495,7 @@ class Trade extends Base{
                 "poCode"=>$value['poCode'],
                 "NdCode"=>$value['NdCode'],
                 "customerName"=>$value['customerName'],
+                'pcCode'=>$pcCode,
                 "apply_id"=>$this->uid,
                 "apply_name"=>$this->uname,
             ];
@@ -512,7 +513,6 @@ class Trade extends Base{
                     "cat_name"=>$value['cat_name'],
                     "comPrice"=>$value['comPrice'],
                     "com_total"=>$value['com_total'],
-                    "pcCode"=>$pcCode,
                     ];
             }
 

app/cxinv/model/Trade.php

@@ -6,6 +6,7 @@ use app\user\model\Business;class Trade extends Base
 //设置字段信息
     protected $schema = [
         'id'  =>'bigint',//
+        'pcCode'=>'varchar',//pc单号
         'tradNo'  =>'varchar',//打款交易记录编号
         'trade_bank'  =>'varchar',//交易银行
         'trade_account'  =>'varchar',//交易账户
@@ -36,6 +37,6 @@ use app\user\model\Business;class Trade extends Base
     protected $createTime = 'addtime';
     protected $updateTime = 'updatetime';
     public function Lib(){
-       return $this->belongsTo(TradeLib::class,'tradNo','tradNo')->bind(["palt_po","skuCode","goodName","goodNum","platPrice","plat_total","tax","cat_code","cat_name","comPrice","com_total","pcCode"]);
+       return $this->belongsTo(TradeLib::class,'tradNo','tradNo')->bind(["palt_po","skuCode","goodName","goodNum","platPrice","plat_total","tax","cat_code","cat_name","comPrice","com_total"]);
     }
 }

app/cxinv/model/TradeLib.php

@@ -18,7 +18,6 @@ class TradeLib extends Base
         'cat_name'  =>'varchar',//税收名称
         'comPrice'  =>'decimal',//业务公司单价
         'com_total'  =>'decimal',//业务公司总额
-        'pcCode'  =>'varchar',//批次号
         'createtime'  =>'datetime',//
        ];
     protected $createTime = 'createtime';

app/cxinv/model/TradePool.php

@@ -29,10 +29,10 @@ class TradePool extends Base
     
     public function Trade(){
         return $this->belongsTo(Trade::class,"tradNo","tradNo")
-        ->bind(["trade_out","trade_in","trade_bank","companyName","pcompanyNo"=>"companyNo","customerName","pcustomerNo"=>"customerNo","ptotal_fee"=>"total_fee","trade_type","balance","used_fee","poCode","NdCode"]);
+        ->bind(["trade_out","trade_in","trade_bank","companyName","pcompanyNo"=>"companyNo","customerName","pcustomerNo"=>"customerNo","ptotal_fee"=>"total_fee","trade_type","balance","used_fee","poCode","NdCode",'pcCode']);
     }
     public function Lib(){
-        return $this->belongsTo(TradeLib::class,"tradNo","tradNo")->bind(['palt_po','skuCode','goodName','goodNum','platPrice','plat_total','tax','cat_code','cat_name','comPrice','com_total','pcCode']);
+        return $this->belongsTo(TradeLib::class,"tradNo","tradNo")->bind(['palt_po','skuCode','goodName','goodNum','platPrice','plat_total','tax','cat_code','cat_name','comPrice','com_total']);
     }
 
     public static function onAfterInsert(Model $model) : void{