update

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/utils/MerchantMongoUtil.java

@@ -23,8 +23,10 @@ public class MerchantMongoUtil {
     private MongoConverter mongoConverter;
 
 
+    // 【场地相关】
     public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("fieldId").is(fieldId));
+        return mongoTemplate.findOne(query, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
     }
 
     public void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
@@ -34,8 +36,10 @@ public class MerchantMongoUtil {
         mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
     }
 
+    // 【主办相关】
     public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("sponsorId").is(sponsorId));
+        return mongoTemplate.findOne(query, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
     }
 
     public void setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
@@ -45,9 +49,56 @@ public class MerchantMongoUtil {
         mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
     }
 
+    // 【场地申请相关】
+    public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
+    }
+
+    public MerchantFieldAppliesVo addFieldAppliesVo(MerchantFieldAppliesVo vo) {
+        return mongoTemplate.insert(vo, MerchantFieldAppliesVo.class.getSimpleName());
+    }
+
+    public void delFieldAppliesVoByFieldApplyId(String fieldApplyId) {
+        Query query = Query.query(Criteria.where("fieldApplyId").is(fieldApplyId));
+        mongoTemplate.remove(query, MerchantFieldAppliesVo.class.getSimpleName());
+    }
 
+    // 【主办申请相关】
+    public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    public MerchantSponsorAppliesVo addSponsorAppliesVo(MerchantSponsorAppliesVo vo) {
+        return mongoTemplate.insert(vo, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    public void delSponsorAppliesVoBySponsorApplyId(String sponsorApplyId) {
+        Query query = Query.query(Criteria.where("sponsorApplyId").is(sponsorApplyId));
+        mongoTemplate.remove(query, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    // 【默认验票员相关】
+    public List<MerchantFieldCheckersVo> getFieldCheckersVosByFieldId(String fieldId) {
+        Query query = Query.query(Criteria.where("fieldId").is(fieldId).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantFieldCheckersVo.class, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+    public MerchantFieldCheckersVo addFieldCheckersVo(MerchantFieldCheckersVo vo) {
+        return mongoTemplate.insert(vo, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+    public void delFieldCheckersVoByFieldCheckerId(String fieldCheckerId) {
+        Query query = Query.query(Criteria.where("fieldCheckerId").is(fieldCheckerId));
+        mongoTemplate.remove(query, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+
+    // 【权限相关】
     public MerchantAuthorizationPerformanceVo getAuthorizationPerformanceVo(String performanceId, String uid) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("performanceId").is(performanceId).and("uid").is(uid)), MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("performanceId").is(performanceId).and("uid").is(uid));
+        return mongoTemplate.findOne(query, MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
     }
 
     public MerchantAuthorizationPerformanceVo getAndSyncAuthorizationPerformanceVo(String performanceId, String uid) {
@@ -78,15 +129,15 @@ public class MerchantMongoUtil {
         return vo;
     }
 
-
-    public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
-        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
-        return mongoTemplate.find(query, MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
+    // 【授权记录相关】
+    public MerchantAuthorizationRecordsVo getAuthorizationRecordsVoByAuthorizationRecordId(String authorizationRecordId) {
+        Query query = Query.query(Criteria.where("authorizationRecordId").is(authorizationRecordId).and("deletedAt").is(null));
+        return mongoTemplate.findOne(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 
-    public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
-        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
-        return mongoTemplate.find(query, MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
+    public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsVosByUid(String uid, String performanceId) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("performanceId").is(performanceId).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 
     public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsCheckersVosByCuid(String cuid, String performanceId) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/utils/MerchantRedisUtil.java

@@ -104,6 +104,10 @@ public class MerchantRedisUtil {
         long s = System.currentTimeMillis();
         List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>) redisDataSourceUtil.getRedisKylinUtil().get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
+        if (null == vos) {
+            vos = merchantMongoUtil.getFieldCheckersVosByFieldId(fieldId);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vos);
+        }
         return vos;
     }
 
@@ -125,6 +129,7 @@ public class MerchantRedisUtil {
         return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
     }
 
+
     // 【主办】详情
     public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
         if (null == sponsorId || sponsorId.isEmpty()) {
@@ -146,6 +151,7 @@ public class MerchantRedisUtil {
         return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
     }
 
+
     // 【主办申请】我的列表
     public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
         if (null == uid || uid.isEmpty()) {

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/MerchantMongoService.java

@@ -23,8 +23,10 @@ public class MerchantMongoService {
     MongoConverter mongoConverter;
 
 
+    // 【场地相关】
     public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("fieldId").is(fieldId));
+        return mongoTemplate.findOne(query, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
     }
 
     public void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
@@ -34,9 +36,10 @@ public class MerchantMongoService {
         mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
     }
 
-
+    // 【主办相关】
     public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("sponsorId").is(sponsorId)), MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("sponsorId").is(sponsorId));
+        return mongoTemplate.findOne(query, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
     }
 
     public void setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
@@ -46,9 +49,56 @@ public class MerchantMongoService {
         mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName());
     }
 
+    // 【场地申请相关】
+    public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
+    }
+
+    public MerchantFieldAppliesVo addFieldAppliesVo(MerchantFieldAppliesVo vo) {
+        return mongoTemplate.insert(vo, MerchantFieldAppliesVo.class.getSimpleName());
+    }
+
+    public void delFieldAppliesVoByFieldApplyId(String fieldApplyId) {
+        Query query = Query.query(Criteria.where("fieldApplyId").is(fieldApplyId));
+        mongoTemplate.remove(query, MerchantFieldAppliesVo.class.getSimpleName());
+    }
 
+    // 【主办申请相关】
+    public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
+        Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    public MerchantSponsorAppliesVo addSponsorAppliesVo(MerchantSponsorAppliesVo vo) {
+        return mongoTemplate.insert(vo, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    public void delSponsorAppliesVoBySponsorApplyId(String sponsorApplyId) {
+        Query query = Query.query(Criteria.where("sponsorApplyId").is(sponsorApplyId));
+        mongoTemplate.remove(query, MerchantSponsorAppliesVo.class.getSimpleName());
+    }
+
+    // 【默认验票员相关】
+    public List<MerchantFieldCheckersVo> getFieldCheckersVosByFieldId(String fieldId) {
+        Query query = Query.query(Criteria.where("fieldId").is(fieldId).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantFieldCheckersVo.class, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+    public MerchantFieldCheckersVo addFieldCheckersVo(MerchantFieldCheckersVo vo) {
+        return mongoTemplate.insert(vo, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+    public void delFieldCheckersVoByFieldCheckerId(String fieldCheckerId) {
+        Query query = Query.query(Criteria.where("fieldCheckerId").is(fieldCheckerId));
+        mongoTemplate.remove(query, MerchantFieldCheckersVo.class.getSimpleName());
+    }
+
+
+    // 【权限相关】
     public MerchantAuthorizationPerformanceVo getAuthorizationPerformanceVo(String performanceId, String uid) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("performanceId").is(performanceId).and("uid").is(uid)), MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("performanceId").is(performanceId).and("uid").is(uid));
+        return mongoTemplate.findOne(query, MerchantAuthorizationPerformanceVo.class, MerchantAuthorizationPerformanceVo.class.getSimpleName());
     }
 
     public MerchantAuthorizationPerformanceVo getAndSyncAuthorizationPerformanceVo(String performanceId, String uid) {
@@ -79,44 +129,19 @@ public class MerchantMongoService {
         return vo;
     }
 
-
-    public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) {
-        return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName());
-    }
-
-    public MerchantFieldAppliesVo addFieldAppliesVo(MerchantFieldAppliesVo vo) {
-        return mongoTemplate.insert(vo, MerchantFieldAppliesVo.class.getSimpleName());
-    }
-
-    public void delFieldAppliesVoByFieldApplyId(String fieldApplyId) {
-        Query query = Query.query(Criteria.where("fieldApplyId").is(fieldApplyId));
-        mongoTemplate.remove(query, MerchantFieldAppliesVo.class.getSimpleName());
-    }
-
-
-    public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
-        return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)), MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName());
-    }
-
-    public MerchantSponsorAppliesVo addSponsorAppliesVo(MerchantSponsorAppliesVo vo) {
-        return mongoTemplate.insert(vo, MerchantSponsorAppliesVo.class.getSimpleName());
-    }
-
-    public void delSponsorAppliesVoBySponsorApplyId(String sponsorApplyId) {
-        Query query = Query.query(Criteria.where("sponsorApplyId").is(sponsorApplyId));
-        mongoTemplate.remove(query, MerchantSponsorAppliesVo.class.getSimpleName());
-    }
-
-
+    // 【授权记录相关】
     public MerchantAuthorizationRecordsVo getAuthorizationRecordsVoByAuthorizationRecordId(String authorizationRecordId) {
-        return mongoTemplate.findOne(Query.query(Criteria.where("authorizationRecordId").is(authorizationRecordId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("authorizationRecordId").is(authorizationRecordId).and("deletedAt").is(null));
+        return mongoTemplate.findOne(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 
     public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsVosByUid(String uid, String performanceId) {
-        return mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("uid").is(uid).and("performanceId").is(performanceId).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 
     public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsCheckersVosByCuid(String cuid, String performanceId) {
-        return mongoTemplate.find(Query.query(Criteria.where("uidRole").is(MerchantAuthorizationConst.PerformanceRole.CHECKER.getRole()).and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null)), MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
+        Query query = Query.query(Criteria.where("uidRole").is(MerchantAuthorizationConst.PerformanceRole.CHECKER.getRole()).and("cuid").is(cuid).and("performanceId").is(performanceId).and("deletedAt").is(null));
+        return mongoTemplate.find(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
     }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/MerchantRdmService.java

@@ -84,6 +84,10 @@ public class MerchantRdmService {
         long s = System.currentTimeMillis();
         List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>)redisUtil.get(key);
         log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
+        if (null == vos) {
+            vos = merchantMongoService.getFieldCheckersVosByFieldId(fieldId);
+            redisUtil.set(key, vos);
+        }
         return vos;
     }
 
@@ -126,6 +130,7 @@ public class MerchantRdmService {
         return redisUtil.set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
     }
 
+
     // 【主办申请】我的列表
     public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
         if (null == uid || uid.isEmpty()) {

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/MerchantFieldsServiceImpl.java

@@ -146,7 +146,6 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         this.checkFieldAccount(cuid, fieldId);
 
         List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId);
-
         if (!CollectionUtil.isEmpty(fieldCheckersVos)) {
             for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) {
                 if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) {
@@ -194,6 +193,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         merchantRdmService.addFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
+        // 场地默认验票员 mongo
+        s = System.currentTimeMillis();
+        merchantMongoService.addFieldCheckersVo(fieldCheckersVo);
+        log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
+
         // 场地默认验票员 sql
         LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> fieldCheckerInsertObjs = CollectionUtil.linkedListObjectArr();
@@ -245,6 +249,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
         merchantRdmService.delFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
+        // 场地默认验票员 mongo
+        s = System.currentTimeMillis();
+        merchantMongoService.delFieldCheckersVoByFieldCheckerId(fieldCheckersVo.getFieldCheckerId());
+        log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
+
         // 场地默认验票员 sql
         LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> fieldCheckerUpdateObjs = CollectionUtil.linkedListObjectArr();