Wesmiler

app/Services/Api/AccountService.php

@@ -123,6 +123,9 @@ class AccountService extends BaseService
                 $status = isset($item['status'])? intval($item['status']) : 0;
                 $item['type_text'] = isset($types[$type])? $types[$type] : '充值';
                 $item['status_text'] = isset($statusArr[$status])? $statusArr[$status] : '充值中';
+                if($status != 4 && $item['failed_remark']){
+                    $item['status_text'] = $item['failed_remark'];
+                }
             }
         }
 

app/Services/PaymentService.php

@@ -578,7 +578,7 @@ class PaymentService extends BaseService
                         $orderInfo['money'] = $amount;
                         $orderInfo['remark'] = '充值失败退款';
                         $refundStatus = PaymentService::make()->refund($orderInfo,'pay');
-                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'remark'=>$this->error,'refund_money'=>$refundStatus?$amount:0,'update_time'=>time()];
+                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'failed_remark'=> $errmsg,'refund_money'=>$refundStatus?$amount: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 = '订单退款状态更新错误～';
@@ -588,7 +588,7 @@ class PaymentService extends BaseService
                         return false;
                     }
 
-                    $updateData = ['status'=>3,'out_trade_no'=>$order_number,'pay_total'=>$total_price,'remark'=> json_encode($data,256),'update_time'=>time()];
+                    $updateData = ['status'=>3,'out_trade_no'=>$order_number,'pay_total'=>$total_price,'update_time'=>time()];
                     if(!PayOrdersModel::where($updateData)){
                         DB::commit();
                         $this->error = '更新充值订单失败';