Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/Export.php

@@ -244,16 +244,24 @@ class Export extends BaseController
             a.trade_out 付款银行单位名称,
             a.trade_used 付款备注,
             a.trade_time 交易时间,
-            a.tradNo 资金编号,a.status 状态,a.total_fee 收入金额,a.balance 未认领金额,b.total_fee 已认领金额,b.logNo 资金认领编号,
-            b.customerNo 认领企业,c.orderCode 订单编号,d.poCode 平台编号,d.goodName 产品名称,d.ownerName 资金创建人,c.apply_name 认领创建人,b.status 认领审批状态,b.remark 驳回原因')
+            a.tradNo 资金编号,
+            a.status 状态,
+            a.total_fee 收入金额,
+            a.balance 未认领金额,
+            b.total_fee 已认领金额,
+            b.logNo 资金认领编号,
+            b.customerNo 认领企业,
+            c.orderCode 订单编号,
+            d.cxCode 销售主单号,
+            d.poCode 平台编号,
+            d.goodName 产品名称,
+            d.ownerName 资金创建人,
+            c.apply_name 认领创建人,
+            b.status 认领审批状态,
+            b.remark 驳回原因')
             ->leftJoin('trade_pool b', 'b.tradNo=a.tradNo')
             ->leftJoin('assoc c', 'c.viceCode=b.logNo and c.type=2 and c.status<>3')
             ->leftJoin('qrd_info d', 'd.sequenceNo=c.orderCode')
-//            ->withAttr('状态', function ($val) use ($status) {
-//                return $status[$val] ?? '';
-//            })->withAttr('认领审批状态', function ($val) use ($b_status) {
-//                return $b_status[$val] ?? '';
-//            })
             ->where($where)
             ->order('a.trade_time desc')
            ->cursor();

app/admin/controller/InterOrder.php

