增加税号管理解锁接口

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

@@ -17,7 +17,7 @@ public class FileManageTest {
 //    static String host = "http://60.205.138.54:8767";
     @Test
     public void testHandApplyFile() throws Exception{
-        String url = host + "/fileManage/handApplyFile";
+        String url = host + "/fileManage/handApplyMonthFile";
         System.out.println(url);
         String signStr = "AccessKeyID=%s&SignatureNonce=%s&TimeStamp=%s&Version=1.0";
 
@@ -38,7 +38,6 @@ public class FileManageTest {
 
         param.put("forceApplyFlag","1");
         param.put("invSpec","0");
-        param.put("invType","73");
 
         List<String> monthList = Lists.newArrayList();
         monthList.add("202310");

tax-token/token-common/src/main/java/com/tax/token/thirdService/impl/GetTokenFromEleJsonTax.java

@@ -39,6 +39,7 @@ public class GetTokenFromEleJsonTax implements TokenThirdServiceI {
         json.put("dqdm", zoneCode);
         json.put("site", tokenEntity.getSite());
         json.put("target", tokenEntity.getTarget());
+        json.put("requestId", uuIdFlag);
         if(null!=tokenEntity.getTaxUserInfo()) {
             json.put("loginInfoJson", JSON.toJSON(tokenEntity.getTaxUserInfo()));
         }

tax-token/token-common/src/main/java/com/tax/token/utils/CleanCookieUtil.java

@@ -24,14 +24,20 @@ public class CleanCookieUtil {
         JSONObject json = new JSONObject();
         json.put("userCode", cookieReq.getUserCode());
         json.put("type", type);
+        json.put("requestId", uuIdFlag);
 
-        JSONArray jsonArray = new JSONArray();
-        if(type.equals("3")) {
-            jsonArray.add(cookieReq.getZoneCode()+":"+cookieReq.getUserInfo());
+        if(type.equals("10")) {
+            json.put("dqdm", cookieReq.getZoneCode());
+            json.put("taxno", cookieReq.getTaxno());
         } else {
-            jsonArray.add(cookieReq.getZoneCode()+":"+taxno+":"+ cookieReq.getUserInfo());
+            JSONArray jsonArray = new JSONArray();
+            if (type.equals("3")) {
+                jsonArray.add(cookieReq.getZoneCode() + ":" + cookieReq.getUserInfo());
+            } else {
+                jsonArray.add(cookieReq.getZoneCode() + ":" + taxno + ":" + cookieReq.getUserInfo());
+            }
+            json.put("keyList", jsonArray);
         }
-        json.put("keyList", jsonArray);
 
         String url = TokenConstants.CLEAN_COOKIE_URL;
         logger.info(uuIdFlag + " taxno is " + taxno + " url is " + url + ",param is " + json.toString());

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -680,6 +680,15 @@ public class TkTokenServiceImpl implements TkTokenService {
                     tkTokenMapper.updateTokenInfo(updateEntity);
                 }
                 logger.info(uuId + " insertToken taxno is " + taxno + " is update success!" + updateEntity.printSaveInfo() + ",updateFlag:" + updateFlag);
+                //开启因短信超次数关闭的税号
+                if(StringUtil.isNotEmpty(updateEntity.getErrorCode()) && updateEntity.getErrorCode().equals("4042")) {
+                    CookieReq cookieReq = new CookieReq();
+                    cookieReq.setUserCode(userCode);
+                    cookieReq.setZoneCode(updateEntity.getZoneCode());
+                    cookieReq.setTaxno(taxno);
+                    Map<String, Object> cleanMap = CleanCookieUtil.cleanCookie(uuId, cookieReq, "10");
+                    logger.info(uuId + " insertToken taxno is " + taxno + " cleanCookie result is " + JSON.toJSONString(cleanMap));
+                }
             } else {
                 TkToken entity = new TkToken();