From 46b26675e247b5c43a06f07fae4cf20cabf0b05c Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Sat, 25 May 2024 17:38:42 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E9=9B=B6=E7=A8=8E=E7=8E=87=E7=A8=8E?= =?UTF-8?q?=E9=A2=9D=E8=AF=AF=E5=B7=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-admin/src/main/resources/application-dev.yml | 2 +- jianshui-admin/src/main/resources/application.yml | 2 +- .../java/com/jianshui/invoice/utils/BillDetailFormatUtil.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index 2e437a6..d064e07 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -94,7 +94,7 @@ elephant_invoice_file: http://127.0.0.1:8081/invoice/fileUrl/ # 德才定制 放到数据库 #elephant_invoice_file_dc: http://127.0.0.1:8088/sdFile/ # 大象V6数电对应平台地址 -ele_url_v6: https://js.ele12.com/order-api +ele_url_v6: https://js.ele12.com/order-api1111 #ele_url_v6: http://192.168.3.60:18108/order-api #ele_url_v6: http://127.0.0.1:18108/order-api # 大象纸票服务对应平台地址 diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml index 68a7c2f..8c96f99 100644 --- a/jianshui-admin/src/main/resources/application.yml +++ b/jianshui-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: dev # 文件上传 servlet: multipart: diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java index e4b8783..f553028 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java @@ -392,7 +392,8 @@ public class BillDetailFormatUtil { return AjaxResult.error("明细行含税金额使用公式计算出的税额与传入含税金额减去不含税金额（不含税单价、数量积）计算出的税额差额大于6分钱", billDetail); } billDetail.setTaxamt(taxAmt); - billDetail.setTax(tax); +// billDetail.setTax(tax); + billDetail.setTax(taxs); billDetail.setTaxfreeamt(taxFreeAmt); return AjaxResult.success(billDetail); }