From 221026a7d4065d98b0e4808d8b356799bbd425ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 24 Jan 2024 13:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=EF=BC=9A=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BD=B1=E5=83=8F=E9=87=91=E9=A2=9D=E3=80=81?= =?UTF-8?q?=E7=A8=8E=E9=A2=9D=E3=80=81=E4=BB=B7=E7=A8=8E=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E5=9B=9B=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) 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 c8e81f0c..1459bdd1 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 @@ -632,7 +632,9 @@ public class SDNYMainProcessController extends AbstractController { } } } + decimalFormat(checkInvoiceByUuid); JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); + log.info("checkInvoice:{}",checkInvoice); JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail); JSONObject vehicleDetail = new JSONObject(); if (vehicleList != null && vehicleList.size() > 0) { @@ -676,6 +678,7 @@ public class SDNYMainProcessController extends AbstractController { } checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); } + decimalFormat(tdxSaleRecordInvoice); JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel); if(baseTDxRecordInvoiceDetail!= null && baseTDxRecordInvoiceDetail.size() > 0){ @@ -775,6 +778,37 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", "请求正在处理,不要重复提交"))); } + + private void decimalFormat(TdxSaleRecordInvoice tdxSaleRecordInvoice) { + if (tdxSaleRecordInvoice != null){ + if (tdxSaleRecordInvoice.getInvoiceAmount() != null){ + tdxSaleRecordInvoice.setInvoiceAmount(tdxSaleRecordInvoice.getInvoiceAmount().setScale(2)); + } + if (tdxSaleRecordInvoice.getTaxAmount() != null){ + tdxSaleRecordInvoice.setTaxAmount(tdxSaleRecordInvoice.getTaxAmount().setScale(2)); + } + if (tdxSaleRecordInvoice.getTotalAmount() != null){ + tdxSaleRecordInvoice.setTotalAmount(tdxSaleRecordInvoice.getTotalAmount().setScale(2)); + } + + } + } + + public static void decimalFormat(BaseTDxRecordInvoice checkInvoiceByUuid) { + if (checkInvoiceByUuid != null){ + if (checkInvoiceByUuid.getInvoiceAmount() != null){ + checkInvoiceByUuid.setInvoiceAmount(checkInvoiceByUuid.getInvoiceAmount().setScale(2)); + } + if (checkInvoiceByUuid.getTaxAmount() != null){ + checkInvoiceByUuid.setTaxAmount(checkInvoiceByUuid.getTaxAmount().setScale(2)); + } + if (checkInvoiceByUuid.getTotalAmount() != null){ + checkInvoiceByUuid.setTotalAmount(checkInvoiceByUuid.getTotalAmount().setScale(2)); + } + + } + } + @Async void saveCheckLog(Map pramsMap, JSONObject checkInvoice) { TdxPlatformCheckLog checkLog = new TdxPlatformCheckLog();