Commit 838bee85 by zhiwj

修改用户资源获取的问题

parent 89268f4c
......@@ -299,6 +299,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
private String getTempQrCodeUrl(Integer auditorId) {
logger.info("生成临时带参二维码 auditorId:{}", auditorId);
System.out.println(config.getAppkey());
ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(config.getAppkey(), "auditor_" + auditorId, 300);
if (serviceResponse.isSuccess()) {
logger.info("临时带参二维码生成成功:{}", serviceResponse.getResult());
......
......@@ -23,6 +23,8 @@ 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.member.filter.api.dto.CrowdWidgetDTO;
import com.gic.member.filter.api.service.CrowdWidgetApiService;
import com.gic.store.service.StoreWidgetApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -65,7 +67,8 @@ public class ResourceApiServiceImpl implements ResourceApiService {
private ServiceConfigApiService serviceConfigApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
@Autowired
private CrowdWidgetApiService crowdWidgetApiService;
@Override
@Transactional
......@@ -103,7 +106,6 @@ public class ResourceApiServiceImpl implements ResourceApiService {
Integer channel = orderAppResourceService.save(channelDTO);
resourceDTO.setChannelResource(channel);
if (resourceDTO.getResourceId() == null) {
// save
resourceService.save(resourceDTO);
......@@ -356,6 +358,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
}
UserResourceDTO userResourceDTO = resourceDTOList.get(0);
TabSysResource resource = this.resourceService.getResource(userResourceDTO.getResourceId());
return EnterpriseServiceResponse.success(resource.getUserResource());
CrowdWidgetDTO widgetDTO = crowdWidgetApiService.getScreenWidgetInfo(resource.getUserResource(), resource.getEnterpriseId()).getResult();
return EnterpriseServiceResponse.success(StringUtils.isNotBlank(widgetDTO.getSearchParams()) ? resource.getUserResource() : null);
}
}
......@@ -71,4 +71,5 @@
<dubbo:reference interface="com.gic.goods.api.service.GoodsRightsSelectorApiService" id="goodsRightsSelectorApiService" timeout="6000" />
<dubbo:reference interface="com.gic.authcenter.api.service.GicUserService" id="gicUserService" timeout="6000" />
<dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
<dubbo:reference interface="com.gic.member.filter.api.service.CrowdWidgetApiService" id="crowdWidgetApiService" timeout="6000" />
</beans>
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