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

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/SlimeFieldsServiceImpl.java

@@ -234,13 +234,12 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService {
         param.setPermissions(list);
         param.setUid(uid);
         param.setUidRole("CHECKER");
-        List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is("654336562571018243092042").and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is(fieldId).and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         for (KylinPerformanceVo item : voList) {
             try {
                 param.setPerformanceId(item.getPerformancesId());
                 authorizationRecordsService.performanceRecordCheckerAdd(cuid, param);
             } catch (Exception e) {
-                continue;
             }
         }
 
@@ -300,10 +299,12 @@ public class SlimeFieldsServiceImpl implements ISlimeFieldsService {
         );
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
 
-        List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is("654336562571018243092042").and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> voList = mongoTemplate.find(Query.query(Criteria.where("fieldId").is(fieldId).and("appStatus").gte(3)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
         for (KylinPerformanceVo item : voList) {
-            SlimeAuthorizationRecordsVo vo = mongoTemplate.findOne(Query.query(Criteria.where("performanceId").is(item.getPerformancesId()).and("uidRole").is("CHECKER").and("uid").is(uid).and("cuid").is(cuid)), SlimeAuthorizationRecordsVo.class, SlimeAuthorizationRecordsVo.class.getSimpleName());
-            authorizationRecordsService.performanceRecordCheckerDel(cuid, vo.getAuthorizationRecordId());
+            List<SlimeAuthorizationRecordsVo> vo = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(item.getPerformancesId()).and("uidRole").is("CHECKER").and("uid").is(uid).and("cuid").is(cuid)), SlimeAuthorizationRecordsVo.class, SlimeAuthorizationRecordsVo.class.getSimpleName());
+            for (SlimeAuthorizationRecordsVo itemVo : vo) {
+                authorizationRecordsService.performanceRecordCheckerDel(cuid, itemVo.getAuthorizationRecordId());
+            }
         }
     }