From 79d1c8ee245f1c6cc677f5c7d0610800da3826a5 Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Thu, 30 May 2024 15:42:11 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E6=B5=AA=E6=BD=AE=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=8D=E5=90=AB=E7=A8=8E=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/request/AisinoInvoiceRequestAdapterImpl.java   | 4 ++--
 .../com/jianshui/invoice/utils/BillInfoInspurUtils.java    | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
index 0c7ee90..31a5c47 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
@@ -216,7 +216,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
                 if (StringUtils.isBlank(billInfo.getSellerAccount())){
                     billInfo.setSellerAccount(json.getString("xsfyhzh"));
                 }
-                if (StringUtils.equals(serviceKey, "add")){
+                /*if (StringUtils.equals(serviceKey, "add")){
                     Environment environment = SpringUtils.getBean(Environment.class);
                     String nsrsbhs = environment.getProperty("billing.limit.nsrsbh");
                     List<String> shList = Arrays.asList(nsrsbhs.split(","));
@@ -253,7 +253,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
                             }
                         }
                     }
-                }
+                }*/
 
                 json = (JSONObject) JSONObject.toJSON(billInfo);
             }
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillInfoInspurUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillInfoInspurUtils.java
index 014b2f8..9253ee6 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillInfoInspurUtils.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillInfoInspurUtils.java
@@ -78,6 +78,7 @@ public class BillInfoInspurUtils {
         // 开始处理含税金额、不含税金额、税额
         for (int i = 0; i < detailList.size(); i++) {
             BillDetail detail = detailList.get(i);
+
             if (detail.getTaxamt() == null) {
                 String errorMsg = StringUtils.format("发票第{}条明细，含税金额为空，无法开票", i);
                 throw new JianshuiBillInfoCalucateException(errorMsg, companyservice, JSONObject.toJSONString(billInfo));
@@ -92,6 +93,8 @@ public class BillInfoInspurUtils {
                 String errorMsg = StringUtils.format("发票第{}条明细，税额为空，无法开票", i);
                 throw new JianshuiBillInfoCalucateException(errorMsg, companyservice, JSONObject.toJSONString(billInfo));
             }
+
+
             detailList.get(i).setIndex((long) (i + 1));
 
             /** 浪潮特殊处理，防止误差 */
@@ -106,11 +109,11 @@ public class BillInfoInspurUtils {
 
             // 0 不含税 1 含税
             if(hsbz == 1 || hsbz == 0){
-                if(taxAmDetail.compareTo(zero) > 0){
+                if(taxAmDetail.compareTo(zero) != 0 ){
                     detail.setHsbz(0);
                     taxfreeamt = taxfreeamt.add(NumberUtil.sub(taxAmDetail,taxDetail));
                     taxamt = taxamt.add(taxAmDetail);
-                }else if(taxFreeAmtDetail.compareTo(zero) > 0 ){
+                }else if(taxFreeAmtDetail.compareTo(zero) != 0 ){
                     detail.setHsbz(0);
                     taxfreeamt = taxfreeamt.add(taxFreeAmtDetail);
                     taxamt = taxamt.add(NumberUtil.add(taxFreeAmtDetail,taxDetail) );