Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreBrandApiServiceImpl.java

@@ -7,6 +7,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.service.EnterpriseInitApiService;
 import com.gic.enterprise.service.PlatformBrandApiService;
 import com.gic.store.dto.StoreBrandDTO;
 import com.gic.store.entity.TabStoreBrand;
@@ -42,6 +43,8 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
     private StoreService storeService;
     @Autowired
     private PlatformBrandApiService platformBrandApiService;
+    @Autowired
+    private EnterpriseInitApiService enterpriseInitApiService;
 
 
     @Override
@@ -60,6 +63,7 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
             storeBrandId = storeBrandService.save(storeBrandDTO);
             storeBrandDTO.setStoreBrandId(storeBrandId);
             addRef(storeBrandDTO);
+            enterpriseInitApiService.createStoreBrand(storeBrandDTO.getEnterpriseId());
 //            systemSetLogDTO.setContent("新增品牌, 品牌名:" + storeBrandDTO.getStoreBrandName());
         } else {
             // 编辑

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreRegionApiServiceImpl.java

@@ -10,6 +10,7 @@ import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
+import com.gic.enterprise.service.EnterpriseInitApiService;
 import com.gic.store.constant.StoreOwnTypeEnum;
 import com.gic.store.dto.StoreRegionDTO;
 import com.gic.store.entity.TabStoreRegionRel;
@@ -41,6 +42,8 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
     private StoreFieldApiService storeFieldApiService;
     @Autowired
     private EnterpriseApiService enterpriseApiService;
+    @Autowired
+    private EnterpriseInitApiService enterpriseInitApiService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -60,6 +63,7 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
             }
             regionId = storeRegionService.save(enterpriseId, regionCode, regionName);
             storeRegionRelService.saveByOwner(enterpriseId, regionId);
+            enterpriseInitApiService.createStoreRegion(enterpriseId);
 //            LogUtils.saveAddLog(storeRegionDTO);
         }else {
             // 修改

gic-store-service/src/main/resources/dubbo-gic-store-service.xml

@@ -53,4 +53,5 @@
     <dubbo:reference interface="com.gic.enterprise.service.PlatformBrandApiService" id="platformBrandApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.auth.service.UnionEnterpriseApiService" id="unionEnterpriseApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.enterprise.service.EnterpriseInitApiService" id="enterpriseInitApiService" timeout="60000" />
 </beans>