From 783636b8af8b5309ad1e6f1598aed7df10bebb63 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 23 八月 2024 15:17:25 +0800
Subject: [PATCH] 修改用户分页查询接口一个用户两个角色会出现两条数据的bug
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
index 522b01a..49ef7bb 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoGeneral.java
@@ -1,6 +1,9 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -8,19 +11,22 @@
* @author ZhuBaoMin
* @date 2024-01-24 17:00
* @LastEditTime 2024-01-24 17:00
- * @Description
+ * @Description 2024-08-22 鏈卞疂姘戝鍔犳�婚瀛楁
*/
@Data
+@JsonPropertyOrder({ "generalId", "cashierId", "cashierName", "tradeAmount", "gift", "refundAmount", "totalAmount", "operateDate", "auditStatus"})
@Schema(title = "璐㈠姟瀵硅处涔嬫�昏处瑙嗗浘瀵硅薄")
public class VoGeneral implements BaseEntity {
private static final long serialVersionUID = 202401241706001L;
@Schema(title = "鎬昏处ID")
- private String generalId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long generalId;
@Schema(title = "鏀堕摱鍛業D")
- private String cashierId;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cashierId;
@Schema(title = "鏀堕摱鍛樺鍚�")
private String cashierName;
@@ -34,6 +40,12 @@
@Schema(title = "杩旇繕閲戦")
private Float refundAmount;
+ /**
+ * 鎬婚 = 瀹炴敹閲戦 + 璧犻�侀噾棰� + 杩旇繕閲戦
+ */
+ @Schema(title = "鎬婚")
+ private Float totalAmount;
+
@Schema(title = "浜ゆ槗鏃ユ湡")
private String operateDate;
--
Gitblit v1.8.0