记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 09d37583 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev_merchant' into pre

parents bc422b88 38f18543
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 17 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @ 09d37583
...@@ -297,8 +297,9 @@ public class DataUtils { ...@@ -297,8 +297,9 @@ public class DataUtils {
public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, Integer adCode) { public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, Integer adCode) {
if (!cityName.isEmpty()) { if (!cityName.isEmpty()) {
if (!cityName.endsWith("州") && !cityName.endsWith("县") && !cityName.endsWith("区") && !cityName.endsWith("市")) { if (!cityName.endsWith("州") && !cityName.endsWith("县") && !cityName.endsWith("区") && !cityName.endsWith("市")) {
adCode = CityJsonUtils.get(cityName.concat("市")); cityName = cityName.concat("市");
} }
adCode = CityJsonUtils.get(cityName);
} }
String redisKey = KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(adCode)); String redisKey = KylinRedisConst.PERFORMANCES_LIST_CITY.concat(String.valueOf(adCode));
Object object = redisUtil.get(redisKey); Object object = redisUtil.get(redisKey);
......
liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/util/MongoSlimeUtils.java
View file @ 09d37583
...@@ -49,6 +49,14 @@ public class MongoSlimeUtils { ...@@ -49,6 +49,14 @@ public class MongoSlimeUtils {
@Autowired @Autowired
private SlimeRdmService slimeRdmService; private SlimeRdmService slimeRdmService;
private List<String> initPerList = new ArrayList<String>() {{
add(SlimeAuthorizationConst.PerformancePermission.READ.getId());
add(SlimeAuthorizationConst.PerformancePermission.EDIT.getId());
add(SlimeAuthorizationConst.PerformancePermission.LINE.getId());
add(SlimeAuthorizationConst.PerformancePermission.SALES.getId());
add(SlimeAuthorizationConst.PerformancePermission.CHECK.getId());
add(SlimeAuthorizationConst.PerformancePermission.GRANT.getId());
}};
public PerformancePartnerVo getPerformancePartnerVo(String performanceId) { public PerformancePartnerVo getPerformancePartnerVo(String performanceId) {
return mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); return mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
...@@ -371,26 +379,12 @@ public class MongoSlimeUtils { ...@@ -371,26 +379,12 @@ public class MongoSlimeUtils {
dao.setTimeStop(timeStop); dao.setTimeStop(timeStop);
if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) { if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) {
dao.setPermissionId(new ArrayList<String>() {{ dao.setPermissionId(initPerList);
add(SlimeAuthorizationConst.PerformancePermission.READ.getId());
add(SlimeAuthorizationConst.PerformancePermission.EDIT.getId());
add(SlimeAuthorizationConst.PerformancePermission.LINE.getId());
add(SlimeAuthorizationConst.PerformancePermission.SALES.getId());
add(SlimeAuthorizationConst.PerformancePermission.CHECK.getId());
add(SlimeAuthorizationConst.PerformancePermission.GRANT.getId());
}});
} }
for (SlimeAuthorizationPerformanceVo permission : permissionVoList) { for (SlimeAuthorizationPerformanceVo permission : permissionVoList) {
if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) { if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) {
dao.setPermissionId(new ArrayList<String>() {{ dao.setPermissionId(initPerList);
add(SlimeAuthorizationConst.PerformancePermission.READ.getId());
add(SlimeAuthorizationConst.PerformancePermission.EDIT.getId());
add(SlimeAuthorizationConst.PerformancePermission.LINE.getId());
add(SlimeAuthorizationConst.PerformancePermission.SALES.getId());
add(SlimeAuthorizationConst.PerformancePermission.CHECK.getId());
add(SlimeAuthorizationConst.PerformancePermission.GRANT.getId());
}});
break; break;
} }
if (permission.getPerformanceId().equals(item.getPerformancesId())) { if (permission.getPerformanceId().equals(item.getPerformancesId())) {
......
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