wugg 4 meses atrás
pai
commit
6f7ece2a06

+ 1 - 1
app/admin/model/Base.php

@@ -3,7 +3,7 @@ declare (strict_types = 1);
 
 namespace app\admin\model;
 
-use think\db\Builder;use think\Model;
+use think\Model;
 
 /**
  * @mixin \think\Model

+ 6 - 2
app/common/Youzan.php

@@ -7,8 +7,8 @@ namespace app\common;
 use think\facade\Cache;
 class Youzan {
     private $Client;
-	private  $clientId;
-	private  $clientSecret;
+	private $clientId;
+	private $clientSecret;
 	private $apiVersion='3.0.0';
 	private $authorityId;
     private $methodlist = [
@@ -49,6 +49,10 @@ class Youzan {
     //youzan.ump.voucheractivity.query.3.0.2 根据活动查询选项查询活动详情信息
     //youzan.ump.voucheractivity.manage.info.search.1.0.1 :查询优惠券/码活动管理信息
     //'youzan.ump.voucheractivity.delete',//优惠码/券删除
+
+
+    ///packages/user/coupon/list/index?type=promocard
+    /// packages/user/coupon/detail/index?id=32175626&alias=u3dr326s&type=promocard&sign=50774af53403a0f4737989b98c7231bd&shopAutoEnter=1
     public function __construct()
     {
     	$this->clientId    =env('yz.clientid');

+ 2 - 2
app/cxinv/listener/ComonQrd.php

@@ -30,7 +30,7 @@ class ComonQrd
 		}
 		if($event['type']=='rinv'){
 		    $this->returnInv($event);
-		    $this->InvToPay($event,false);
+		   // $this->InvToPay($event,false);
 		}
 		if($event['type']=='check')$this->checkPay($event);
     }
@@ -44,7 +44,7 @@ class ComonQrd
             		$assoc_status=2;
             	}else{
             		$assoc_status=3;
-            		if(in_array($invinfo->status,[5,6,7,8,9])||$invinfo->is_comon!=1 )return;
+            		if(!in_array($invinfo->status,[5,6,7,8,9])||$invinfo->is_comon!=1 )return;
             	}
 
             	$assoc = Assoc::where(["viceCode"=>$data['invNo'],"status"=>$assoc_status,"is_del"=>0,"type"=>1])->select();