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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -297,8 +297,9 @@ public class DataUtils {
     public List<KylinPerformanceVo> getPerformancesListOfcityNameOradCode(String cityName, Integer adCode) {
         if (!cityName.isEmpty()) {
             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));
         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

@@ -49,6 +49,14 @@ public class MongoSlimeUtils {
     @Autowired
     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) {
         return mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
@@ -371,26 +379,12 @@ public class MongoSlimeUtils {
             dao.setTimeStop(timeStop);
 
             if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) {
-                dao.setPermissionId(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());
-                }});
+                dao.setPermissionId(initPerList);
             }
 
             for (SlimeAuthorizationPerformanceVo permission : permissionVoList) {
                 if (item.getMerchantId().equals(performancePartnerListParam.getMerchantId()) || isSuperAccount) {
-                    dao.setPermissionId(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());
-                    }});
+                    dao.setPermissionId(initPerList);
                     break;
                 }
                 if (permission.getPerformanceId().equals(item.getPerformancesId())) {