From 566c236df821a069df35b996cefa946960bc9aa3 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Fri, 15 Nov 2024 14:58:45 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=B0=83=E6=95=B4=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/service/impl/PayServiceImpl.java    | 10 ++++++----
 .../com/mdd/front/vo/pay/PayStatusVo.java     | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
index f330eced..3feeb562 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
@@ -141,11 +141,13 @@ public class PayServiceImpl implements IPayService {
                 if (StringUtils.isNotNull(rechargeOrder)) {
                     orderExist = true;
                     vo.setPayStatus(rechargeOrder.getPayStatus());
-                    vo.setPayWay(PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay()));
                     vo.setOrderId(rechargeOrder.getId());
-                    vo.setOrderSn(rechargeOrder.getSn());
-                    vo.setOrderAmount(rechargeOrder.getOrderAmount());
-                    vo.setPayTime(StringUtils.isNotEmpty(vo.getPayTime()) ? TimeUtils.timestampToDate(vo.getPayTime()) : "");
+                    JSONObject order = new JSONObject();
+                    order.put("order_amount", rechargeOrder.getOrderAmount());
+                    order.put("order_sn", rechargeOrder.getSn());
+                    order.put("pay_time", StringUtils.isNotNull(rechargeOrder.getPayTime()) ? TimeUtils.timestampToDate(rechargeOrder.getPayTime()) : "");
+                    order.put("pay_way", PaymentEnum.getPayWayMsg(rechargeOrder.getPayWay()));
+                    vo.setOrder(order);
                 }
                 break;
             case "order":
diff --git a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java
index 39d0b23d..5fd7fcd5 100644
--- a/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java
+++ b/server/like-front/src/main/java/com/mdd/front/vo/pay/PayStatusVo.java
@@ -1,5 +1,6 @@
 package com.mdd.front.vo.pay;
 
+import com.alibaba.fastjson2.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
@@ -14,22 +15,24 @@ public class PayStatusVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "订单信息")
+    private JSONObject order;
     @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]")
     private Integer payStatus;
 
-    @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]")
-    private String payWay;
+//    @ApiModelProperty(value = "支付状态: [0=待支付, 1=已支付]")
+//    private String payWay;
 
-    @ApiModelProperty(value = "支付时间")
-    private String payTime;
+//    @ApiModelProperty(value = "支付时间")
+//    private String payTime;
 
     @ApiModelProperty(value = "订单ID")
     private Integer orderId;
 
-    @ApiModelProperty(value = "订单编号")
-    private String orderSn;
+//    @ApiModelProperty(value = "订单编号")
+//    private String orderSn;
 
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal orderAmount;
+//    @ApiModelProperty(value = "订单金额")
+//    private BigDecimal orderAmount;
 
 }