Wesmiler

app/Services/Common/PayOrdersService.php

@@ -206,7 +206,7 @@ class PayOrdersService extends BaseService
 
         $datas = $this->model->where(['mark' => 1])
             ->whereIn('status', [2, 3])
-            ->select(['id', 'order_no', 'transaction_id', 'total as money', 'status'])
+            ->select(['id', 'order_no', 'transaction_id', 'pay_total as money', 'status'])
             ->orderBy('id', 'desc')
             ->limit(500)
             ->get()
@@ -250,7 +250,7 @@ class PayOrdersService extends BaseService
                     $success[$no] = $state;
                     $updateData = ['status' => $state == 3 ? 6 : 4, 'order_trade_no' => $order_number, 'charge_kami' => $charge_kami, 'charge_amount' => $charge_amount, 'update_time' => time()];
                     if (!PayOrdersModel::where(['order_no' => $no])->update($updateData)) {
-                        $errors[$no] = '充值失败退款处理失败';
+                        $errors[$no] = '充值处理失败';
                     }
                     unset($orders[$no]);
                 } else if ($state == 0) {
@@ -269,7 +269,7 @@ class PayOrdersService extends BaseService
             foreach ($orders as $order) {
                 $total = isset($order['money']) ? $order['money'] : 0;
                 $refundStatus = PaymentService::make()->refund($order, 'pay');
-                $updateData = ['refund_status' => $refundStatus ? 1 : 3, 'status' => 5, 'failed_remark' => '充值失败原路退款', 'refund_money' => $refundStatus ? $total : 0, 'update_time' => time()];
+                $updateData = ['refund_status' => $refundStatus ? 1 : 3, 'status' => 5, 'failed_remark' => '充值失败原路退款','refund_remark'=>$this->error, 'refund_money' => $refundStatus ? $total : 0, 'update_time' => time()];
                 if (!PayOrdersModel::where(['id' => $order['id']])->update($updateData)) {
                     $errors[$order['order_no']] = '充值失败退款处理失败';
                 } else {

app/Services/PaymentService.php

@@ -695,7 +695,7 @@ class PaymentService extends BaseService
             $orderInfo['remark'] = $this->error;
             $orderInfo['out_trade_no'] = '';
             $refundStatus = PaymentService::make()->refund($orderInfo,'pay');
-            if(!PayOrdersModel::where(['id'=>$orderId])->update(['refund_status'=> $refundStatus?1:3,'refund_remark'=>json_encode(['msg'=>$this->error,'data'=>$this->errorData],256),'refund_money'=>$refundStatus?$refundAmount:0,'update_time'=>time()])){
+            if(!PayOrdersModel::where(['id'=>$orderId])->update(['refund_status'=> $refundStatus?1:3,'refund_remark'=>$this->error,'refund_money'=>$refundStatus?$refundAmount:0,'update_time'=>time()])){
                 $this->saveLog("caches:payments:payNotify_{$productId}:notify_{$out_trade_num}_error", ['error'=>$this->error,'order' => $orderInfo, 'notify' => $data]);
                 $this->error = '订单退款状态更新错误～';
                 DB::rollBack();