From a4d1e11a3ee5739d0f3089c53510baad571d9427 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期四, 19 十月 2023 19:50:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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