新建联合商户重复创建过滤

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/union/UnionEnterpriseAuthController.java

@@ -116,10 +116,10 @@ public class UnionEnterpriseAuthController {
         //验证码生成
         AuthCodeDTO authCodeDTO = new AuthCodeDTO();
         authCodeDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-        //生成4位数字验证码
-        String authCode = CreateRandomUtils.getStringRandom(6);
+        //生成6位数字验证码
+        String authCode = CreateRandomUtils.generateNumberStr(6);
         authCodeDTO.setAuthCode(authCode);
-        authCodeDTO.setExpirationTime(AuthCodeExpireTimeUtils.setAuthCodeExpireTime(5));
+        authCodeDTO.setExpirationTime(AuthCodeExpireTimeUtils.setAuthCodeExpireTime(2));
         ServiceResponse<Integer> result = authCodeApiService.saveAuth(authCodeDTO);
         if (result.isSuccess()) {
             Integer authCodeId = result.getResult();
@@ -147,10 +147,11 @@ public class UnionEnterpriseAuthController {
      * @param authCode
      * @param authCodeId
      * @param enterpriseName
+     * @param isAdd 是否是新增入口
      * @return
      */
     @RequestMapping("create-union-enterprise")
-    public RestResponse createUnionEnterprise(String authCode, Integer authCodeId, String enterpriseName) {
+    public RestResponse createUnionEnterprise(String authCode, Integer authCodeId, String enterpriseName, Boolean isAdd) {
         ServiceResponse authCodeResult = authCodeApiService.validateAuthCode(authCodeId, authCode);
         if (!authCodeResult.isSuccess()) {
             return RestResponse.failure(authCodeResult.getCode(), authCodeResult.getMessage());
@@ -159,6 +160,12 @@ public class UnionEnterpriseAuthController {
         if (unionEnterprise == null) {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "联合商户不存在或者是自有商户");
         }
+        if (isAdd != null && isAdd) {
+            UnionEnterpriseAuthDTO old = getUnionEnterpriseAuth(UserDetailUtils.getUserDetail().getEnterpriseId(), unionEnterprise.getEnterpriseId());
+            if (old != null) {
+                RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户已经联合");
+            }
+        }
 
         Integer ownEnterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer unionEnterpriseId = unionEnterprise.getEnterpriseId();