会员接口初始化调整：当会员基础配置完成的时候进行

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java

@@ -3,17 +3,6 @@ package com.gic.enterprise.service.outer.impl;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import com.gic.auth.dto.BusinessFrontResDTO;
-import com.gic.auth.service.BusinessFrontResApiService;
-import com.gic.enterprise.constants.Constants;
-import com.gic.enterprise.dto.EnterpriseResourceRelDTO;
-import com.gic.enterprise.entity.TabEnterpriseInit;
-import com.gic.enterprise.entity.TabEnterpriseResourceRel;
-import com.gic.enterprise.qo.EnterpriseQO;
-import com.gic.enterprise.service.*;
-import com.gic.member.api.service.MemberInitApiService;
-import com.gic.open.api.service.ServeApiService;
-import com.gic.store.service.StoreGroupApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -27,26 +16,36 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.BusinessFrontResDTO;
 import com.gic.auth.dto.UserDTO;
+import com.gic.auth.service.BusinessFrontResApiService;
 import com.gic.auth.service.UserApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constant.EnterpriseStatusTypeEnum;
+import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.EnterpriseLicenseDTO;
 import com.gic.enterprise.dto.EnterpriseListDTO;
+import com.gic.enterprise.dto.EnterpriseResourceRelDTO;
 import com.gic.enterprise.dto.market.*;
 import com.gic.enterprise.entity.TabEnterprise;
+import com.gic.enterprise.entity.TabEnterpriseInit;
+import com.gic.enterprise.entity.TabEnterpriseResourceRel;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.BuyForGicQO;
+import com.gic.enterprise.qo.EnterpriseQO;
 import com.gic.enterprise.qo.OrderServiceQO;
+import com.gic.enterprise.service.*;
 import com.gic.open.api.dto.*;
 import com.gic.open.api.dto.market.OrderBuyLicenseDTO;
 import com.gic.open.api.dto.market.OrderCheckDTO;
 import com.gic.open.api.service.AppTokenApiService;
 import com.gic.open.api.service.OrderApiService;
+import com.gic.open.api.service.ServeApiService;
 import com.gic.open.api.service.market.MarketUserApiService;
 import com.gic.open.api.service.market.OrderPurchaseApiService;
+import com.gic.store.service.StoreGroupApiService;
 import com.gic.store.utils.valid.ValidUtil;
 
 /**
@@ -77,8 +76,6 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
     @Autowired
     private BillingAccountService billingAccountService;
     @Autowired
-    private MemberInitApiService memberInitApiService;
-    @Autowired
     private ServeApiService serveApiService;
     @Autowired
     private EnterpriseResourceRelService enterpriseResourceRelService;
@@ -163,9 +160,6 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return storeGroupInit;
         }
-        //会员组接口初始化
-        ServiceResponse<Void> memberInitResult = memberInitApiService.configInit(enterpriseId);
-        LOGGER.warn("新增商户-会员组接口初始化结果:{}", JSONObject.toJSONString(memberInitResult));
 
         return ServiceResponse.success(enterpriseId);
     }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseInitApiServiceImpl.java

 package com.gic.enterprise.service.outer.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.constant.EnterpriseInitCodeEnum;
@@ -10,6 +11,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.EnterpriseInitApiService;
 import com.gic.enterprise.service.EnterpriseInitService;
 import com.gic.enterprise.service.EnterpriseService;
+import com.gic.member.api.service.MemberInitApiService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +30,8 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
     private EnterpriseInitService enterpriseInitService;
     @Autowired
     private EnterpriseService enterpriseService;
+    @Autowired
+    private MemberInitApiService memberInitApiService;
 
 
     private ServiceResponse<Void> initByConfigCode(String configCode, Integer enterpriseId) {
@@ -59,6 +63,15 @@ public class EnterpriseInitApiServiceImpl implements EnterpriseInitApiService{
             //如果是，则父级节点自动初始化
             if (isChildrenAllInit) {
                 enterpriseInitService.initById(enterpriseInit.getParentId());
+
+                //会员基础配置完成，自动初始化会员接口
+                List<String> memberCardConfigList = EnterpriseInitCodeEnum
+                        .getListByParentCode(EnterpriseInitCodeEnum.COMPLETE_MEMBER_CARD_CONFIG.getCode());
+                if (memberCardConfigList.contains(configCode)) {
+                    //会员组接口初始化
+                    ServiceResponse<Void> memberInitResult = memberInitApiService.configInit(enterpriseId);
+                    LOGGER.warn("新增商户-会员组接口初始化结果:{}", JSONObject.toJSONString(memberInitResult));
+                }
             }
         }
         return ServiceResponse.success();