简税升级

jianshui-income/src/main/java/com/jianshui/income/service/impl/EleCheckInvoiceImpl.java

@@ -254,7 +254,7 @@ public class EleCheckInvoiceImpl implements ICheckInvoice {
             }
             kprq = (String) tempData.get("kprq");
             fphm = (String) tempData.get("fphm");
-            String[] fpzlList = {"01", "02", "03", "04", "10", "11", "14", "15", "08", "21", "22"};
+            String[] fpzlList = {"01", "02", "03", "04", "10", "11", "14", "15", "08", "21", "22","61","83"};
             if (!Arrays.asList(fpzlList).contains(fpzl)) { // 如果不存发票种类，则挂掉
                 return AjaxResult.error(1025, "发票种类非法！");
             }
@@ -684,7 +684,7 @@ public class EleCheckInvoiceImpl implements ICheckInvoice {
             jym = jym.substring(jym.length() - 6, jym.length());
         }
         fpzl = (String) data.get("fpzl");
-        String[] fpzlList = {"01", "02", "03", "04", "10", "11", "14", "15", "08", "21", "22"};
+        String[] fpzlList = {"01", "02", "03", "04", "10", "11", "14", "15", "08", "21", "22","61","83"};
         if (!Arrays.asList(fpzlList).contains(fpzl)) { // 如果不存发票种类，则挂掉
             return AjaxResult.error(1025, "发票种类非法！");
         }

jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java

@@ -27,17 +27,17 @@ public class IncomeTest {
         // String key = "zE9+TICzsrejfujj/BXjCQ=="; // 1206
 
         System.out.println("-------------------单个发票查验-----------------------------");
-        // String order = "{\n" +
-        //         "    \"taxNo\": \"91370102MA3UD2FG21\",\n" +
-        //         "    \"jym\": \"\",\n" +
-        //         "    \"fpje\": \"47802.00\",\n" +
-        //         "    \"fpdm\": \"3700211130\",\n" +
-        //         "    \"kprq\": \"20211216\",\n" +
-        //         "    \"fphm\": \"08345487\",\n" +
-        //         "    \"fpzl\": \"01\"\n" +
-        //         "}";
+         String order = "{\n" +
+                 "    \"taxNo\": \"9T86Z09T5L0000TET6\n\",\n" +
+                 "    \"jym\": \"\",\n" +
+                 "    \"fpje\": \"100\",\n" +
+                 "    \"fpdm\": \"\",\n" +
+                 "    \"kprq\": \"20220727\",\n" +
+                 "    \"fphm\": \"2231700000000011\",\n" +
+                 "    \"fpzl\": \"61\"\n" +
+                 "}";
         // String order = "{\"jym\":\"165330\",\"fpje\":\"83.07\",\"fpdm\":\"011002100511\",\"kprq\":\"20220209\",\"fphm\":\"41985485\",\"fpzl\":\"10\",\"taxNo\":\"91370100664851254J\"}";
-        String order = "{\"jym\":\"356607\",\"fpje\":\"259.23\",\"fpdm\":\"011002000711\",\"kprq\":\"20210111\",\"fphm\":\"66914035\",\"fpzl\":\"01\",\"taxNo\":\"91370102MA3UD2FG21\"  }";
+//        String order = "{\"jym\":\"356607\",\"fpje\":\"259.23\",\"fpdm\":\"011002000711\",\"kprq\":\"20210111\",\"fphm\":\"66914035\",\"fpzl\":\"01\",\"taxNo\":\"91370102MA3UD2FG21\"  }";
         String m = AisinoInvoiceDecryptUtil.encrypt(order, key);
         System.out.println("json : " + order);
         System.out.println(m);