【数据资产】

1、认证校验

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.csbr.cloud.common.enums.RedisKeyEnum;
 import com.csbr.cloud.common.enums.RedisKeyEnum;
+import com.csbr.cloud.common.enums.SystemError;
+import com.csbr.cloud.common.exception.CsbrSystemException;
 import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.common.util.CsbrBeanUtil;
 import com.csbr.cloud.distributelock.util.RedisUtil;
 import com.csbr.cloud.distributelock.util.RedisUtil;
 import com.csbr.cloud.external.config.DataPortConfig;
 import com.csbr.cloud.external.config.DataPortConfig;
@@ -27,6 +29,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
@@ -72,7 +75,10 @@ public class DataPortServiceImpl implements DataPortService {
     public void operatorRegister(MfEnterprise entity) {
     public void operatorRegister(MfEnterprise entity) {
         log.info("======经办人用户注册开始======");
         log.info("======经办人用户注册开始======");
         OperatorRegisterRQVO operatorRegisterRQVO = beforeOperator(entity);
         OperatorRegisterRQVO operatorRegisterRQVO = beforeOperator(entity);
-        dataPortConnectUtil.postByAuthKey(operatorRegisterRQVO, dataPortConfig.getOperatorRegisterUri());
+        String message = dataPortConnectUtil.postByAuthKey(operatorRegisterRQVO, dataPortConfig.getOperatorRegisterUri());
+        if (StringUtils.isNotEmpty(message) && !message.contains("经办人账号身份标识已存在，无法注册")) {
+            throw new CsbrSystemException(SystemError.DATA_GET_ERROR, message);
+        }
         log.info("======经办人用户注册结束======");
         log.info("======经办人用户注册结束======");
     }
     }
 
 
@@ -89,7 +95,10 @@ public class DataPortServiceImpl implements DataPortService {
     public void enterpriseRegister(MfEnterprise entity) {
     public void enterpriseRegister(MfEnterprise entity) {
         log.info("======法人用户注册开始======");
         log.info("======法人用户注册开始======");
         EnterpriseRegisterRQVO enterpriseRegisterRQVO = beforeEnterprise(entity);
         EnterpriseRegisterRQVO enterpriseRegisterRQVO = beforeEnterprise(entity);
-        dataPortConnectUtil.postByAuthKey(enterpriseRegisterRQVO, dataPortConfig.getEnterpriseRegisterUri());
+        String message = dataPortConnectUtil.postByAuthKey(enterpriseRegisterRQVO, dataPortConfig.getEnterpriseRegisterUri());
+        if (StringUtils.isNotEmpty(message) && !message.contains("统一社会信用代码已存在")) {
+            throw new CsbrSystemException(SystemError.DATA_GET_ERROR, message);
+        }
         log.info("======法人用户注册结束======");
         log.info("======法人用户注册结束======");
     }
     }
 
 
@@ -233,7 +242,16 @@ public class DataPortServiceImpl implements DataPortService {
         enterpriseRegisterRQVO.setEnterpriseType("4");
         enterpriseRegisterRQVO.setEnterpriseType("4");
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         enterpriseRegisterRQVO.setOperatingPeriodBegin(simpleDateFormat.format(entity.getBusinessLicenseStartDate()));
         enterpriseRegisterRQVO.setOperatingPeriodBegin(simpleDateFormat.format(entity.getBusinessLicenseStartDate()));
-        enterpriseRegisterRQVO.setOperatingPeriodEnd(simpleDateFormat.format(entity.getBusinessLicenseEndDate()));
+        Date businessLicenseEndDate = entity.getBusinessLicenseEndDate();
+        if (ObjectUtils.isEmpty(businessLicenseEndDate)) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            calendar.add(Calendar.YEAR, 1);
+            Date nextYearDate = calendar.getTime();
+            enterpriseRegisterRQVO.setOperatingPeriodEnd(simpleDateFormat.format(nextYearDate));
+        } else {
+            enterpriseRegisterRQVO.setOperatingPeriodEnd(simpleDateFormat.format(entity.getBusinessLicenseEndDate()));
+        }
 //        enterpriseRegisterRQVO.setAuthType(entity.getAuthenticationMethod());
 //        enterpriseRegisterRQVO.setAuthType(entity.getAuthenticationMethod());
         enterpriseRegisterRQVO.setAuthType("3");
         enterpriseRegisterRQVO.setAuthType("3");
 //        enterpriseRegisterRQVO.setAuthStatus(entity.getAuthenticationState());
 //        enterpriseRegisterRQVO.setAuthStatus(entity.getAuthenticationState());

@@ -521,7 +521,7 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
             }
             }
             // 调用数据港法人和经办人注册接口
             // 调用数据港法人和经办人注册接口
             dataPortService.enterpriseRegister(entity);
             dataPortService.enterpriseRegister(entity);
-//            dataPortService.operatorRegister(entity);
+            dataPortService.operatorRegister(entity);
         }
         }
     }
     }