From ca1820f7156fd6224d51d8528b2f4dd8be228052 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Sun, 23 Apr 2023 16:20:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=80=E7=A8=8E=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=A4=E8=AF=81--bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java index fc28a077..0af7189b 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java @@ -253,7 +253,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba vo.setSelected("0"); return vo; } - String uuid = dto.getInvoiceCode() + dto.getInvoiceNo(); + String uuid =""; + if(dto.getInvoiceCode()!=null){ + uuid= dto.getInvoiceCode() + dto.getInvoiceNo(); + }else { + uuid = dto.getInvoiceNo(); + } List tdxRecordInvoices = domesticRecordInvoiceDao.selectByUuidList(Collections.singletonList(uuid)); // 底账信息查询 @@ -535,4 +540,5 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba return business.stream().filter(b -> deptId.equals(b.getBusinessCode())).findFirst() .map(Business::getBusinessName).orElse(null); } + } From df521bdb79bac898cf584bcd9d54563abdffaf29 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Sun, 23 Apr 2023 16:39:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/extend/controller/VouncherSyncController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java index 3989eede..f735d7c7 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/VouncherSyncController.java @@ -81,7 +81,7 @@ public class VouncherSyncController { if(ztype.equals("S")){ return ResponseEntity.ok(R.ok().put("data","数据拉取成功")); }else { - return ResponseEntity.ok(R.error(CommonConstants.MSG_ERR_DEFAULT)); + return ResponseEntity.ok(R.error((String)output.get("ZDATA"))); } }catch (Exception e ){