Merge remote-tracking branch 'origin/beta' into beta

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(); // 扣除额

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java

@@ -278,9 +278,14 @@ public class ElephantUtils {
         }
         boolean isDevMode = CommonUtils.isDevMode();
 
-        String url = ElephantConstants.PROD_TOKEN_HOST;
+//        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) {
-            url = ElephantConstants.DEV_TOKEN_HOST;
+            url = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
         }
 
         JSONObject jsonObject = new JSONObject();