订单记录数据返回修改

.gitignore

@@ -31,3 +31,11 @@ build/
 
 ### VS Code ###
 .vscode/
+
+### Uploads ###
+uploads/
+
+### Logs ###
+logs/
+*.log
+*.log.gz

src/main/java/com/yingpai/gupiao/domain/vo/OrderVO.java

@@ -42,4 +42,7 @@ public class OrderVO {
     
     /** 支付时间 */
     private String payTime;
+    
+    /** 到期时间 */
+    private String expireTime;
 }

src/main/java/com/yingpai/gupiao/service/impl/OrderServiceImpl.java

@@ -227,6 +227,19 @@ public class OrderServiceImpl implements OrderService {
     }
     
     private OrderVO toOrderVO(PaymentOrder order) {
+        // 查询该订单对应的订阅到期时间
+        String expireTime = null;
+        if (order.getOrderStatus() == PaymentOrder.STATUS_PAID) {
+            UserSubscription subscription = subscriptionMapper.selectOne(
+                new LambdaQueryWrapper<UserSubscription>()
+                    .eq(UserSubscription::getOrderNo, order.getOrderNo())
+                    .last("LIMIT 1")
+            );
+            if (subscription != null && subscription.getExpireTime() != null) {
+                expireTime = subscription.getExpireTime().format(DTF);
+            }
+        }
+        
         return OrderVO.builder()
                 .orderId(order.getId())
                 .orderNo(order.getOrderNo())
@@ -237,6 +250,7 @@ public class OrderServiceImpl implements OrderService {
                 .orderStatusName(getStatusName(order.getOrderStatus()))
                 .createTime(order.getCreateTime().format(DTF))
                 .payTime(order.getPayTime() != null ? order.getPayTime().format(DTF) : null)
+                .expireTime(expireTime)
                 .build();
     }