From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 十月 2024 15:19:56 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑，对于当天发现的控制器，控制器计算的漏损量一定不正确，强制设置成0；
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 2638fb8..57b15a9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -22,7 +22,7 @@
*/
@Data
-@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
@HeadRowHeight(30)
@ContentRowHeight(20)
public class VoTradeDetails implements BaseEntity {
@@ -113,9 +113,8 @@
/**
* 浣欓
*/
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
@ColumnWidth(15)
- private Long money;
+ private Double money;
/**
* 浠樻鏂瑰紡
@@ -140,6 +139,12 @@
private Long cashierId;
/**
+ * 鏀堕摱鍛樺鍚�
+ */
+ @ColumnWidth(15)
+ private String cashierName;
+
+ /**
* 鍗＄墖鐘舵��
*/
@ColumnWidth(15)
--
Gitblit v1.8.0