@@ -181,8 +181,6 @@ class InterOrder extends \app\admin\BaseController{
                                 'pay_status' =>1,//收款状态,1未付，2部分，3完结
                                 'inv_status' => 1,//开票状态,,1未付，2部分，3完结
                                 'remark' => '',//备注,
-                                'invtime' => null,
-                                'paytime' => null,
                                 'diff_weight' =>0,//工差重量,
                                 'diff_fee' =>0,//工差金额,
                                 'area' =>$customer['companyName']??"",//公司,

app/admin/controller/OrderInv.php

@@ -1084,10 +1084,6 @@ class OrderInv extends BaseController{
         if($inv_out!==""){
            $condition[]=["a.inv_out","=",$inv_out];
         }
-//          $inv_in = isset($this->post['inv_in'])&&$this->post['inv_in']!=="" ? trim($this->post['inv_in']):"";
-//        if($inv_in!==""){
-//           $condition[]=["a.inv_in","=",$inv_in];
-//        }
          $invNo = isset($this->post['invNo'])&&$this->post['invNo']!=="" ? trim($this->post['invNo']):"";
         if($invNo!==""){
            $condition[]=["a.invNo","like","%$invNo%"];
@@ -1129,7 +1125,7 @@ class OrderInv extends BaseController{
         $page= $page>$total ? intval($total):$page;
         $list=Db::name("invoice_pool")->alias("a")
         ->leftJoin("invoice_pool_info b","a.invNo=b.invNo")
-        ->leftJoin("invoice_ticket c","a.invNo=c.invNo and c.type=0")
+        ->leftJoin("invoice_ticket c","a.invNo=c.invNo and c.type=0 and c.is_del=0")
         ->where($condition)->field("b.*,a.*,c.inv_code,c.inv_number,c.open_date,c.type")
         ->page($page,$size)->order("a.addtime desc")->select()->toArray();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);

app/admin/controller/OrderPay.php

@@ -319,7 +319,7 @@ class OrderPay extends BaseController{
                 ->leftJoin("qrd_info c", "b.orderCode=c.sequenceNo")
                 ->where(["a.tradNo" => $value['tradNo'], "a.is_del" => 0])
                 ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
-                ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
+                ->field("a.*,b.orderCode,c.cxCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
                 ->select()
                 ->toArray();
             $value['child'] = $data;
@@ -331,7 +331,7 @@ class OrderPay extends BaseController{
     public function  tradeList(){
        $page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
         $size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
-        $condition =[["a.is_del","=",0],["b.is_del","=",0]];
+        $condition =[["a.is_del","=",0],["b.is_del","=",0],["c.is_del","=",0],["d.is_del","=",0]];
 
         $name =isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
         $bank =isset($this->post['bank'])&&$this->post['bank']!=""? trim($this->post['bank']):"";
@@ -355,6 +355,10 @@ class OrderPay extends BaseController{
         }
           if($orderCode!==""){
             $condition[]=["d.orderCode","like","%$orderCode%"];
+        }
+         $cxCode= isset($this->post['cxCode'])&&$this->post['cxCode']!="" ? trim($this->post['cxCode']) :"";
+         if($cxCode!=""){
+            $condition[]=["c.cxCode","like","%$cxCode%"];
         }
          $logNo =isset($this->post['logNo'])&&$this->post['logNo']!=""? trim($this->post['logNo']):"";
          if($logNo!==""){
@@ -383,19 +387,19 @@ class OrderPay extends BaseController{
         }
          $count=Db::name("trade_pool")->alias("a")
           ->leftJoin("trade b","a.tradNo=b.tradNo")
-          ->leftJoin("assoc d","a.logNo=d.viceCode")
+          ->leftJoin("assoc d","a.logNo=d.viceCode AND d.type = 2")
           ->leftJoin("qrd_info c","d.orderCode=c.sequenceNo")
           ->where($condition)->count();
            $total=ceil($count/$size);
            $page=$page>$total? intval($total):$page;
            $list =Db::name("trade_pool")->alias("a")
            ->leftJoin("trade b","a.tradNo=b.tradNo")
-           ->leftJoin("assoc d","a.logNo=d.viceCode")
+           ->leftJoin("assoc d","a.logNo=d.viceCode AND d.type = 2")
            	->leftJoin("qrd_info c","d.orderCode=c.sequenceNo")
            ->where($condition)
            ->page($page,$size)
            ->field("a.*,b.trade_bank,b.trade_account,b.trade_out,b.total_fee as btotal_fee,b.used_fee,b.balance,c.customerName,c.customerNo,
-           d.orderCode,c.qrdSource,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,c.totalPrice,d.cancel_fee")
+           d.orderCode,c.qrdSource,c.cxCode,c.goodNo,c.goodName,c.qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.platName,c.totalPrice,d.cancel_fee")
            ->order("a.addtime desc")->select();
            return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/command/Report.php

@@ -281,6 +281,7 @@ class Report extends Command
 		          b.logNo 资金认领编号,
 		          b.customerNo 认领企业,
 		          c.orderCode 订单编号,
+		          d.cxCode 销售主单号,
 		          d.poCode 平台编号,
 		          d.goodName 产品名称,
 		          d.ownerName 资金创建人,

app/command/handleCxData.php

@@ -139,8 +139,6 @@ class handleCxData extends command
 									          'inv_status'=>$data['total_price'] == 0 ? 3 : 1 ,//开票状态,,1未付，2部分，3完结
 									          'remark'=>"" ,//备注,
 									          'cxCode'=>$data['oldCode'] ?? "" ,//备注,
-									          'invtime'=>null ,
-									          'paytime'=>null ,
 									          'diff_weight'=>$data['diff_weight'] ,//工差重量,
 									          'diff_fee'=>$data['diff_fee'] ,//工差金额,
 									          'area'=>$data['customer_name'] ,//公司,
@@ -228,8 +226,6 @@ class handleCxData extends command
 							    'inv_status'=>$data['total_price'] == 0 ? 3 : 1 ,//开票状态,,1未付，2部分，3完结
 							    'remark'=>"" ,//备注,
 							    'cxCode'=>$data['oldCode'] ?? "" ,//备注,
-							    'invtime'=>null ,
-							    'paytime'=>null ,
 							    'diff_weight'=>$data['diff_weight'] ,//工差重量,
 							    'diff_fee'=>$data['diff_fee'] ,//工差金额,
 							    'area'=>$data['customer_name'] ,//公司,