From 2193fc061724598bda5f62b969d868ed535f53c7 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, 8 Nov 2023 17:18:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BA=A2=E5=AD=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoice/domain/dto/api/elephant/DDMXXX.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java
index 3ec32aa..22e2bfc 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/elephant/DDMXXX.java
@@ -5,6 +5,7 @@ import com.jianshui.invoice.domain.BillDetail;
 import com.jianshui.invoice.domain.BillInfo;
 import com.jianshui.invoice.domain.Redinfo;
 import com.jianshui.invoice.domain.Redinfodetail;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.math.BigDecimal;
 import java.util.Objects;
@@ -42,13 +43,18 @@ public class DDMXXX {
             this.HSBZ = "1";
         }
         if (StringUtils.equals(redinfodetail.getWithTaxFlag(), "false")) {
-            this.DJ = redinfodetail.getPrice().toString(); // 单价
+            if(ObjectUtils.isNotEmpty(redinfodetail.getPrice())){
+                this.DJ = redinfodetail.getPrice().toString(); // 单价
+            }
+
             this.JE = redinfodetail.getTaxfreeamt().toString(); // 金额
             this.HSBZ = "0";
         }
 
         // this.HSBZ = redinfodetail.getWithTaxFlag(); // 含税标志
-        this.SL = redinfodetail.getTaxrate().toString(); // 税率
+        if (ObjectUtils.isNotEmpty(redinfodetail.getTaxrate())){
+            this.SL = redinfodetail.getTaxrate().toString(); // 税率
+        }
         this.SE = redinfodetail.getTax().toString(); // 税额
         if (redinfodetail.getKce() != null) {
             this.KCE = redinfodetail.getKce().toString(); // 扣除额

From 47809bfe5015f391f10c468a9b59af278b63167a Mon Sep 17 00:00:00 2001
From: kane <kane@qq.com>
Date: Thu, 9 Nov 2023 11:28:02 +0800
Subject: [PATCH 2/3] =?UTF-8?q?ele=E7=94=9F=E4=BA=A7/=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=94=B9=E6=88=90=E4=BA=86=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jianshui/invoice/utils/elephant/ElephantUtils.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
index c86f144..27e77eb 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
@@ -278,9 +278,11 @@ public class ElephantUtils {
         }
         boolean isDevMode = CommonUtils.isDevMode();
 
-        String url = ElephantConstants.PROD_TOKEN_HOST;
+//        String url = ElephantConstants.PROD_TOKEN_HOST;
+        // TODO 20231109 地址改成了京东云
+        String url = ElephantConstants.PROD_HOST_LOCAL_V6_JingDongYun;
         if (isDevMode) {
-            url = ElephantConstants.DEV_TOKEN_HOST;
+            url = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }
 
         JSONObject jsonObject = new JSONObject();

From 38b1270c24940928eb80abb1d8082793a7d327b1 Mon Sep 17 00:00:00 2001
From: kane <kane@qq.com>
Date: Thu, 9 Nov 2023 11:30:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?ele=E7=94=9F=E4=BA=A7/=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=94=B9=E6=88=90=E4=BA=86=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=BA=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jianshui/invoice/utils/elephant/ElephantUtils.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
index 27e77eb..103dd0e 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java
@@ -279,6 +279,9 @@ public class ElephantUtils {
         boolean isDevMode = CommonUtils.isDevMode();
 
 //        String url = ElephantConstants.PROD_TOKEN_HOST;
+//        if (isDevMode) {
+//            url = ElephantConstants.DEV_TOKEN_HOST;
+//        }
         // TODO 20231109 地址改成了京东云
         String url = ElephantConstants.PROD_HOST_LOCAL_V6_JingDongYun;
         if (isDevMode) {