From 89bf10c5ea5ea8ce929e63873ebace7eb94c7fab Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Thu, 25 Jan 2024 18:26:45 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20AES=E5=8A=A0=E5=AF=86=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/http/invoice/v1/InvoiceController.java | 2 +- .../aisino/console/AisinoConsoleInvoiceAddDetailDTO.java | 4 ++++ .../impl/api/AisinoConsoleInvoiceApiServiceImpl.java | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 8e05501..2d9294c 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -258,7 +258,7 @@ public class InvoiceController { IInvoiceRequestService invoiceRequestService = invoiceRequestFactory.getService(requestAdapterKey); JSONObject decryptResult = invoiceRequestService.decrypt(request, companyservice, "add"); - // 报文处理 + // 报文处理e BillInfo billInfo = decryptResult.toJavaObject(BillInfo.class); if (billInfo == null) { throw new JianshuiParamErrorException(ErrorCode.ERROR_PARAMS, companyservice, "invoice"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDetailDTO.java index bb58ce0..5e1f586 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDetailDTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDetailDTO.java @@ -38,6 +38,10 @@ public class AisinoConsoleInvoiceAddDetailDTO { * 金额 */ private Double value; + /** + * 数量 2024-1-25新增 + */ + private Double quantity; /** * 单价 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java index e5a7400..352aa09 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java @@ -169,7 +169,7 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { aisinoConsoleInvoiceAddDTO.setTax(Convert.toDouble(tax)); //数量 非必填 - //aisinoConsoleInvoiceAddDTO.setQuantity(0.0D); +// aisinoConsoleInvoiceAddDTO.setQuantity(0.0D); //专票必填 if (invoceTypeTemp == 0) { @@ -225,6 +225,12 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { //单价 addDetailDTO.setPrice(Convert.toDouble(billDetail.getPrice())); + /** 数量传输的时候赋值 */ + if (billDetail.getNum() != null && billDetail.getNum().compareTo(BigDecimal.ZERO) != 0) { + addDetailDTO.setQuantity(Convert.toDouble(billDetail.getNum())); + } + + //是否享受优惠政策 Integer yhzcbs = billDetail.getYhzcbs(); if (yhzcbs == null) {