wugg 2 years ago
parent
commit
46ba38b445

+ 56 - 0
app/admin/controller/OrderInv.php

@@ -519,6 +519,7 @@ class OrderInv extends BaseController{
          }
 
     }
+    //红冲票
     public function returnRed(){
         $returnCode = isset($this->post['returnCode'])&&$this->post['returnCode']!="" ? trim($this->post['returnCode']):"";
         if($returnCode==""){
@@ -588,6 +589,45 @@ class OrderInv extends BaseController{
             return error_show(1005,$e->getMessage());
         }
     }
+    //退票详情
+    public function  returnInfo(){
+        $returnCode = isset($this->post['returnCode'])&&$this->post['returnCode']!="" ? trim($this->post['returnCode']):"";
+        if($returnCode==""){
+            return error_show(1005,"参数 returnCode 不能为空");
+        }
+        $return= Db::name("invoice_return")->where(["returnCode"=>$returnCode])->find();
+        if($return==false){
+            return error_show(1005,"退票申请信息未找到");
+        }
+        $invinfo = Db::name("invoice_pool")->where(["invNo"=>$return['invNo'],"is_del"=>0])->find();
+        $return['inv_out']= $invinfo['inv_out']??"";
+        $return['inv_value']= $invinfo['inv_value']??"";
+        $return['inv_apply_id']= $invinfo['apply_id']??"";
+        $return['inv_apply_name']= $invinfo['apply_name']??"";
+        $return['inv_type']= $invinfo['inv_type']??"";
+        $return['open_type']= $invinfo['open_type']??"";
+        $return['is_ticket']= $invinfo['is_ticket']??"";
+        $return['email']= $invinfo['email']??"";
+        $return['post_code']= $invinfo['post_code']??"";
+        $return['post_company']= $invinfo['post_company']??"";
+        $poolinfo =  Db::name("invoice_pool_info")->where(["invNo"=>$return['invNo']])
+        ->field("buyer_title,buyer_code,buyer_addr,buyer_mobile,buyer_bank,buyer_bankNo,seller_title,seller_addr,seller_code,seller_mobile,seller_bank,seller_bankNo")
+        ->find();
+        $return['buyer_title'] = $poolinfo['buyer_title']??'';
+        $return['buyer_code'] = $poolinfo['buyer_code']??'';
+        $return['buyer_addr'] = $poolinfo['buyer_addr']??'';
+        $return['buyer_mobile'] = $poolinfo['buyer_mobile']??'';
+        $return['buyer_bank'] = $poolinfo['buyer_bank']??'';
+        $return['buyer_bankNo'] = $poolinfo['buyer_bankNo']??'';
+        $return['seller_title'] = $poolinfo['seller_title']??'';
+        $return['seller_addr'] = $poolinfo['seller_addr']??'';
+        $return['seller_code'] = $poolinfo['seller_code']??'';
+        $return['seller_mobile'] = $poolinfo['seller_mobile']??'';
+        $return['seller_bank'] = $poolinfo['seller_bank']??'';
+        $return['seller_bankNo'] = $poolinfo['seller_bankNo']??'';
+
+        return app_show(0,"获取成功",$return);
+    }
     /**
      *发票池列表
      */
@@ -662,6 +702,22 @@ class OrderInv extends BaseController{
 //      $kehu =Db::name("customer_info")->where(["companyNo"=>$poolinfo['inv_in']])->find();
       $poolinfo['companyName'] = $company['company_name']??"";
 //      $poolinfo['customerName'] = $kehu['companyName']??"";
+         $pool =  Db::name("invoice_pool_info")->where(["invNo"=>$invNo])
+        ->field("buyer_title,buyer_code,buyer_addr,buyer_mobile,buyer_bank,buyer_bankNo,seller_title,seller_addr,seller_code,seller_mobile,seller_bank,seller_bankNo")
+        ->find();
+        $poolinfo['buyer_title'] = $pool['buyer_title']??'';
+        $poolinfo['buyer_code'] = $pool['buyer_code']??'';
+        $poolinfo['buyer_addr'] = $pool['buyer_addr']??'';
+        $poolinfo['buyer_mobile'] = $pool['buyer_mobile']??'';
+        $poolinfo['buyer_bank'] = $pool['buyer_bank']??'';
+        $poolinfo['buyer_bankNo'] = $pool['buyer_bankNo']??'';
+        $poolinfo['seller_title'] = $pool['seller_title']??'';
+        $poolinfo['seller_addr'] = $pool['seller_addr']??'';
+        $poolinfo['seller_code'] = $pool['seller_code']??'';
+        $poolinfo['seller_mobile'] = $pool['seller_mobile']??'';
+        $poolinfo['seller_bank'] = $pool['seller_bank']??'';
+        $poolinfo['seller_bankNo'] = $pool['seller_bankNo']??'';
+
        return app_show(0,"获取成功",$poolinfo);
     }
     //退票列表

+ 62 - 2
app/admin/controller/OrderPay.php

@@ -356,6 +356,41 @@ class OrderPay extends BaseController{
          $list =Db::name("trade_pool")->where($condition)->order("addtime desc")->select();
           return app_show(0,"获取成功",$list);
     }
+
+    //资金详情
+    public function tradeInfo(){
+        $tradNo =isset($this->post['tradNo'])&&$this->post['tradNo']!=""? trim($this->post['tradNo']):"";
+        if($tradNo==""){
+           return error_show(1004,"参数 tradNo 不能为空");
+        }
+        $tradinfo = Db::name("trade")->where(["tradNo"=>$tradNo,"is_del"=>0])->find();
+        if($tradinfo==false){
+           return error_show(1004,"资金信息未找到");
+        }
+        return app_show(0,"获取成功",$tradinfo);
+    }
+
+      //资金认领详情
+    public function logInfo(){
+        $logNo =isset($this->post['logNo'])&&$this->post['logNo']!=""? trim($this->post['logNo']):"";
+        if($logNo==""){
+           return error_show(1004,"参数 logNo 不能为空");
+        }
+        $tradinfo = Db::name("trade_pool")->where(["logNo"=>$logNo,"is_del"=>0])->find();
+        if($tradinfo==false){
+           return error_show(1004,"资金信息未找到");
+        }
+        $trade = Db::name("trade")->where(["tradNo"=>$tradinfo['tradNo'],"is_del"=>0])->find();
+        $tradinfo['trade_out']= $trade['trade_out']??"";
+        $tradinfo['trade_in']= $trade['trade_in']??"";
+        $tradinfo['trade_bank']= $trade['trade_bank']??"";
+        $tradinfo['customerNo']= $trade['customerNo']??"";
+        $tradinfo['companyNo']= $trade['companyNo']??"";
+        $tradinfo['total_fee']= $trade['total_fee']??"";
+        $tradinfo['balance']= $trade['balance']??"";
+        $tradinfo['used_fee']= $trade['used_fee']??"";
+        return app_show(0,"获取成功",$tradinfo);
+    }
     //认领资金退回或退款 type 1 退款 2 解除资金认领
     public  function  ReturnPay(){
         $logNo = isset($this->post['logNo'])&&$this->post['logNo']!="" ? trim($this->post['logNo']):"";
@@ -397,7 +432,7 @@ class OrderPay extends BaseController{
            return error_show(1004,"申请新建失败");
         }
     }
-    /**
+    /**退款列表
     *   //page size tradNo logNo apply_id apply_name type  status returnCode
     * @return \think\response\Json|void
     * @throws \think\db\exception\DataNotFoundException
@@ -548,7 +583,32 @@ class OrderPay extends BaseController{
           return error_show(1004,$e->getMessage());
         }
     }
-
+    //退款申请详情
+    public function returnInfo(){
+        $returnCode=isset($this->post['returnCode'])&&$this->post['returnCode']!=''?trim($this->post['returnCode']):"";
+        if($returnCode==''){
+            return error_show(1004,"参数 returnCode 不能为空");
+        }
+        $returninfo =Db::name("trade_return")->where(["returnCode"=>$returnCode,"is_del"=>0])->find();
+        if($returninfo==false){
+           return error_show(1004,"退款申请数据未找到");
+        }
+        $trade = Db::name("trade")->where(["tradNo"=>$returninfo['tradNo'],"is_del"=>0])->find();
+        $returninfo['trade_out']= $trade['trade_out']??"";
+        $returninfo['trade_in']= $trade['trade_in']??"";
+        $returninfo['trade_bank']= $trade['trade_bank']??"";
+        $returninfo['trade_time']= $trade['trade_time']??"";
+        $returninfo['customerNo']= $trade['customerNo']??"";
+        $returninfo['companyNo']= $trade['companyNo']??"";
+        $returninfo['total_fee']= $trade['total_fee']??"";
+        $returninfo['balance']= $trade['balance']??"";
+        $returninfo['used_fee']= $trade['used_fee']??"";
+        $pool =Db::name("trade_pool")->where(["logNo"=>$returninfo['logNo'],"is_del"=>0])->find();
+         $returninfo['log_total_fee']= $pool['total_fee']??"";
+         $returninfo['log_apply_id']= $pool['apply_id']??"";
+         $returninfo['log_apply_name']= $pool['apply_name']??"";
+         return app_show(0,"获取成功",$returninfo);
+    }
      /**
      * 显示创建资源表单页.
      *

+ 86 - 88
app/admin/controller/Payment.php

@@ -762,105 +762,73 @@ class Payment extends BaseController
         $list =  Db::name("cgd_info")->where($condition)->page($page,$size)->order('createdTime desc')->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
-
-
+    //采购单信息
+    public function cgdinfo(){
+        $post=$this->post;
+        $sequenceNo = isset($post['sequenceNo']) && $post['sequenceNo']!='' ? trim($post['sequenceNo']) :"";
+        if($sequenceNo==''){
+            return error_show(1004,"参数 sequenceNo 不能为空");
+        }
+       $cgdinfo =  Db::name("cgd_info")->where(["sequenceNo"=>$sequenceNo])->findOrEmpty();
+        if(empty($cgdinfo)){
+            return error_show(1004,"采购单信息未找到");
+        }
+        $cgdinfo['catInfo'] = json_decode($cgdinfo['catInfo'],true);
+             $payinfo =Db::name("pay_info")->alias("a")->leftJoin("pay b","a.payNo=b.payNo")
+        ->where(["a.is_del"=>0,"b.is_del"=>0,"a.cgdNo"=>$sequenceNo])->field("b.inv_status,b.pay_status,b.status")
+        ->find();
+        $cgdinfo["cgd_pay_status"]=$payinfo['pay_status']??1;
+        $cgdinfo["cgd_inv_status"]=$payinfo['inv_status']??1;
+        $cgdinfo["cgd_status"]=$payinfo['status']??0;
+        return app_show(0,"获取成功",$cgdinfo);
+    }
     //todo
     public function PayInfo()
     {
         $post = $this->post;
-        $token = isset($post['token']) ? trim($post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0){
-            return error_show($effetc['code'],$effetc['message']);
+        $payNo =isset($post['payNo'])&&$post['payNo']!='' ? trim($post['payNo']):"";
+         if($payNo==""){
+            return error_show(1004,"参数 payNo 不能为空");
         }
-        $sid = isset($post['sid'])&& $post['sid']!="" ? intval($post['sid']) :"";
-        if($sid==""){
-            return error_show(1004,"参数sid 不能为空");
+        $payinfo =Db::name("pay")->where(["payNo"=>$payNo,"is_del"=>0])->find();
+        if($payinfo==false){
+              return error_show(1004,"对账单数据未找到");
         }
-        $payinfo = Db::name("pay_ment")->where("sid","=",$sid)->field("id,payNo,contector,supplierNo,name,pay_method,pay_rate,dpay_fee,inv_rate,rate,dpay_rate,pay_stages,return_img,remark,pay_status,dstatus,pay_remark")->find();
-        if(empty($payinfo)){
-            return error_show(1004,"付款申请信息未找到");
+           $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();
+        foreach ($pay as &$value){
+            $value['catInfo'] = json_decode($value['catInfo'],true);
         }
-        $payinfo['return_img'] = isset($payinfo['return_img']) && $payinfo['return_img']!="" ? explode(",",$payinfo['return_img']):"";
+        $payinfo['cgdlist'] = $pay;
+        return app_show(0,"获取成功",$payinfo);
+    }
 
-        $paylist = Db::name("pay_info")->where([["payNo","=",$payinfo['payNo']],["status","=",1]])->column("sequenceNo");
-        $payinfo['list']=[];
-        if($paylist){
-            $list = Db::name("cgd_info")->alias('a')->join('cfp_supplier_info b','a.ShortText1617861287265=b.code','left')
-                ->join("cfp_cgd_inv c",'c.cgdNo=a.sequenceNo','left')
-                ->where([["a.sequenceNo","in",$paylist],["a.status","=",1]])->field("a.id,
-        `a`.`sequenceNo` AS `sequenceNo`,
-        `a`.`ownerName` AS `ownerName`,
-        `a`.`department` AS `department`,
-        b.code as supplierNo,
-        `a`.`ShortText1618315935182` AS `cgdNO`,
-        `b`.`name` AS `name`,
-        `b`.`contector` AS `contector`,
-        `b`.`mobile` AS `mobile`,
-        `a`.`ShortText1617861001482` AS `goodNo`,
-        `a`.`ShortText1617861966146` AS `goodName`,
-        `a`.`ShortText1617865626160` AS `goodType`,
-        `a`.`ShortText1617865633070` AS `goodBank`,
-        `a`.`ShortText1617865675342` AS `goodModel`,
-        `a`.`ShortText1617865678025` AS `goodMaterial`,
-	    `a`.`ShortText1617865680605` AS `goodColor`,
-        `a`.`text1618268357055` AS `goodDesc`,
-	    `a`.`ShortText1617865685744` AS `goodUnit`,
-	    `a`.`ShortText1618240134229` AS `goodCat`,
-	   	ifnull( `a`.`Number1618240480148`, '0' ) AS `weight`,
-	    ifnull( `a`.`Number1618240458074`, '0' ) AS `price`,
-	    `a`.`ShortText1617866158120` AS `isDiff`,
-	   `a`.`number1618240356104` AS `workDay`,
-	   `a`.`ShortText1617865688485` AS `taxPoint`,
-	   	`a`.`Number1617865804813` AS `nakedPrice`,
-	`a`.`Number1617865807879` AS `markPrice`,
-	`a`.`Number1617865810822` AS `packPrice`,
-	`a`.`Number1617865813284` AS `certPrice`,
-	`a`.`Number1617865816181` AS `openPrice`,
-	`a`.`number1618240204358` AS `craftPrice`,
-	`a`.`number1618240287778` AS `postPrice`,
-	`a`.`Number1617865818517` AS `totalPrice`,
-	 `a`.`Number1618240685904` AS `purchasePrice`,
-	   `a`.`Number1618240600907` AS `orderNum`,
-       `a`.`Number1618330470625` AS `pay_fee`,
-	`a`.`Number1618330472961` AS `wait_fee`,
-	`a`.`Number1618330541286` AS `inv_open_fee`,
-	`a`.`Number1618330543270` AS `inv_wait_fee`,
-      `a`.`ShortText1619463188366` AS `payinfo`,
-	`a`.`ShortText1619463208482` AS `invinfo`,
-       a.th_status as th_info,
-       a.ShortText1618859321070 as   send_info,
-       `a`.`Number1619632826654` AS `diff_fee`,
-	`a`.`Number1619632830397` AS `diff_info`,
-        createdTime,
-        a.Date1618315953443 as DownTime,
-      IF
-	(( `a`.`sequenceStatus` = 'COMPLETED' ), 2, 1 ) AS `order_status`,
-       ifnull( `c`.`companyNo`, '' ) AS `inv_company`,
-	ifnull( `c`.`status`, '0' ) AS `inv_status`,
-	ifnull( `c`.`id`, '0' ) AS `invid`")
-                ->select();
-            $data=[];
-            foreach ($list as $key=>$value){
-                $value['pay_price'] =sprintf( "%.2f",$value['totalPrice']*$value['orderNum']);
-                if($value['inv_company']!=""){
-                    $invcom = Db::name("company_info")->where([['companyNo',"=",$value['inv_company']],['status',"=",1]])
-                        ->find();
-                    $value['inv_company_name'] =isset($invcom['company_name']) ? $invcom['company_name']:"";
-                }else{
-                    $value['inv_company_name'] ="";
-                }
-                $data[]=$value;
-            }
-            $payinfo['list']=$data;
-            }
+      public function DzInfo()
+    {
+        $post = $this->post;
+        $DzNo =isset($post['DzNo'])&&$post['DzNo']!='' ? trim($post['DzNo']):"";
+         if($DzNo==""){
+            return error_show(1004,"参数 DzNo 不能为空");
+        }
+        $payinfo =Db::name("pay_payment")->where(["dzNo"=>$DzNo,"is_del"=>0])->find();
+        if($payinfo==false){
+              return error_show(1004,"对账单付款申请数据未找到");
+        }
+        $pay =Db::name("pay")->where(["payNo"=>$payinfo['payNo'],"is_del"=>0])->find();
+        if($pay==false){
+              return error_show(1004,"对账单数据未找到");
+        }
+        $payinfo['pay_apply_id'] = $pay['apply_id']??'';
+        $payinfo['pay_apply_name'] = $pay['apply_name']??'';
+        $payinfo['supplierNo'] = $pay['supplierNo']??'';
+        $payinfo['supplierName'] = $pay['supplierName']??'';
+        $payinfo['companyNo'] = $pay['companyNo']??'';
+        $payinfo['companyName'] = $pay['companyName']??'';
+        $payinfo['total_fee'] = $pay['total_fee']??'';
 
         return app_show(0,"获取成功",$payinfo);
     }
-
     /**发票新建添加
      * @return \think\response\Json|void
      * @throws \think\db\exception\DataNotFoundException
@@ -1177,6 +1145,36 @@ class Payment extends BaseController
         }
     }
 
+
+    public function  HpInfo(){
+        $post = $this->post;
+        $hpNo = isset($post['hpNo'])&&$post['hpNo']!="" ? trim($post['hpNo']) :"";
+        if ($hpNo==""){
+            return error_show(1004,"参数 hpNo 不能为空");
+        }
+        $payinv =Db::name("pay_invoice")->where(["hpNo"=>$hpNo,"is_del"=>0])->find();
+        if($payinv==false){
+            return error_show(1004,"对账单回票申请未找到数据");
+        }
+        $payinfo= Db::name("pay")->where([['payNo',"=",$payinv['payNo']],['is_del',"=",0]])->find();
+       if($payinfo==false){
+            return error_show(1005,"未找到对账信息");
+        }
+
+        $payinv['pay_apply_id'] = $payinfo['apply_id']??'';
+        $payinv['pay_apply_name'] = $payinfo['apply_name']??'';
+        $payinv['supplierNo'] = $payinfo['supplierNo']??'';
+        $payinv['supplierName'] = $payinfo['supplierName']??'';
+        $payinv['companyNo'] = $payinfo['companyNo']??'';
+        $payinv['companyName'] = $payinfo['companyName']??'';
+        $payinv['total_fee'] = $payinfo['total_fee']??'';
+        $invinfo =Db::name("invoice_info")->where(["hpNo"=>$hpNo])->findOrEmpty();
+        if(!empty($invinfo)){
+            $invinfo['item_list'] =json_decode($invinfo['item_list'],true);
+        }
+        $payinv["info"]=$invinfo;
+        return app_show(0,'获取成功',$payinv);
+    }
     public  function UnPay(){
         $post = $this->post;
         $codeNo = isset($post['id'])&&$post['id']!=="" ? trim($post['id']) :'';

+ 15 - 2
app/admin/controller/Sale.php

@@ -109,9 +109,22 @@ class Sale extends BaseController{
         if($up){
             return app_show(0,"更新成功");
         }else{
-             return app_show(0,"更新失败");
+            return error_show(1003,"更新失败");
         }
     }
-
+    //确认单信息详情
+    public function saleinfo(){
+        $post=$this->post;
+        $sequenceNo =isset($post['sequenceNo'])&&$post['sequenceNo']?trim($post['sequenceNo']):"";
+        if($sequenceNo==''){
+            return error_show(1003,"参数 sequenceNo 不能为空");
+        }
+        $qrdinfo =Db::name("qrd_info")->where("sequenceNo","=",$post['sequenceNo'])->findOrEmpty();
+        if(empty($qrdinfo)){
+          return error_show(1004,"未找到确认单信息");
+        }
+        $qrdinfo['catInfo'] = json_decode($qrdinfo['catInfo'],true);
+        return app_show(0,"获取成功",$qrdinfo);
+    }
 
 }

+ 11 - 0
app/admin/route/app.php

@@ -112,6 +112,17 @@ Route::rule("orderchage","admin/Sale/status");
 
 Route::rule("uploadimg","admin/Upload/UploadImg");
 
+Route::rule("cgdinfo","admin/Payment/cgdinfo");
+Route::rule("payinfo","admin/Payment/PayInfo");
+Route::rule("dzinfo","admin/Payment/DzInfo");
+Route::rule("hpinfo","admin/Payment/HpInfo");
+Route::rule("saleinfo","admin/Sale/saleinfo");
+
+Route::rule("returninvinfo","admin/OrderInv/returnInfo");
+Route::rule("tradeloginfo","admin/OrderPay/logInfo");
+Route::rule("tradeinfo","admin/OrderPay/tradeInfo");
+Route::rule("returnpayinfo","admin/OrderPay/returnInfo");
+