Wesmiler

app/Services/PaymentService.php

@@ -576,7 +576,7 @@ class PaymentService extends BaseService
                     $order_number = isset($res['order_number'])?$res['order_number']:'';
                     $total_price = isset($res['total_price'])?$res['total_price']:'';
                     if(empty($result) || $errno != 0 || empty($order_number)){
-                        DB::commit();
+
                         $this->error = '充值调用失败：'.$errmsg;
 
                         // 退款
@@ -587,15 +587,15 @@ class PaymentService extends BaseService
                         $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 = '订单退款状态更新错误～';
-                            return false;
                         }
 
+                        DB::commit();
                         return false;
                     }
 
                     $updateData = ['status'=>3,'out_trade_no'=>$order_number,'pay_total'=>$total_price,'update_time'=>time()];
                     $this->saveLog("caches:payments:notify_{$scene}:pay_success_{$orderNo}_{$orderUserId}", ['error'=> '充值调用成功','update'=>$updateData,'order' => $orderInfo,'result'=>$result, 'notify' => $data]);
-                    if(!PayOrdersModel::where($updateData)){
+                    if(!PayOrdersModel::where(['id'=>$orderId])->where($updateData)){
                         DB::commit();
                         $this->error = '更新充值订单失败';
                         $this->saveLog("caches:payments:notify_{$scene}:pay_failed_{$orderNo}_{$orderUserId}", ['error'=>$this->error,'update'=>$updateData,'order' => $orderInfo,'result'=>$result, 'notify' => $data]);