From 61b40ca50044c8b20b6ea21028398e068ca103a0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:16:14 +0800
Subject: [PATCH] 调整DEVICE的字段和缓存,增加支持根据ID直接获取设备信息,优化MODBUS-TCP协议 实现

---
 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
index b9ed235..fc5278e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1304.java
@@ -97,10 +97,10 @@
             }
             dto.setJssl(String.valueOf(settle.getSettleWeight()));
             dto.setJsdj(String.valueOf(settle.getPayPrice()));
-            dto.setJsje(String.valueOf(settle.getPaySum()));
+            dto.setJsje(String.valueOf(settle.getPayMoney()));
             dto.setJssj(DateFormatUtils.format(settle.getPayTime()==null?new Date():settle.getPayTime(),"yyyy-MM-dd HH:mm:ss"));
             dto.setJsfs(StringUtils.isEmpty(settle.getPayType())?"0":settle.getPayType());
-            dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName());
+           // dto.setSkr(StringUtils.isEmpty(settle.getCustomerName())?"0":settle.getCustomerName()); TODO 
             dto.setYhkh(StringUtils.isEmpty(settle.getBankNum())?"0":settle.getBankNum());
 
             dto.setSgjsdnm(settle.getId());

--
Gitblit v1.9.3