Wesmiler

app/Services/Common/BalanceLogsService.php

@@ -337,7 +337,7 @@ class BalanceLogsService extends BaseService
             if ($status == 2) {
                 // 微信
                 if($record->pay_type==10){
-                    $record->pay_status = 10; 
+                    $record->pay_status = 10;
                 }else{
                     $record->pay_status = 20; // 20-已支付
                     $record->pay_at = date('Y-m-d H:i:s');
@@ -436,7 +436,8 @@ class BalanceLogsService extends BaseService
 
         DB::beginTransaction();
         $batchId = isset($result['batch_id'])?$result['batch_id']:'';
-        $updateData = ['pay_status'=> 20,'pay_at'=>date('Y-m-d H:i:s'),'batch_id'=>$batchId,'receive_status'=> 2,'update_time'=>time()];
+        $packageInfo = isset($result['package_info'])?$result['package_info']:'';
+        $updateData = ['pay_status'=> 20,'pay_at'=>date('Y-m-d H:i:s'),'package_info'=>$packageInfo,'batch_id'=>$batchId,'receive_status'=> 2,'update_time'=>time()];
         if(!$this->model->where(['id'=> $id])->update($updateData)){
             DB::rollBack();
             $this->error = '提现打款处理失败';

app/Services/PaymentService.php

@@ -987,14 +987,15 @@ class PaymentService extends BaseService
                 $result = $pay->transfer($payData);
                 RedisService::set("caches:payments:wechat:{$scene}_{$outTradeNo}_result", ['order' => $order,'params'=>$payData,'result'=> $result, 'config' => $this->config], 7200);
                 $msg = isset($result['message'])? trim($result['message']) : '';
-                $batchId = isset($result['batch_id'])? trim($result['batch_id']) : '';
-                if(empty($batchId)){
+                $batchId = isset($result['transfer_bill_no'])? trim($result['transfer_bill_no']) : '';
+                $packageInfo = isset($result['package_info'])? trim($result['package_info']) : '';
+                if(empty($batchId) || empty($packageInfo)){
                     $this->error = $msg? $msg : '微信打款失败';
                     return false;
                 }
 
                 $this->error = '微信打款成功';
-                return ['order_no'=> $outTradeNo,'batch_id'=> $batchId,'result'=>$result];
+                return ['order_no'=> $outTradeNo,'batch_id'=> $batchId,'package_info'=>$packageInfo,'result'=>$result];
             }else if ($payType == 20){
                 $payData = [
                     'out_biz_no'   => $outTradeNo,//商户订单号,内部订单号