From f75496139d661ee4c0550e4e10a86b899371637a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 29 八月 2025 09:18:52 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/model/response/SalesDetailVO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/SalesDetailVO.java b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/SalesDetailVO.java
index c614538..fb3c0d2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/model/response/SalesDetailVO.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/model/response/SalesDetailVO.java
@@ -1,5 +1,6 @@
package com.dsh.activity.model.response;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -10,24 +11,26 @@
public class SalesDetailVO {
// 基础信息
private Long id; // 主键ID[8]
- private String huiMinName; // 惠民卡名称
- private Integer huiMinType; // 惠民卡类型（1:年度卡,2:年内卡）
+ private String huiMinName; // 玩湃惠民卡名称
+ private Integer huiMinType; // 玩湃惠民卡类型（1:年度卡,2:年内卡）
private BigDecimal salesMoney; // 售卖金额（精确计算）
// 关联信息
private Integer operatorId;
private String operatorName; // 所属运营商
- private Integer storeId;
+ private String storeIds;
private String storeName; // 可用门店
private Integer appUserId; // 购买用户ID
private String userName; // 购买用户
private String phone; // 联系电话
- private Integer carId; // 惠民卡id
+ private Integer carId; // 玩湃惠民卡id
// 时间信息
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date paymentTime; // 购买时间[1,8](@ref)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime; // 有效期
// 使用信息
--
Gitblit v1.7.1