Commit 4016aa67 by zhiwj

单域版

parent c8f9a989
......@@ -25,6 +25,8 @@ import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.member.config.api.service.ServiceConfigApiService;
import com.gic.member.filter.api.dto.CrowdWidgetDTO;
import com.gic.member.filter.api.service.CrowdWidgetApiService;
import com.gic.open.api.dto.EnterpriseServeInfoDTO;
import com.gic.open.api.service.EnterpriseLicenseApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -69,6 +71,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private CrowdWidgetApiService crowdWidgetApiService;
@Autowired
private EnterpriseLicenseApiService enterpriseLicenseApiService;
@Override
@Transactional
......@@ -276,7 +280,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
}
if (user.getSuperAdmin() == 1) {
ServiceResponse<EnterpriseServeInfoDTO> serveInfo = enterpriseLicenseApiService.getServeInfo(user.getEnterpriseId(), "gic");
if (user.getSuperAdmin() == 1 || "basic".equals(serveInfo.getResult().getVersionCode())) {
List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAllContainDel(user.getEnterpriseId()).getResult();
List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listAppletConfigAppIdContainDel(user.getEnterpriseId()).getResult();
List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listServiceConfigAppIdContainDel(user.getEnterpriseId()).getResult();
......
......@@ -27,7 +27,9 @@ import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
import com.gic.member.config.api.service.AppletsConfigApiService;
import com.gic.member.config.api.service.MemberCardApiService;
import com.gic.member.config.api.service.ServiceConfigApiService;
import com.gic.open.api.dto.EnterpriseServeInfoDTO;
import com.gic.open.api.service.AppTokenApiService;
import com.gic.open.api.service.EnterpriseLicenseApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -64,18 +66,20 @@ public class ResourceController {
private ServiceConfigApiService serviceConfigApiService;
@Autowired
private ShopApiService shopApiService;
@Autowired
private EnterpriseLicenseApiService enterpriseLicenseApiService;
@RequestMapping("/list-sms-sign")
public RestResponse listSmsSign(String search) {
ServiceResponse<List<EnterpriseSmsSignDTO>> response = smsApiService
.listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
if (response.isSuccess()) {
return RestResponse.success(EntityUtil.changeEntityListByJSON(EnterpriseSmsSignVO.class, response.getResult()));
} else {
return RestResponse.failure(response.getCode(), response.getMessage());
}
@RequestMapping("/list-sms-sign")
public RestResponse listSmsSign(String search) {
ServiceResponse<List<EnterpriseSmsSignDTO>> response = smsApiService
.listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
if (response.isSuccess()) {
return RestResponse.success(EntityUtil.changeEntityListByJSON(EnterpriseSmsSignVO.class, response.getResult()));
} else {
return RestResponse.failure(response.getCode(), response.getMessage());
}
}
@RequestMapping("/save-resource")
public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {
......@@ -171,4 +175,10 @@ public class ResourceController {
ServiceResponse<List<ShopDTO>> serviceResponse = shopApiService.getAllShopByEnterpriseIdAndName(UserDetailUtils.getUserDetail().getEnterpriseId(), null, ShopTypeEnum.MALL_SHOP.getCode());
return ResultControllerUtils.commonResult(serviceResponse);
}
@RequestMapping("/single-version")
public RestResponse isSingle() {
ServiceResponse<EnterpriseServeInfoDTO> serveInfo = enterpriseLicenseApiService.getServeInfo(UserDetailUtils.getUserDetail().getEnterpriseId(), "gic");
return RestResponse.success("basic".equals(serveInfo.getResult().getVersionCode()));
}
}
......@@ -79,5 +79,7 @@
<!-- 微商城 -->
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="ShopApiService" timeout="6000" />
<dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
</beans>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment