From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
index 84a9aa0..cc4f0ac 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTransactionStatistics.java
@@ -1,33 +1,58 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
* @author ZhuBaoMin
* @date 2024-01-22 18:27
* @LastEditTime 2024-01-22 18:27
- * @Description
+ * @Description 浜ゆ槗璁板綍姹囨�昏鍥惧璞�
*/
@Data
-@Schema(title = "浜ゆ槗璁板綍姹囨�昏鍥惧璞�")
public class VoTransactionStatistics implements BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 202401241705001L;
- @Schema(title = "涓氬姟绫诲瀷")
+ /**
+ * 涓氬姟绫诲瀷
+ */
private String operateType;
- @Schema(title = "浜ゆ槗鏃ユ湡")
+ /**
+ * 浜ゆ槗鏃ユ湡
+ */
private String tradeDate;
- @Schema(title = "浜ゆ槗绗旀暟")
+ /**
+ * 浜ゆ槗绗旀暟
+ */
private Integer count;
- @Schema(title = "瀹炴敹閲戦")
+ /**
+ * 瀹炴敹閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float received;
- @Schema(title = "璧犻�侀噾棰�")
+ /**
+ * 璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Float gift;
+
+ /**
+ * 杩旇繕閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Float refundAmount;
+
+ /**
+ * 鏀堕摱鍛業D
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cashierId;
}
--
Gitblit v1.8.0