增加发票类型参数

tax-common/src/main/java/com/yxcheng/token/utils/FileDownloadUtil.java

@@ -40,10 +40,16 @@ public class FileDownloadUtil {
         invTypeDicX.put("15", "二手车销售统一发票");
         invTypeDicX.put("81", "电子发票（增值税专用发票）");
         invTypeDicX.put("82", "电子发票（普通发票）");
-//        invTypeDicX.put("83", "电子发票（铁路电子客票）");
+        invTypeDicX.put("83", "电子发票（铁路电子客票）");
         invTypeDicX.put("84", "纸质发票（增值税专用发票）");
         invTypeDicX.put("85", "纸质发票（增值税普通发票）");
 
+        invTypeDicX.put("73", "机动车销售电子统一发票");
+        invTypeDicX.put("86", "二手车销售电子统一发票");
+        invTypeDicX.put("61", "电子发票（航空运输电子客票行程单）");
+        invTypeDicX.put("87", "纸质发票（机动车销售统一发票）");
+        invTypeDicX.put("88", "纸质发票（二手车销售统一发票）");
+
         invTypeDicG = new HashMap<String, String>();
         invTypeDicG.putAll(invTypeDicX);
         invTypeDicG.put("17", "海关缴款书");

tax-file-face/file-face-web/src/test/java/com/yxcheng/file/web/controller/test/FileListTest.java

 package com.yxcheng.file.web.controller.test;
 
 import com.alibaba.fastjson.JSON;
+import com.google.api.client.util.Lists;
 import com.yxcheng.token.utils.*;
-import org.assertj.core.util.Lists;
 import org.junit.Test;
 
 import java.util.HashMap;

tax-file-face/file-face-web/src/test/java/com/yxcheng/file/web/controller/test/FileManageTest.java

 package com.yxcheng.file.web.controller.test;
 
 import com.alibaba.fastjson.JSON;
-import com.yxcheng.token.utils.DateUtils;
-import com.yxcheng.token.utils.HttpHelper;
-import com.yxcheng.token.utils.Security;
-import com.yxcheng.token.utils.UUIDGenerator;
-import org.assertj.core.util.Lists;
+import com.google.common.collect.Lists;
+import com.yxcheng.token.utils.*;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -16,11 +13,11 @@ public class FileManageTest {
     String accessKeyID = "bwgf-limit";
     static String accessKeySecret = "bw@2u9%5Ts#2";
 //        static String host = "http://127.0.0.1:8767";
-//    static String host = "https://api.taxservices.cn";
-    static String host = "http://60.205.138.54:8767";
+    static String host = "https://api.taxservices.cn";
+//    static String host = "http://60.205.138.54:8767";
     @Test
     public void testHandApplyFile() throws Exception{
-        String url = host + "/fileManage/handApplyMonthFile";
+        String url = host + "/fileManage/handApplyFile";
         System.out.println(url);
         String signStr = "AccessKeyID=%s&SignatureNonce=%s&TimeStamp=%s&Version=1.0";
 
@@ -37,30 +34,20 @@ public class FileManageTest {
         param.put("timeStamp",timeStamp);
         param.put("version","1.0");
         param.put("signature", "twotest");
-        param.put("taxno","91310106MA1FY4XJ4G");
+        param.put("taxno","91440116618416948F");
 
         param.put("forceApplyFlag","1");
         param.put("invSpec","0");
+        param.put("invType","73");
 
         List<String> monthList = Lists.newArrayList();
-        monthList.add("201801");
-        monthList.add("201802");
-        monthList.add("201803");
-        monthList.add("201804");
-        monthList.add("201805");
-        monthList.add("201806");
-        monthList.add("201807");
-        monthList.add("201808");
-        monthList.add("201809");
-        monthList.add("201810");
-        monthList.add("201811");
-        monthList.add("201812");
+        monthList.add("202310");
 
         for(String month:monthList) {
             param.put("fileMonth",month);
             System.out.println(JSON.toJSONString(param));
-            String ret = HttpHelper.postWithJson(url,JSON.toJSONString(param));
-            System.out.println(ret);
+            ResponseContent ret = HttpHelper.postJsonEntity(url,JSON.toJSONString(param));
+            System.out.println(ret.getContent());
         }
 
     }

tax-file-face/file-face-web/src/test/java/com/yxcheng/file/web/controller/test/FileTest.java

 package com.yxcheng.file.web.controller.test;
 
 import com.alibaba.fastjson.JSON;
+import com.google.api.client.util.Lists;
 import com.yxcheng.token.utils.*;
-import org.assertj.core.util.Lists;
 import org.junit.Test;
 
 import java.io.File;

tax-file-face/file-face-web/src/test/java/com/yxcheng/file/web/controller/test/UserManageTest.java

 package com.yxcheng.file.web.controller.test;
 
 import com.alibaba.fastjson.JSON;
+import com.google.api.client.util.Lists;
 import com.yxcheng.token.utils.*;
-import org.assertj.core.util.Lists;
 import org.junit.Test;
 
 import java.io.File;