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

app/admin/controller/Sale.php

@@ -240,13 +240,36 @@ class Sale extends BaseController{
     	  	]);
     	  if($vali->check($post)==false) return error_show(1004,$vali->getError());
     	  $qrdinf =Db::name("qrd_info")->where(["sequenceNo|cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
-    	  if(!empty($qrdinf))return error_show(1005,"结算存在对账中的订单".implode(",",$qrdinf));
+    	  if(!empty($qrdinf)){
+    	  	$asscoinfo =Db::name("assoc")->where(["ocderCode"=>$qrdinf,"status"=>[1,2],"is_del"=>0])->column("viceCode","type");
+    	  	$message="该销售订单在结算中已参与了以下业务，请全部解除后在申请，";
+    	  	if(isset($asscoinfo[1]))$message.="开票申请编号：".$asscoinfo[1]."\r\n";
+    	  	if(isset($asscoinfo[2]))$message.="资金认领编号：".$asscoinfo[2]."\r\n";
+    	  	return error_show(1005,$message);
+    	  }
     	  $cgdinfo =Db::name("cgd_info")->where(["cxCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
-    	   if(!empty($cgdinfo))return error_show(1005,"结算存在对账中的采购订单".implode(",",$cgdinfo));
+    	   if(!empty($cgdinfo)){
+	            $message="该销售采购订单在结算中已参与了以下业务，请全部解除后在申请，";
+	            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
+	            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
+	            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");
+	            if(!empty($hp))$message.="对账单回票编号：".implode(",",$hp)."\n";
+	            $paydz = Db::name("pay_payment")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("dzNo");
+	            if(!empty($paydz))$message.="对账单付款编号：".implode(",",$paydz)."\n";
+	            return error_show(1005,$message);
+    	   }
     	   if($post['isCgd']==1){
-	           $cgdinfo =Db::name("cgd_info")->where(["qrdCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column
-	           ("sequenceNo");
-	           if(!empty($cgdinfo))return error_show(1005,"结算存在对账中的采购订单".implode(",",$cgdinfo));
+	           $cgdinfo =Db::name("cgd_info")->where(["qrdCode"=>$post['orderCode'],"status"=>1,"is_del"=>0])->column("sequenceNo");
+	           if(!empty($cgdinfo)){
+	           		$message="该销售采购订单在结算中已参与了以下业务，请全部解除后在申请，";
+		            $payinfo = Db::name("pay_info")->where(["cgdNo"=>$cgdinfo,"status"=>1,"is_del"=>0])->column("payNo");
+		            if(!empty($payinfo))$message.="对账单编号：".implode(",",$payinfo)."\n";
+		            $hp = Db::name("pay_invoice")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("hpNo");
+		            if(!empty($hp))$message.="对账单回票编号：".implode(",",$hp)."\n";
+		            $paydz = Db::name("pay_payment")->where(["payNo"=>$payinfo,"is_del"=>0,"status"=>[1,2,3,4]])->column("dzNo");
+		            if(!empty($paydz))$message.="对账单付款编号：".implode(",",$paydz)."\n";
+		            return error_show(1005,$message);
+	           }
     	   }
     	   return app_show(0,"不存在对账订单");
     }

app/admin/controller/Stat.php

@@ -14,7 +14,7 @@ class Stat extends BaseController{
 	public function __construct(App $app) {parent::__construct($app);}
 
 	public function stats(){
-		 $data=Cache::get("statContent");
+		 $data=Cache::get("pay_inv_stat");
 
 		 return app_show(0,"获取成功",$data);
 	}
@@ -203,4 +203,15 @@ class Stat extends BaseController{
 		return app_show(0,"获取成功",$return);
 	}
 
+
+	public function DzQrd(){
+		$post = $this->request->only(["companyNo"=>'GS2203161855277894'],"post","trim");
+		$list = Db::name("qrd_info")
+		          ->where([["createdTime","<=",date("Y-m-d H:i:s",time()-180*24*3600)],["companyNo","=",$post['companyNo']],["wpay_fee",">",0],["platform_type","=",1]])
+		          ->field("sequenceNo,if(cxCode='',sequenceNo,cxCode) cxCode,createdTime,customerName,department,ownerName,goodName,goodNum,goodPrice,totalPrice,apay_fee,wpay_fee,ainv_fee,winv_fee,inv_fee,
+		apay_fee-ainv_fee ainv_wpay,datediff(now(),createdTime) dz_day,pay_status,inv_status,sendStatus")
+		          ->select();
+		return app_show(0,"获取成功",$list);
+	}
+
 }

app/admin/controller/WeChat.php

@@ -59,6 +59,7 @@ class WeChat extends Base {
 
 			}
 		$Dbuser["companyArr"]=$Dbuser['companyArr']!=''?json_decode($Dbuser['companyArr'],true):[];
+		$Dbuser["is_show"]=explode(",",$Dbuser["is_show"]);
 		return app_show(0,"获取成功",$Dbuser);
 	}
 	//网页端调用jssdk配置config

app/admin/middleware/checkToken.php

@@ -19,6 +19,7 @@ class checkToken
 		"admin/departEveryDay",
 		"admin/departEveryMonth",
 		"admin/companyEveryMonth",
+		"admin/dzqrd",
 		"admin/companyEvery",
 		"admin/wechat_getinfo",
 		"admin/wechat_getconfig",

app/admin/route/app.php

@@ -254,6 +254,7 @@ route::rule("departEveryDay","admin/Stat/departEveryDay");//网络部录单分
 route::rule("departEveryMonth","admin/Stat/departEveryMonth");//网络部录单分类
 route::rule("companyEveryMonth","admin/Stat/companyEveryMonth");//网络部录单分类
 route::rule("companyEvery","admin/Stat/companyEvery");//网络部录单分类
+route::rule("dzqrd","admin/Stat/DzQrd");//网络部录单分类
 
 route::rule("companytipslist","admin/DepartTips/list");//网络部录单分类
 route::rule("companytipsadd","admin/DepartTips/create");//网络部录单分类

app/command/reportTips.php

@@ -37,22 +37,20 @@ class reportTips extends Command
 		$depart= Db::connect("mysql_sys")->name("company_item")->where(["id"=>$daprtid])->column("name","id");
 		foreach ($depart as $item=>$name){
 			$uidArr =getUidByDepartId($item);
+			$where=["ownerid"=>$uidArr,"companyNo"=>$companyNo,"platform_type"=>1];
 			$tem=[
 				"depart"=>$name,
-				"wpay_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo])->sum('wpay_fee'),
-				"wpay_ainv_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo,
-					"inv_status"=>[2,3]])->sum('wpay_fee'),
-				"wpay_asend_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo,
-					"sendStatus"=>1])->sum('wpay_fee'),
-				"winv_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo])->sum('winv_fee'),
-				"inv_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo])->sum('inv_fee'),
-				"winv_asend_fee"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo,"sendStatus"=>[2,3]])->sum('winv_fee'),
-				"winv_two_month"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo,"sendStatus"=>[2,3]])
-				                    ->where("createdTime","<=",date("Y-m-d H:i:s",time()-60*24*3600))->sum("winv_fee"),
-				"wpay_six_month"=>Db::name("qrd_info")->where(["ownerid"=>$uidArr,"companyNo"=>$companyNo])->where("createdTime","<=",date("Y-m-d H:i:s",time()-180*24*3600))->sum("wpay_fee")
+				"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'),
+				"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'),
+				"winv_asend_fee"=>Db::name("qrd_info")->where($where)->where(["sendStatus"=>[2,3]])->sum('winv_fee'),
+				"winv_two_month"=>Db::name("qrd_info")->where($where)->where(["sendStatus"=>[2,3]])->where("createdTime","<=",date("Y-m-d H:i:s",time()-60*24*3600))->sum("winv_fee"),
+				"wpay_six_month"=>Db::name("qrd_info")->where($where)->where("createdTime","<=",date("Y-m-d H:i:s",time()-180*24*3600))->sum("wpay_fee")
 			];
 			$temp[]=$tem;
 		}
-		Cache::set("statContent",$temp);
+		Cache::set("pay_inv_stat",$temp);
 	}
 }