Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UnionEnterpriseApiServiceImpl.java

@@ -13,6 +13,7 @@ import com.gic.auth.service.UnionEnterpriseService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constants.Constants;
+import com.gic.store.service.StoreAuthorizationApiService;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@ public class UnionEnterpriseApiServiceImpl implements UnionEnterpriseApiService
     private UnionEnterpriseService unionEnterpriseService;
     @Autowired
     private UnionEnterpriseResourceService unionEnterpriseResourceService;
+    @Autowired
+    private StoreAuthorizationApiService storeAuthorizationApiService;
 
     @Override
     @Transactional
@@ -114,6 +117,9 @@ public class UnionEnterpriseApiServiceImpl implements UnionEnterpriseApiService
                 ResourceTypeEnum.STORE_RESOURCE.getCode(), enterpriseDTO.getEnterpriseId());
         if( i == 0){
             throw new RuntimeException();
+        }else {
+            this.storeAuthorizationApiService.authStore(enterpriseDTO.getStoreResourceId().intValue(),
+                    enterpriseDTO.getUnionEnterpriseId(), enterpriseDTO.getEnterpriseId());
         }
         i = this.unionEnterpriseResourceService.saveResource(unionId, enterpriseDTO.getGoodsResourceId(),
                 ResourceTypeEnum.GOODS_RESOURCE.getCode(), enterpriseDTO.getEnterpriseId());

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -37,4 +37,5 @@
     <dubbo:reference interface="com.gic.wechat.business.api.service.fwh.WeixinBaseFunService" id="weixinBaseFunService" timeout="6000" />
     <!--会员模块-->
     <dubbo:reference interface="com.gic.member.api.service.ServiceUserApiService" id="serviceUserApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.store.service.StoreAuthorizationApiService" id="storeAuthorizationApiService" timeout="6000" />
 </beans>