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();