增加实时冻结

tax-file-face/file-face-service/src/main/java/com/tax/file/service/impl/InvoiceFileServiceImpl.java

@@ -986,15 +986,18 @@ public class InvoiceFileServiceImpl implements InvoiceFileService {
             JSONObject json = new JSONObject();
             json.put("taxno", invoiceFileReq.getTaxno());
             json.put("taxname", invoiceFileReq.getTaxno());
-            log.info("{} request url:{},param:{}", uuidFlag, url, json.toJSONString());
 
             Map<String, Object> paramsMap = Maps.newHashMap();
             paramsMap.put("data", json.toJSONString());
             paramsMap.put("username", invoiceFileReq.getAccessKeyID());
-            paramsMap.put("rtype", "9001");
             paramsMap.put("timestamp", DateUtils.getDataString(DateUtils.yyyymmddhhmmss));
             paramsMap.put("sign", "test");
-
+            if(StringUtils.isNotEmpty(invoiceFileReq.getUserStatus()) && invoiceFileReq.getUserStatus().equals("2")) {
+                paramsMap.put("rtype", "9002");
+            } else {
+                paramsMap.put("rtype", "9001");
+            }
+            log.info("{} request url:{},param:{}", uuidFlag, url, json.toJSONString());
             ResponseContent ret = HttpHelper.postEntity(url, paramsMap);
             resultJson = JSONObject.parseObject(ret.getContent());
             log.info(uuidFlag + " addEnterprise request result:" + (resultJson == null ? "null" : resultJson.toJSONString()));

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

@@ -36,8 +36,8 @@ public class UserManageTest {
         param.put("timeStamp",timeStamp);
         param.put("version","1.0");
         param.put("signature",getSign(signStr));
-        param.put("taxno","91330110MA28U72K75");
-        param.put("taxType","1");
+        param.put("taxno","915106002051041291");
+        param.put("taxType","0");
         System.out.println(url);
         ResponseContent ret = HttpHelper.postJsonEntity(url,JSON.toJSONString(param));
         System.out.println(ret.getContent());
@@ -48,7 +48,7 @@ public class UserManageTest {
         String url = host + "/invoicefile/taxManage";
         String signStr = "AccessKeyID=%s&SignatureNonce=%s&TimeStamp=%s&Version=1.0";
 
-            String taxno = "91450103MAD4RP0N8Q";
+            String taxno = "915106002051041291";
             taxno = taxno.trim();
             String signatureNonce = UUIDGenerator.generate();
             long time = System.currentTimeMillis();
@@ -71,12 +71,12 @@ public class UserManageTest {
 
             List<Object> userList = Lists.newArrayList();
             Map functionParam = new HashMap<>();
-            functionParam.put("functionNo","05");
-            functionParam.put("optType","0");//0注册 1-启用
+            functionParam.put("functionNo","02");
+            functionParam.put("optType","2");//0注册 1-启用
             functionParam.put("validType","0");
-            functionParam.put("bussinessType","0");
+            functionParam.put("bussinessType","1");
             functionParam.put("keyType","2");
-            functionParam.put("initMonth","3");
+            functionParam.put("initMonth","1");
             functionParam.put("invSpec","0");
             userList.add(functionParam);
 
@@ -102,7 +102,7 @@ public class UserManageTest {
             String secert = "";
             if(userInfo.contains("==")) {
                 taxno = userInfo.split("==")[0];
-                secert  = userInfo.split("==")[1].trim();
+//                secert  = userInfo.split("==")[1].trim();
             } else {
                 taxno = userInfo;
             }
@@ -130,20 +130,20 @@ public class UserManageTest {
 
             List<Object> userList = Lists.newArrayList();
             Map functionParam = new HashMap<>();
-            functionParam.put("functionNo","05");
+            functionParam.put("functionNo","06");
             functionParam.put("optType","0");//0注册 1-启用
             functionParam.put("validType","0");
             functionParam.put("bussinessType","0");
             functionParam.put("keyType","2");
             functionParam.put("initMonth","3");
-            functionParam.put("invSpec","0");
+            functionParam.put("invSpec","2");
             userList.add(functionParam);
 
             param.put("functionList", userList);
 
             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("UTF-8"));
         }
 
     }

tax-sign/sign-web/src/test/java/com/tax/sign/web/controller/test/SignTest.java

@@ -14,8 +14,8 @@ import java.util.Date;
 public class SignTest {
     String accessKeyID = "bwgf-limit";
     static String accessKeySecret = "bw@2u9%5Ts#2";
-   // static String host = "http://localhost:8763";
-    static String host = "http://bwtoken.invservice.cn:7779";
+    static String host = "http://localhost:8762";
+//    static String host = "http://bwtoken.invservice.cn:7779";
 //    String accessKeyID = "yongyou";
 //    static String accessKeySecret = "yongyou!@#443abd";
 
@@ -40,8 +40,8 @@ public class SignTest {
 
 
         System.out.println(url);
-//        ResponseContent ret = HttpHelper.getUrlRespContent(url);
-//        System.out.println(ret.getContent());
+        ResponseContent ret = HttpHelper.getUrlRespContent(url);
+        System.out.println(ret.getContent());
     }