WIN-2308041133\Administrator 6 months ago
parent
commit
c1339f8345

+ 4 - 3
application/api/controller/Lave.php

@@ -333,10 +333,11 @@ class Lave extends Api
             $this->error('未找到签约信息!');
         }
         $mch_id =Company::where('id', $where['cid'])->value('pay_weixin_mchid');
-        $plan_id=$sign_info['plan_id'];
-        $contract_code=$sign_info['contract_code'];
+//        $plan_id=$sign_info['plan_id'];
+//        $contract_code=$sign_info['contract_code'];
+        $contract_id=$sign_info['contract_id'];
 //        $mch_id,$contract_code,$pan_id,$version='1.0',$options=[],$cid=0)
-        $rs=WechatService::deleteSign($mch_id,$contract_code,$plan_id,'1.0',[],$where['cid']);
+        $rs=WechatService::deleteSign($mch_id,$contract_id,'1.0',[],$where['cid']);
         @file_put_contents("quanju.txt", json_encode($rs)."-解除签约返回结果\r\n", 8);
         $this->success('解除签约成功!');
 //        if ($rs){

+ 2 - 2
extend/liuniu/WechatService.php

@@ -583,10 +583,10 @@ class WechatService
     /**
      * 解除签约
      */
-    public static function deleteSign($mch_id,$contract_code,$plan_id,$version='1.0',$options=[],$cid=0)
+    public static function deleteSign($mch_id,$contract_id,$version='1.0',$options=[],$cid=0)
     {
         $contract_termination_remark = '月捐款解约';
-        $order = array_merge(compact('mch_id','contract_code','plan_id','version','contract_termination_remark'), $options);
+        $order = array_merge(compact('mch_id','contract_id','version','contract_termination_remark'), $options);
 //        if ($order['detail'] == '') unset($order['detail']);
 //        $order['notify_url']=Request::instance()->domain() . "/api/wechat/notify/" . $cid;
         $result = self::payment(false, $cid)->contract->delete(

+ 2 - 2
vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php

@@ -89,8 +89,8 @@ class BaseClient
         $this->pushMiddleware($this->logMiddleware(), 'log');
 
         $response = $this->performRequest($endpoint, $method, $options);
-        $a=$returnResponse ? $response : $this->castResponseToType($response, $this->app->config->get('response_type'));
-        @file_put_contents("quanju.txt", json_encode($a) . "-参数解析7\r\n", 8);
+        @file_put_contents("quanju.txt", json_encode($response) . "-参数解析7\r\n", 8);
+        @file_put_contents("quanju.txt", $this->app->config->get('response_type') . "-参数解析8\r\n", 8);
         return $returnResponse ? $response : $this->castResponseToType($response, $this->app->config->get('response_type'));
     }