From 1f987bb864efeba95a9ffe81bbdac2cbe5c0de08 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Tue, 11 Jul 2023 22:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 13 ++++++++++++- .../dxhy/erp/service/SNPushCheckRecordService.java | 3 +-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index f9b67e86..bcb1c740 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -1,5 +1,6 @@ package com.dxhy.erp.controller; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -381,7 +382,6 @@ public class SDNYMainProcessController extends AbstractController { R data = new R(1000, "default success"); data.put("message", "success"); - data.put("data", checkInvoiceResult); if (!checkInvoiceResult.containsKey("cyjg")) { @@ -397,6 +397,17 @@ public class SDNYMainProcessController extends AbstractController { } } + Object o = checkInvoiceResult.get("invoiceLineList"); + JSONArray jsonArray = JSONObject.parseArray(JSONObject.toJSONString(o)); + for (Object object : jsonArray) { + Map map = JSONObject.parseObject(JSONObject.toJSONString(object), Map.class); + String taxRate = (String) map.get("taxRate"); + if ("0".equals(taxRate) || "*".equals(taxRate) || "**".equals(taxRate) || "***".equals(taxRate) || "不征税".equals(taxRate) || "免税".equals(taxRate)) { + map.put("taxRate","0.00"); + } + } + data.put("data", checkInvoiceResult); + return ResponseEntity.ok(JSONObject.toJSONString(data)); } } else { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 43b1c58e..863b7495 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -558,8 +558,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } - if (StringUtils.isBlank(detail.get("sl").toString()) || "免税".equals(detail.get("sl").toString()) || "不征税".equals(detail.get("sl").toString()) - || "***".equals(detail.get("sl").toString())) { + if (StringUtils.isBlank(detail.get("sl").toString())) { taxRateDetail = "0"; snDetailMap.put("taxRate", taxRateDetail); } else {