From c0ababe8b64de64c8d7e09a80a9126f4ec99d50c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 08 十月 2023 15:22:43 +0800
Subject: [PATCH] 抓拍修改
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
index 79a37a4..01af882 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
@@ -117,8 +117,7 @@
dto.setRkdnm(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
- InoutConstant.RECORD_STATUS_ERROR.equals(inoutRecord.getRecordStatus())){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus())){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍏ュ簱瀹屾垚
@@ -128,7 +127,7 @@
dto.setJssj(DateFormatUtils.format((inoutSettle.getPayTime() == null?new Date():inoutSettle.getPayTime()),"yyyy-MM-dd HH:mm:ss"));
dto.setJsjz(inoutSettle.getSettleWeight() + "");
dto.setJsdj(inoutSettle.getPayPrice() + "");
- dto.setJsje(inoutSettle.getPaySum() + "");
+ dto.setJsje(inoutSettle.getPayMoney() + "");
}else {
dto.setJssj(DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
dto.setJsjz("0.0");
--
Gitblit v1.9.3