fix(tcm): 修复工商信息查询逻辑并优化异常处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -1110,6 +1110,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                     || msg.contains("decrypt error, code: -65")) {
                 throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
             }
+            ex.printStackTrace();
             throw new BadRequest("系统内部错误，请联系管理员。");
         }
     }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizByTCMServiceImpl.java

@@ -236,7 +236,12 @@ public class EnterpriseBizByTCMServiceImpl {
         // 陕西省内企业从工商平台查询工商信息
         if (UnitDataSourceEnum.SHAANXI.getName().equals(tzBaseEnterpriseInfo.getDataSources())
                 && EnterpriseEnums.QY_DW.getTypeName().equals(tzBaseEnterpriseInfo.getRegisterType())) {
+            // 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
+            tzBaseEnterpriseInfoDto.setCanEdit("0");
+            tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
             Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
+            if (!ValidationUtil.isEmpty(resultMap)) {
+
                 String area = String.valueOf(resultMap.get("area"));
                 String city = area.substring(0, area.indexOf("市") + 1);
                 String district = area.substring(city.length());
@@ -251,9 +256,9 @@ public class EnterpriseBizByTCMServiceImpl {
                 String approveDate = String.valueOf(resultMap.get("approval_time"));
                 approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
                 approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
-            approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
+                approveDate = approveDate.contains("日") ? approveDate.replace("日", "") : approveDate;
                 regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
-            String approve = approveDate.substring(0, 10) + "核准";
+                String approve = approveDate + "核准";
                 tzBaseEnterpriseInfoDto.setApproval(approve);
                 try {
                     regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
@@ -283,9 +288,7 @@ public class EnterpriseBizByTCMServiceImpl {
                 objects.add(district);
                 regUnitIcDto.setRegisterAddressList(objects);
                 regUnitIcDto.setIsNotAccess("1");
-            // 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
-            tzBaseEnterpriseInfoDto.setCanEdit("0");
-            tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
+            }
         } else {
             regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
             regUnitIcDto.setIsNotAccess("0");

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -402,7 +402,11 @@ public class TzBaseEnterpriseInfoServiceImpl
 		// 陕西省内企业从工商平台查询工商信息
 		if (UnitDataSourceEnum.SHAANXI.getName().equals(tzBaseEnterpriseInfo.getDataSources())
 				&& EnterpriseEnums.QY_DW.getTypeName().equals(tzBaseEnterpriseInfo.getRegisterType())) {
+			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
+			tzBaseEnterpriseInfoDto.setCanEdit("0");
+			tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
 			Map<String, Object> resultMap = accessFeignService.getData(creditCode).getResult();
+			if (!ValidationUtil.isEmpty(resultMap)) {
 				String area = String.valueOf(resultMap.get("area"));
 				String city = area.substring(0, area.indexOf("市") + 1);
 				String district = area.substring(city.length());
@@ -417,9 +421,10 @@ public class TzBaseEnterpriseInfoServiceImpl
 				String approveDate = String.valueOf(resultMap.get("approval_time"));
 				approveDate = approveDate.contains("年") ? approveDate.replace("年", "-") : approveDate;
 				approveDate = approveDate.contains("月") ? approveDate.replace("月", "-") : approveDate;
-			approveDate = approveDate.contains("日") ? approveDate.replace("日", "-") : approveDate;
+				approveDate = approveDate.contains("日") ? approveDate.replace("日", "") : approveDate;
 				regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
-			String approve = approveDate.substring(0, 10) + "核准";
+				log.info("工商信息approveDate：{}", approveDate);
+				String approve = approveDate + "核准";
 				tzBaseEnterpriseInfoDto.setApproval(approve);
 				try {
 					regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate, "yyyy-MM-dd"));
@@ -449,9 +454,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 				objects.add(district);
 				regUnitIcDto.setRegisterAddressList(objects);
 				regUnitIcDto.setIsNotAccess("1");
-			// 判断是否可以让用户编辑工商及许可信息 事业单位、个人主体或省外企业都可编辑
-			tzBaseEnterpriseInfoDto.setCanEdit("0");
-			tzBaseEnterpriseInfoDto.setLicenseCanEdit("1");
+			}
 		} else {
 			regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 			regUnitIcDto.setIsNotAccess("0");
@@ -1077,6 +1080,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 					|| msg.contains("decrypt error, code: -65")) {
 				throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
 			}
+			ex.printStackTrace();
 			throw new BadRequest("系统内部错误，请联系管理员。");
 		}
 	}

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -1121,6 +1121,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     || msg.contains("decrypt error, code: -65")) {
                 throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
             }
+            ex.printStackTrace();
             throw new BadRequest("系统内部错误，请联系管理员。");
         }
     }