Wesmiler

app/Services/PaymentService.php

@@ -566,8 +566,14 @@ class PaymentService extends BaseService
                     $account = isset($orderInfo['account'])? $orderInfo['account'] : '';
                     $total = isset($orderInfo['pay_money'])? $orderInfo['pay_money'] : 0;
                     $amount = $total;
-
-                    $result = DyrPayService::make()->recharge($orderNo, $account, $productId, $amount, $orderInfo);
+                    $params = [
+                        'ytype'=>isset($orderInfo['ytype'])?$orderInfo['ytype']:0,
+                        'id_card_no'=>isset($orderInfo['id_card_no'])?$orderInfo['id_card_no']:'',
+                        'area'=>isset($orderInfo['area'])?$orderInfo['area']:'',
+                        'city'=>isset($orderInfo['city'])?$orderInfo['city']:'',
+                    ];
+
+                    $result = DyrPayService::make()->recharge($orderNo, $account, $productId, $amount, $params);
                     $errno = isset($result['errno'])?$result['errno'] : -1;
                     $errmsg = isset($result['errmsg'])?$result['errmsg'] : '';
                     $res = isset($result['data'])?$result['data']:[];
@@ -581,7 +587,7 @@ class PaymentService extends BaseService
                         $orderInfo['money'] = $total;
                         $orderInfo['remark'] = '充值失败退款';
                         $refundStatus = PaymentService::make()->refund($orderInfo,'pay');
-                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'result'=>json_encode(['amount'=>$amount,'result'=>$result],256),'failed_remark'=> $errmsg,'refund_money'=>$refundStatus?$total:0,'update_time'=>time()];
+                        $updateData = ['refund_status'=> $refundStatus?1:3,'status'=>5,'result'=>json_encode(['amount'=>$amount,'params'=>$params,'result'=>$result],256),'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 = '订单退款状态更新错误～';
@@ -591,7 +597,7 @@ class PaymentService extends BaseService
                         return false;
                     }
 
-                    $updateData = ['status'=>3,'result'=>json_encode(['amount'=>$amount,'result'=>$result],256),'out_trade_no'=>$order_number,'update_time'=>time()+1];
+                    $updateData = ['status'=>3,'result'=>json_encode(['amount'=>$amount,'params'=>$params,'result'=>$result],256),'out_trade_no'=>$order_number,'update_time'=>time()+1];
                     $this->saveLog("caches:payments:notify_{$scene}:pay_success_{$orderNo}_{$orderUserId}", ['error'=> '充值调用成功','id'=>$orderId,'update'=>$updateData,'order' => $orderInfo,'result'=>$result, 'notify' => $data]);
                     if(!PayOrdersModel::where(['id'=>$orderId])->update($updateData)){
                         DB::commit();