From 21cae8ea4db041673cd7418eba3c32fd34edcf1f Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Wed, 4 Feb 2026 14:32:12 +0800
Subject: [PATCH] =?UTF-8?q?02-04=20=E6=96=B0=E5=A2=9E=E5=85=85=E5=80=BC/?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=20=E8=BF=94=E5=9B=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8E=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/demo/domain/vo/coin/OrderResultVO.java | 28 ++++++++++++++++++++++
 .../demo/serviceImpl/coin/ConsumeServiceImpl.java  |  9 ++++---
 .../demo/serviceImpl/coin/RechargeServiceImpl.java |  5 ++--
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/com/example/demo/domain/vo/coin/OrderResultVO.java

diff --git a/src/main/java/com/example/demo/domain/vo/coin/OrderResultVO.java b/src/main/java/com/example/demo/domain/vo/coin/OrderResultVO.java
new file mode 100644
index 0000000..d4827db
--- /dev/null
+++ b/src/main/java/com/example/demo/domain/vo/coin/OrderResultVO.java
@@ -0,0 +1,28 @@
+package com.example.demo.domain.vo.coin;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+/**
+ * 新增充值消费返回前端的VO类
+ */
+@Data
+public class OrderResultVO {
+    // 订单号（原有的核心字段）
+    private String orderCoder;
+    // 时间（格式化为前端易读的字符串，也可保留LocalDateTime类型）
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date createTime;
+
+    // 快捷构建方法（可选，简化代码）
+    public static OrderResultVO build(String orderCode, Date time) {
+        OrderResultVO vo = new OrderResultVO();
+        vo.setOrderCoder(orderCode); // 拼接前缀
+        // 格式化时间为yyyy-MM-dd HH:mm:ss格式，也可根据前端需求调整
+        vo.setCreateTime(time);
+        return vo;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
index daa1045..376081b 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java
@@ -4,10 +4,7 @@ import com.example.demo.Util.GoldTistV2;
 import com.example.demo.Util.SimpleIdGenerator;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.entity.UserGoldRecord;
-import com.example.demo.domain.vo.coin.ConsumeUser;
-import com.example.demo.domain.vo.coin.Gold;
-import com.example.demo.domain.vo.coin.GoldUser;
-import com.example.demo.domain.vo.coin.Result;
+import com.example.demo.domain.vo.coin.*;
 import com.example.demo.exception.SystemException;
 import com.example.demo.mapper.coin.ConsumeMapper;
 import com.example.demo.mapper.coin.MarketMapper;
@@ -254,7 +251,9 @@ public class ConsumeServiceImpl implements ConsumeService {
 
         redService.sendConsumeJwcode(consumeUser.getJwcode(),consumeUser.getRedIds(),userGoldRecord.getLinkId());
         // }
-        return Result.success("XF_" + orderNumber);
+        //data返回订单号和创建时间
+        OrderResultVO resultVO = OrderResultVO.build("XF_" + orderNumber,new Date());
+        return Result.success(resultVO);
     }
 
     @Override
diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java
index 83383fd..2a0f2a9 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java
@@ -170,8 +170,9 @@ public class RechargeServiceImpl implements RechargeService {
 
         // 发送到RabbitMQ
         rabbitTemplate.convertAndSend(RabbitMQConfig.COIN_RECHARGE_EXCHANGE, "coin.recharge.save", message);
-
-        return Result.success("CZ_" + orderNumber);
+        //data返回订单号和创建时间
+        OrderResultVO resultVO = OrderResultVO.build("CZ_" + orderNumber,new Date());
+        return Result.success(resultVO);
     }
     //根据订单单号获取订单信息（重复充值/消费提示）
     @Override