修改判断逻辑

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -1,5 +1,6 @@
 package com.dxhy.erp.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -381,7 +382,6 @@ public class SDNYMainProcessController extends AbstractController {
 
                 R data = new R(1000, "default success");
                 data.put("message", "success");
-                data.put("data", checkInvoiceResult);
 
                 if (!checkInvoiceResult.containsKey("cyjg")) {
 
@@ -397,6 +397,17 @@ public class SDNYMainProcessController extends AbstractController {
                     }
                 }
 
+                Object o = checkInvoiceResult.get("invoiceLineList");
+                JSONArray jsonArray = JSONObject.parseArray(JSONObject.toJSONString(o));
+                for (Object object : jsonArray) {
+                    Map map = JSONObject.parseObject(JSONObject.toJSONString(object), Map.class);
+                    String taxRate = (String) map.get("taxRate");
+                    if ("0".equals(taxRate) || "*".equals(taxRate) || "**".equals(taxRate) || "***".equals(taxRate) || "不征税".equals(taxRate) || "免税".equals(taxRate)) {
+                        map.put("taxRate","0.00");
+                    }
+                }
+                data.put("data", checkInvoiceResult);
+
                 return ResponseEntity.ok(JSONObject.toJSONString(data));
             }
         } else {

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -558,8 +558,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                     }
 
 
-                    if (StringUtils.isBlank(detail.get("sl").toString()) || "免税".equals(detail.get("sl").toString()) || "不征税".equals(detail.get("sl").toString())
+                    if (StringUtils.isBlank(detail.get("sl").toString())) {
-                            || "***".equals(detail.get("sl").toString())) {
                         taxRateDetail = "0";
                         snDetailMap.put("taxRate", taxRateDetail);
                     } else {