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

app/admin/controller/OrderInv.php

@@ -3,7 +3,7 @@
 
 namespace app\admin\controller;
 use app\admin\BaseController;
-use app\admin\model\ReportCode;
+use app\admin\model\InvoiceInterface;use app\admin\model\ReportCode;
 use think\App;
 use think\Exception;
 use think\facade\Config;
@@ -55,10 +55,10 @@ class OrderInv extends BaseController{
        if($company==false){
            return error_show(1004,"销售方信息未找到");
        }
-       $supplier = Db::name("supplier_info")->where(["code"=>$companyNo])->find();
-       if($supplier==false){
-           return error_show(1004,"业务公司信息未找到");
-       }
+//       $supplier = Db::name("supplier_info")->where(["code"=>$companyNo])->find();
+//       if($supplier==false){
+//           return error_show(1004,"业务公司信息未找到");
+//       }
        $invtype = isset($this->post['invtype'])&&$this->post['invtype']!=='' ? trim($this->post['invtype']):"";
         if($invtype==''){
            return error_show(1004,"参数 invtype 不能为空");
@@ -195,7 +195,7 @@ class OrderInv extends BaseController{
             "invNo"=>$invNo,
             "inv_value"=>$invfee,
             "inv_out"=> $companyNo,
-            "inv_company"=> $supplier['name']??"",
+            "inv_company"=> $company['invoice_title']??"",
             "apply_id"=>$this->uid,
             "apply_name"=>$this->uname,
             "inv_type"=>$invtype,//发票类型  专用 普通 电子专用 电子普通 全电子票
@@ -2442,7 +2442,7 @@ class OrderInv extends BaseController{
           '开票企业法人',
           '开票企业联系方式'
       ];
-       $li = excelExport("待开票",$header,$data);
+       excelExport("待开票",$header,$data);
     }
 
     public function  importInv(){
@@ -2601,4 +2601,49 @@ class OrderInv extends BaseController{
 		 }
 
     }
+    
+    //金税开票列表
+    public function InvInterfaceList(){
+    	$param=$this->request->param(["page"=>1,"size"=>15,"kpfs"=>"","kplx"=>"","invNo"=>"","companyNo"=>"",
+    	"customerName"=>"","fphm"=>"","fplxdm"=>"","status"=>""],"post","trim");
+    	$where=[];
+    	$model = new InvoiceInterface();
+    	$param['kpfs']??$where[]=["KPFS","=",$param['kpfs']];
+    	$param['kplx']??$where[]=["KPLX","=",$param['kplx']];
+    	$param['fplxdm']??$where[]=["FPLXDM","=",$param['fplxdm']];
+    	$param['status']??$where[]=["status","=",$param['status']];
+    	$param['invNo']??$where[]=["invNo","like","%{$param['invNo']}%"];
+    	if($param['companyNo']!=''){
+    	  $sbh  = Db::name("company_info")->where("companyNo",$param['companyNo'])->value("company_license",'');
+    	   $where[]=["XHFSBH","=",$sbh];
+    	}
+    	$param['customerName']??$where[]=["GMFMC","like","%{$param['customerName']}%"];
+    	$param['fphm']??$where[]=["YFPHM","like","%{$param['fphm']}%"];
+    	$list = $model->where($where)
+    	->field("id,invNo,KPLX,KPFS,FPLXDM,XHFMC,XHFSBH,GMFSBH,GMFMC,KPR,SKR,FHR,YFPDM,YFPHM,YFPLX,YFPKPRQ,JSHJ,
+    	HJJE,HJSE,status,remark,updatetime,addtime")->order("id desc")->paginate(["list_rows"=>$param["size"],"page"=>$param['page']]);
+    	
+    	return app_show(0,'获取成功',['list'=>$list->items(),'count'=>$list->total()]);
+    }
+    
+        //金税开票列表
+    public function InvInterfaceCheck(){
+    	$param=$this->request->param(["id"=>"","status"=>""],'post','trim');
+    	$model = new InvoiceInterface();
+    	$valid=Validate::rule([
+    		"id|数据信息id"=>"require|number|gt:0",
+    	    "status|状态"=>"require|number|in:0,1"
+    	    ]);
+    	if($valid->check($param)==false)return error_show(1004,$valid->getError());
+    	$info= $model->findOrEmpty($param['id']);
+    	if($info->isEmpty())return error_show(1004,"未找到数据");
+    	if(in_array($info->status,[0,1,2]))return error_show(1004,'数据处理中');
+    	$info->status=$param['status'];
+    	$info->is_check=0;
+    	if($info->status==0){
+    	    $info->DDQQPCH =randomkeys(26).date('YmdHis');
+    	}
+    	$up= $info->save();
+    	return $up? app_show(0,"修改成功"):error_show(1004,"修改失败");
+    }
 }

app/admin/model/InvoiceInterface.php

@@ -0,0 +1,15 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class InvoiceInterface extends Model
+{
+    protected $updateTime="updatetime";
+    protected $addTime="addtime";
+}

app/admin/route/app.php

@@ -204,6 +204,9 @@ route::rule('hpinvlist', 'admin/Payment/hpinvList');//采购单发票查询
 route::rule('orderinvdown', 'admin/OrderInv/downorder');//销售单批量开票导出
 route::rule('orderinvimport', 'admin/OrderInv/importInv');//销售单批量开票数据导入
 
+route::rule('invinterfacelist', 'admin/OrderInv/InvInterfaceList');//销售单批量开票数据导入
+route::rule('invinterfacecheck', 'admin/OrderInv/InvInterfaceCheck');//销售单批量开票数据导入
+
 route::rule('systemadd', 'admin/System/create');//新建系统版本信息
 route::rule('systemlist', 'admin/System/list');//系统版本信息列表
 route::rule('systemedit', 'admin/System/save');//系统版本信息编辑
@@ -266,3 +269,5 @@ route::rule("departtipsadd","admin/DepartTips/departcreate");//网络部录单
 route::rule("wechat_getinfo","admin/WeChat/getinfo");//微信授权获取用户信息
 route::rule("wechat_getconfig","admin/WeChat/getConfig");//微信获取页面jssdk配置
 
+
+

app/command/companyStats.php

@@ -26,6 +26,7 @@ class companyStats extends Command
 	    if($sttime==1) return '';
 	    Cache::set("compTips",1,1800);
       $supplier = ["GS2302231124114965","GS2302231125079621","GS2302231323386950",'GS2203161855277894',"GS2304031312553746"];
+      
       try{
 	      foreach ($supplier as $sp){
 		      $this->checkData($sp);
@@ -33,13 +34,12 @@ class companyStats extends Command
       }catch (\Exception $e){
       	echo $e->getMessage();
       }
-
     }
 
 	/**
 	 * @param $supplierNo
 	 */
-    public function checkData($supplierNo):void {
+    public function checkData($supplierNo,$dateArr=[]):void {
         $sup=Db::connect("mysql_sys")->name("headquarters")->where(["code"=>$supplierNo])->field("code,name,relation_code")->findOrEmpty();
         if (empty($sup)) return;
         $date=date("Y-m-d");

app/command/reportTips.php

@@ -42,6 +42,15 @@ class reportTips extends Command
 				"depart"=>$name,
 				"wpay_fee"=>Db::name("qrd_info")->where($where)->sum('wpay_fee'),
 				"wpay_ainv_fee"=>Db::name("qrd_info")->where($where)->where(["inv_status"=>[2,3]])->sum('wpay_fee'),
+				"ainv_fee"=>Db::name("qrd_info")->where($where)->where(function ($query){
+					$query->whereOr([['inv_status','<>',3],['pay_status','<>',3]]);
+				})->sum('ainv_fee'),
+				"apay_fee"=>Db::name("qrd_info")->where($where)->where(function ($query){
+					$query->whereOr([['inv_status','<>',3],['pay_status','<>',3]]);
+				})->sum('apay_fee'),
+				"ainv_apay_fee"=>Db::name("qrd_info")->where($where)->where(function ($query){
+					$query->whereOr([['inv_status','<>',3],['pay_status','<>',3]]);
+				})->sum(Db::raw("ainv_fee - apay_fee")),
 				"wpay_send_fee"=>Db::name("qrd_info")->where($where)->where(["sendStatus"=>1])->sum('wpay_fee'),
 				"winv_fee"=>Db::name("qrd_info")->where($where)->sum('winv_fee'),
 				"inv_fee"=>Db::name("qrd_info")->where($where)->sum('inv_fee'),

public/nginx.htaccess

@@ -0,0 +1,4 @@
+if (!-e $request_filename) {
+   rewrite  ^/(.*)$  /index.php/$1  last;
+   break;
+}