Wesmiler

app/Services/PaymentService.php

@@ -580,10 +580,10 @@ class PaymentService extends BaseService
                         $this->error = '充值调用失败：'.$errmsg;
 
                         // 退款
-                        $orderInfo['money'] = $amount;
+                        $orderInfo['money'] = $total;
                         $orderInfo['remark'] = '充值失败退款';
                         $refundStatus = PaymentService::make()->refund($orderInfo,'pay');
-                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'failed_remark'=> $errmsg,'refund_money'=>$refundStatus?$amount:0,'update_time'=>time()];
+                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'failed_remark'=> $errmsg,'refund_money'=>$refundStatus?$total:0,'update_time'=>time()];
                         $this->saveLog("caches:payments:notify_{$scene}:pay_failed_{$orderNo}_{$orderUserId}", ['error'=>$this->error,'update'=>$updateData,'order' => $orderInfo,'result'=>$result, 'notify' => $data]);
                         if(!PayOrdersModel::where(['id'=>$orderId])->update($updateData)){
                             $this->error = '订单退款状态更新错误～';
@@ -593,6 +593,7 @@ class PaymentService extends BaseService
                         return false;
                     }
 
+                    $this->saveLog("caches:payments:notify_{$scene}:pay_success_{$orderNo}_{$orderUserId}", ['error'=> '充值调用成功','update'=>$updateData,'order' => $orderInfo,'result'=>$result, 'notify' => $data]);
                     $updateData = ['status'=>3,'out_trade_no'=>$order_number,'pay_total'=>$total_price,'update_time'=>time()];
                     if(!PayOrdersModel::where($updateData)){
                         DB::commit();