1

application/api/controller/Lave.php

@@ -316,7 +316,7 @@ class Lave extends Api
 //            $arr['trade_type'] = 'PAP';
 //                    $arr['contract_id'] = Company::where('id', $cid)->value('contract_id');
 //            $rs = WechatService::paymentOrder($openid, $orderInfo['order_id'], $orderInfo['amount'], "lave", $orderInfo['order_name'], '', 'JSAPI', [], $cid);
-
+                    $mch_id =Company::where('id',$cid)->value('pay_weixin_mchid');
                     $where1['cid']=$cid;
                     $where1['user_id']=$v['uid'];
                     $where1['order_name']=$v['order_name'];
@@ -334,12 +334,10 @@ class Lave extends Api
                     $where1['contract_code']=$v['contract_code'];
                     $where1['plan_id']=$v['plan_id'];
 //                $where1['help_id']='0';
-                    @file_put_contents("quanju.txt", json_encode($where1)."测试申请扣款2-\r\n", 8);
                     $order = LaveMonthModel::create($where1);
 //            }
-                    var_dump($order);
-                    die();
-                    $rs = WechatService::papPayApply($arr['out_trade_no'], $arr['total_fee'], "lave", '月捐款', 'PAP', [], $cid,$arr['mch_id'],$arr['contract_id']);
+                    $rs = WechatService::papPayApply($mch_id,$where1['order_id'], $where1['amount'], "lave", '月捐款', 'PAP', [], $cid,$v['contract_id']);
+
                 }
             }
         }

extend/liuniu/WechatService.php

@@ -569,15 +569,16 @@ class WechatService
      * @param array $options
      * @return Order
      */
-    public static function papPayApply($out_trade_no, $total_fee, $attach, $detail = '', $trade_type = 'PAP', $options = [], $cid = 0,$mch_id='',$contract_id='')
+    public static function papPayApply($mch_id,$out_trade_no, $total_fee, $attach, $detail = '', $trade_type = 'PAP', $options = [], $cid = 0,$contract_id='')
     {
         $total_fee = bcmul($total_fee, 100, 0);
-        $order = array_merge(compact('out_trade_no', 'total_fee', 'attach', 'detail', 'trade_type','mch_id','contract_id'), $options);
+        $order = array_merge(compact('mch_id','out_trade_no', 'total_fee', 'attach', 'detail', 'trade_type','contract_id'), $options);
         if ($order['detail'] == '') unset($order['detail']);
-        $order['notify_url']=Request::instance()->domain() . "/api/wechat/notify/" . $cid;
+//        $order['notify_url']=Request::instance()->domain() . "/api/wechat/notify/" . $cid;
         $result = self::payment(false, $cid)->contract->apply(
             $order
         );
+        @file_put_contents("quanju.txt", json_encode($result)."-申请扣款返回结果\r\n", 8);
         return $result;
     }
     /**