ad

app/admin/controller/OrderInv.php

@@ -2464,7 +2464,7 @@ class OrderInv extends Base{
     }
 
     public function  importInv(){
-		$param =$this->request->only(["data"=>[]],"post");
+		$param =$this->request->only(["data"=>[]],"post","trim");
 		if(empty($param['data']))return error_show(1004,"参数 data 不能为空");
 		$total=[];
 		$list=[];
@@ -2551,7 +2551,9 @@ class OrderInv extends Base{
 		 	$inpool = Db::name("invoice_pool")->where([["invNo","in",$keyarr],["open_type","in",[0,2,3]],["is_del","=",0],["status","=",2]])->column("winv_fee,invNo,inv_value,inv_type","invNo");
 
 		 	foreach ($total as $key=>$val){
-				if(!isset($inpool[$key])) throw new Exception("{$key}发票数据不存在或状态有误");
+				if(!isset($inpool[$key])) {
+				    throw new Exception("{$key}发票数据不存在或状态有误");
+				}
 				if(in_array($val['inv_type'],["fully_digitalized_special_electronic", "fully_digitalized_normal_electronic"]) && $inpool[$key]['winv_fee']>$val['inv_total']){
 					throw new Exception("{$key}全电发票面金额小于未开票金额");
 				}
@@ -2563,12 +2565,11 @@ class OrderInv extends Base{
 				];
 				 $up =Db::name("invoice_pool")->where([["invNo","=",$key],["is_del","=",0]])->save($update);
                 if(!$up){
-                    Db::rollback();
-                    return error_show(1005,"发票状态更新失败");
+                      throw new Exception("{$key}发票状态更新失败");
                 }
 
                if($update['status']==4){
-                    $qrdArr=Db::name("assoc")->where(["viceCode"=>$key,"is_del"=>0])->column("id,orderCode,cancel_fee");
+                    $qrdArr=Db::name("assoc")->where(["viceCode"=>$key,'status'=>1,"is_del"=>0])->column("id,orderCode,cancel_fee");
                      if(!empty($qrdArr)){
                           foreach ($qrdArr as $value){
                               $qrdinfo =Db::name("qrd_info")->where(["sequenceNo"=>$value['orderCode']])->find();
@@ -2694,17 +2695,16 @@ class OrderInv extends Base{
             }
             if($value['seller_id']=="") return error_show(1005,"第".($key+1)."行缺少销售方纳税识别号数据");
             if($value['seller_title']=="") return error_show(1005,"第".($key+1)."行缺少销售方名称数据");
-            if($value['seller_addr']=="") return error_show(1005,"第".($key+1)."行缺少销售方地址数据");
-            if($value['seller_mobile']=="") return error_show(1005,"第".($key+1)."行缺少销售方联系方式数据");
-            if($value['seller_bank']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行数据");
-            if($value['seller_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行账户数据");
+//            if($value['seller_addr']=="") return error_show(1005,"第".($key+1)."行缺少销售方地址数据");
+//            if($value['seller_mobile']=="") return error_show(1005,"第".($key+1)."行缺少销售方联系方式数据");
+//            if($value['seller_bank']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行数据");
+//            if($value['seller_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行账户数据");
             if($value['buyer_id']=="") return error_show(1005,"第".($key+1)."行缺少购买方纳税识别号数据");
             if($value['buyer_title']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
-            if($value['buyer_addr']=="") return error_show(1005,"第".($key+1)."行缺少购买方地址数据");
-            if($value['buyer_mobile']=="") return error_show(1005,"第".($key+1)."行缺少购买方联系方式数据");
-            if($value['buyer_bank']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行数据");
-            if($value['buyer_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行账户数据");
-            if($value['buyer_title']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
+//            if($value['buyer_addr']=="") return error_show(1005,"第".($key+1)."行缺少购买方地址数据");
+//            if($value['buyer_mobile']=="") return error_show(1005,"第".($key+1)."行缺少购买方联系方式数据");
+//            if($value['buyer_bank']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行数据");
+//            if($value['buyer_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行账户数据");
             if($value['XMMC']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
             if($value['GGXH']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
             if($value['DW']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");

app/admin/controller/Payment.php

@@ -221,7 +221,7 @@ class Payment extends Base
 
        $data=[];
         foreach ($list as $key=>$value){
-            $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0]])->count();
+            $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0],['status','=',1]])->count();
                $value['inv_tag_name']='';
                             $value['pay_tag_name']='';
                             $value['pay_tag_img']='';
@@ -1531,9 +1531,7 @@ class Payment extends Base
                 }
                 Db::commit();
                 return app_show(0,"回票申请更新成功");
-            }
-                     Db::rollback();
-                    return error_show(1003,"回票申请状态更新失败");
+            }throw new \Exception("回票申请状态更新失败");
         }catch (\Exception $e){
             Db::rollback();
             return error_show(1004,$e->getMessage());

app/admin/controller/TagGood.php

@@ -435,8 +435,9 @@ class TagGood extends Base{
     public function logList(){
     	$param = $this->request->param(["betweenTime"=>[],"customerNo"=>"","supplierNo"=>"",'companyNo'=>'',
     	"type"=>'',"status"=>"","orderCode"=>"","creater"=>"","order_type"=>0,"size"=>10,"page"=>1],"post","trim");
-    	$where=[["tagInfo.type","in",$param['order_type']==2?[1,2]:[3,4]]];
     	$sbtable = $param['order_type']==2?'payInfo':'orderInfo';
+    	$where=[["tagInfo.type","in",$param['order_type']==2?[1,2]:[3,4]],["{$sbtable}.is_del","=",0],["tagInfo.is_del",'=',0]];
+
     	empty($param['betweenTime'])?:$where[]=["tag_log.addtime","between",$param['betweenTime']];
     	
     if($param['order_type']==1)$param['customerNo']==""?:$where[]=["{$sbtable}.customerNo","like","%{$param['customerNo']}%"];

app/admin/listener/ComonQrd.php

@@ -35,9 +35,9 @@ class ComonQrd
     }
     
     public function InvToPay($data,$bool=True){
-                $invinfo =InvoicePool::where(['invNo'=>$data['invNo']])->findOrEmpty();
+                $invinfo =InvoicePool::with(["poolInfo"])->where(['invNo'=>$data['invNo']])->findOrEmpty();
             	if($invinfo->isEmpty())return;
-            	if($invinfo->inv_out !=='GS2404151642335170')return;
+            	if($invinfo->buyer_code !=='911100006337468570')return;
             	if($bool){
             		if($invinfo->status!=4 ||$invinfo->is_comon!=1 )return;
             		$assoc_status=2;
@@ -57,7 +57,7 @@ class ComonQrd
             		if(!isset($payArr[$item->sequenceNo]))continue;
 		           $tag_temp=[
 		                'code'=>$item->sequenceNo,
-		                'tag_id'=>11,
+		                'tag_id'=>10,
 		                'creater'=>'system',
 		                'createrid'=>0,
 		                'tag_fee'=>0,

app/admin/model/InvoicePool.php

@@ -10,5 +10,8 @@ use think\Model;
  */
 class InvoicePool extends Model
 {
-    //
+
+    public function PoolInfo(){
+        return $this->belongsTo(InvoicePoolInfo::class,'invNo','invNo')->bind(["buyer_code","seller_code"]);
+    }
 }

app/common.php

@@ -309,11 +309,10 @@ function curl_request($url,$post='',$header=[]){
 * @throws \think\db\exception\ModelNotFoundException
  */
 function checkRole($roleid,$menu){
-    $roleinfo = \think\facade\Db::name("role_action")->where([['role_id',"in",$roleid],["status","=",1]])->find();
-    if($roleinfo['private_data']!=""){
+    $roleinfo = \think\facade\Db::name("role_action")->where([['role_id',"in",$roleid],["status","=",1]])->json(["private_data"])->find();
+    if(!empty($roleinfo['private_data'])){
 
-        $private = explode(",",$roleinfo['private_data']);
-        if(in_array($menu,$private)){
+        if(in_array($menu,$roleinfo['private_data'])){
             return true;
         }
     }