ariesy 优化代码

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

@@ -107,6 +107,7 @@ public class SDNYMainProcessController extends AbstractController {
 
     @Resource
     private GatherService gatherService;
+
     /**
      * 查验发票
      */
@@ -117,7 +118,7 @@ public class SDNYMainProcessController extends AbstractController {
         log.info("传入的参数为:{}", pramsMap);
         String userid = "101833";
         String dbName = "business";
-        JSONObject checkInvoiceResult = null;
+        JSONObject checkInvoiceResult = new JSONObject();
 
         //挡板开关
         if ("1".equals(isPresure)) {
@@ -267,7 +268,6 @@ public class SDNYMainProcessController extends AbstractController {
                 log.error("查验失败，errormsg:{}", e.getMessage());
                 return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，" + e.getMessage())));
             }
-
             if (!checkInvoiceResult.containsKey("code")) {
 
                 if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) {
@@ -290,6 +290,7 @@ public class SDNYMainProcessController extends AbstractController {
 
                 return ResponseEntity.ok(JSONObject.toJSONString(data));
             }
+
         } else {
             //其他类发票，直接入库
             log.info("其他类发票，不做查验,直接入库");
@@ -497,7 +498,7 @@ public class SDNYMainProcessController extends AbstractController {
                 taxRateDetail = "0";
                 snDetailMap.put("taxRate", taxRateDetail);
             } else {
-                if (detail.get("taxRate") != null && StringUtils.isNoneBlank(detail.get("taxRate").toString())) {
+                if (StringUtils.isNoneBlank(detail.get("taxRate").toString())) {
                     try {
                         taxRateDetail = detail.get("taxRate").toString();
                         if (!"0".equals(taxRateDetail)) {

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

@@ -512,20 +512,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 jsonObject.put("tonnage", invoiceData.get("dw"));
                 jsonObject.put("limitPeople", invoiceData.get("xcrs"));
                 String taxRate = "";
-                if (invoiceData.get("sl") == null || StringUtils.isBlank(invoiceData.get("sl").toString()) ||
+                if (StringUtils.isNotEmpty(invoiceData.get("sl").toString()) || "免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
-                        "免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
                     taxRate = "0";
                     jsonObject.put("taxRate", taxRate);
                 } else {
-                    if (invoiceData.get("sl") != null && StringUtils.isNoneBlank(invoiceData.get("sl").toString())) {
+                    if (StringUtils.isNoneBlank(invoiceData.get("sl").toString())) {
                         taxRate = invoiceData.get("sl").toString();
                         if (!"0".equals(taxRate)) {
-                            taxRate = "0." + taxRate;
                             taxRate = taxRate.substring(0, taxRate.length() - 1);
                         }
 
                         if ("11".equals(invoiceType)) {
-                            taxRate = "0.000";
+                            taxRate = "0";
                         }
                         log.info("明细-发票税率为:{}", taxRate);
                         jsonObject.put("taxRate", taxRate);