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

Skip to content

L
liquidnet-bus-v1
Commit 6a1fa1e5 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parents 6dfb820a c8ac7205
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 53 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/merchant/utils/MerchantMongoUtil.java
View file @ 6a1fa1e5
...@@ -23,8 +23,10 @@ public class MerchantMongoUtil { ...@@ -23,8 +23,10 @@ public class MerchantMongoUtil {
private MongoConverter mongoConverter; private MongoConverter mongoConverter;
// 【场地相关】
public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) { 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) { public void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
...@@ -34,8 +36,10 @@ public class MerchantMongoUtil { ...@@ -34,8 +36,10 @@ public class MerchantMongoUtil {
mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName()); mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
} }
// 【主办相关】
public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) { 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) { public void setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
...@@ -45,9 +49,56 @@ public class MerchantMongoUtil { ...@@ -45,9 +49,56 @@ public class MerchantMongoUtil {
mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName()); 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) { 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) { public MerchantAuthorizationPerformanceVo getAndSyncAuthorizationPerformanceVo(String performanceId, String uid) {
...@@ -78,15 +129,15 @@ public class MerchantMongoUtil { ...@@ -78,15 +129,15 @@ public class MerchantMongoUtil {
return vo; return vo;
} }
// 【授权记录相关】
public List<MerchantFieldAppliesVo> getFieldAppliesVosByUid(String uid) { public MerchantAuthorizationRecordsVo getAuthorizationRecordsVoByAuthorizationRecordId(String authorizationRecordId) {
Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)); Query query = Query.query(Criteria.where("authorizationRecordId").is(authorizationRecordId).and("deletedAt").is(null));
return mongoTemplate.find(query, MerchantFieldAppliesVo.class, MerchantFieldAppliesVo.class.getSimpleName()); return mongoTemplate.findOne(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
} }
public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) { public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsVosByUid(String uid, String performanceId) {
Query query = Query.query(Criteria.where("uid").is(uid).and("deletedAt").is(null)); Query query = Query.query(Criteria.where("uid").is(uid).and("performanceId").is(performanceId).and("deletedAt").is(null));
return mongoTemplate.find(query, MerchantSponsorAppliesVo.class, MerchantSponsorAppliesVo.class.getSimpleName()); return mongoTemplate.find(query, MerchantAuthorizationRecordsVo.class, MerchantAuthorizationRecordsVo.class.getSimpleName());
} }
public List<MerchantAuthorizationRecordsVo> getAuthorizationRecordsCheckersVosByCuid(String cuid, String performanceId) { 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
View file @ 6a1fa1e5
...@@ -104,6 +104,10 @@ public class MerchantRedisUtil { ...@@ -104,6 +104,10 @@ public class MerchantRedisUtil {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>) redisDataSourceUtil.getRedisKylinUtil().get(key); List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>) redisDataSourceUtil.getRedisKylinUtil().get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = merchantMongoUtil.getFieldCheckersVosByFieldId(fieldId);
redisDataSourceUtil.getRedisKylinUtil().set(key, vos);
}
return vos; return vos;
} }
...@@ -125,6 +129,7 @@ public class MerchantRedisUtil { ...@@ -125,6 +129,7 @@ public class MerchantRedisUtil {
return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos); return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_CHECKERS.concat(fieldId), vos);
} }
// 【主办】详情 // 【主办】详情
public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) { public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) {
if (null == sponsorId || sponsorId.isEmpty()) { if (null == sponsorId || sponsorId.isEmpty()) {
...@@ -146,6 +151,7 @@ public class MerchantRedisUtil { ...@@ -146,6 +151,7 @@ public class MerchantRedisUtil {
return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo); return redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
} }
// 【主办申请】我的列表 // 【主办申请】我的列表
public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) { public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
if (null == uid || uid.isEmpty()) { 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
View file @ 6a1fa1e5
...@@ -23,8 +23,10 @@ public class MerchantMongoService { ...@@ -23,8 +23,10 @@ public class MerchantMongoService {
MongoConverter mongoConverter; MongoConverter mongoConverter;
// 【场地相关】
public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) { 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) { public void setFieldsVoByFieldId(String fieldId, MerchantFieldsVo vo) {
...@@ -34,9 +36,10 @@ public class MerchantMongoService { ...@@ -34,9 +36,10 @@ public class MerchantMongoService {
mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName()); mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
} }
// 【主办相关】
public MerchantSponsorsVo getSponsorsVoBySponsorId(String sponsorId) { 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) { public void setSponsorsVoBySponsorId(String sponsorId, MerchantSponsorsVo vo) {
...@@ -46,9 +49,56 @@ public class MerchantMongoService { ...@@ -46,9 +49,56 @@ public class MerchantMongoService {
mongoTemplate.upsert(query, update, MerchantSponsorsVo.class, MerchantSponsorsVo.class.getSimpleName()); 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) { 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) { public MerchantAuthorizationPerformanceVo getAndSyncAuthorizationPerformanceVo(String performanceId, String uid) {
...@@ -79,44 +129,19 @@ public class MerchantMongoService { ...@@ -79,44 +129,19 @@ public class MerchantMongoService {
return vo; 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) { 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) { 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) { 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
View file @ 6a1fa1e5
...@@ -84,6 +84,10 @@ public class MerchantRdmService { ...@@ -84,6 +84,10 @@ public class MerchantRdmService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>)redisUtil.get(key); List<MerchantFieldCheckersVo> vos = (List<MerchantFieldCheckersVo>)redisUtil.get(key);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
if (null == vos) {
vos = merchantMongoService.getFieldCheckersVosByFieldId(fieldId);
redisUtil.set(key, vos);
}
return vos; return vos;
} }
...@@ -126,6 +130,7 @@ public class MerchantRdmService { ...@@ -126,6 +130,7 @@ public class MerchantRdmService {
return redisUtil.set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo); return redisUtil.set(MerchantRedisConst.INFO_SPONSOR.concat(sponsorId), vo);
} }
// 【主办申请】我的列表 // 【主办申请】我的列表
public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) { public List<MerchantSponsorAppliesVo> getSponsorAppliesVosByUid(String uid) {
if (null == uid || uid.isEmpty()) { 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
View file @ 6a1fa1e5
...@@ -118,7 +118,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -118,7 +118,7 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
// 场地 mongo // 场地 mongo
s = System.currentTimeMillis(); s = System.currentTimeMillis();
Query query = Query.query(Criteria.where("fieldId").is(fieldsVo.getFieldId())); Query query = Query.query(Criteria.where("fieldId").is(fieldsVo.getFieldId()));
Update update = Update.update("isCheck", fieldsVo.getIsCheck()).set("updateAt", fieldsVo.getUpdatedAt()); Update update = Update.update("isCheck", fieldsVo.getIsCheck()).set("updatedAt", fieldsVo.getUpdatedAt());
mongoTemplate.updateFirst(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName()); mongoTemplate.updateFirst(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s); log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
...@@ -146,7 +146,6 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -146,7 +146,6 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
this.checkFieldAccount(cuid, fieldId); this.checkFieldAccount(cuid, fieldId);
List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId); List<MerchantFieldCheckersVo> fieldCheckersVos = merchantRdmService.getFieldCheckersVosByFieldId(fieldId);
if (!CollectionUtil.isEmpty(fieldCheckersVos)) { if (!CollectionUtil.isEmpty(fieldCheckersVos)) {
for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) { for (MerchantFieldCheckersVo checkersVo : fieldCheckersVos) {
if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) { if (null != checkersVo.getMobile() && checkersVo.getMobile().length() > 4) {
...@@ -194,6 +193,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -194,6 +193,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
merchantRdmService.addFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo); merchantRdmService.addFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 mongo
s = System.currentTimeMillis();
merchantMongoService.addFieldCheckersVo(fieldCheckersVo);
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 sql // 场地默认验票员 sql
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> fieldCheckerInsertObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> fieldCheckerInsertObjs = CollectionUtil.linkedListObjectArr();
...@@ -245,6 +249,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService { ...@@ -245,6 +249,11 @@ public class MerchantFieldsServiceImpl implements IMerchantFieldsService {
merchantRdmService.delFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo); merchantRdmService.delFieldCheckersVoByFieldId(fieldId, fieldCheckersVos, fieldCheckersVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 mongo
s = System.currentTimeMillis();
merchantMongoService.delFieldCheckersVoByFieldCheckerId(fieldCheckersVo.getFieldCheckerId());
log.debug("#MONGO耗时:{}ms", System.currentTimeMillis() - s);
// 场地默认验票员 sql // 场地默认验票员 sql
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> fieldCheckerUpdateObjs = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> fieldCheckerUpdateObjs = CollectionUtil.linkedListObjectArr();
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties
View file @ 6a1fa1e5
...@@ -4,18 +4,18 @@ merchant_fields.update_is_check=UPDATE merchant_fields SET is_check = ?, updated ...@@ -4,18 +4,18 @@ merchant_fields.update_is_check=UPDATE merchant_fields SET is_check = ?, updated
merchant_fields.update_base_info=UPDATE merchant_fields SET name = ?, logo = ?, background = ?, description = ?, built_date = ?, province_id = ?, province_name = ?, city_id = ?, city_name = ?, district_id = ?, district_name = ?, address = ?, longitude = ?, latitude = ?, contact_name = ?, contact_email = ?, updated_at = ? WHERE field_id = ? merchant_fields.update_base_info=UPDATE merchant_fields SET name = ?, logo = ?, background = ?, description = ?, built_date = ?, province_id = ?, province_name = ?, city_id = ?, city_name = ?, district_id = ?, district_name = ?, address = ?, longitude = ?, latitude = ?, contact_name = ?, contact_email = ?, updated_at = ? WHERE field_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_field_applies.insert=INSERT INTO merchant_field_applies (field_apply_id, apply_status, apply_type, reject, uid, field_id, name, logo, background, description, built_date, province_id, province_name, city_id, city_name, district_id, district_name, address, longitude, latitude, contact_name, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) merchant_field_applies.insert=INSERT INTO merchant_field_applies (field_apply_id, apply_status, apply_type, reject, uid, field_id, name, logo, background, description, built_date, province_id, province_name, city_id, city_name, district_id, district_name, address, longitude, latitude, contact_name, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_field_applies.update=UPDATE merchant_field_applies SET updated_at = ?, delete_at = ? WHERE field_apply_id = ? merchant_field_applies.update=UPDATE merchant_field_applies SET updated_at = ?, deleted_at = ? WHERE field_apply_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_field_checkers.insert=INSERT INTO merchant_field_checkers (field_checker_id, field_id, uid, mobile, name, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?) merchant_field_checkers.insert=INSERT INTO merchant_field_checkers (field_checker_id, field_id, uid, mobile, name, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?)
merchant_field_checkers.update=UPDATE merchant_field_checkers SET cuid = ?, updated_at = ?, delete_at = ? WHERE field_checker_id = ? merchant_field_checkers.update=UPDATE merchant_field_checkers SET cuid = ?, updated_at = ?, deleted_at = ? WHERE field_checker_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_sponsors.update_base_info=UPDATE merchant_sponsors SET name = ?, logo = ?, background = ?, description = ?, contact_email = ?, updated_at = ? WHERE sponsor_id = ? merchant_sponsors.update_base_info=UPDATE merchant_sponsors SET name = ?, logo = ?, background = ?, description = ?, contact_email = ?, updated_at = ? WHERE sponsor_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_sponsor_applies.insert=INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) merchant_sponsor_applies.insert=INSERT INTO merchant_sponsor_applies (sponsor_apply_id, apply_status, apply_type, reject, uid, name, logo, background, description, contact_name, contact_identity, contact_identity_obverse, contact_identity_reverse, contact_email, company_name, license_code, license_img, legal_name, legal_identity, legal_identity_obverse, legal_identity_reverse, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_sponsor_applies.update=UPDATE merchant_sponsor_applies SET updated_at = ?, delete_at = ? WHERE sponsor_apply_id = ? merchant_sponsor_applies.update=UPDATE merchant_sponsor_applies SET updated_at = ?, deleted_at = ? WHERE sponsor_apply_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_authorization_records.insert=INSERT INTO merchant_authorization_records (authorization_record_id, performance_id, uid_role, uid, mobile, name, cuid_role, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?) merchant_authorization_records.insert=INSERT INTO merchant_authorization_records (authorization_record_id, performance_id, uid_role, uid, mobile, name, cuid_role, cuid, created_at) VALUE (?, ?, ?, ?, ?, ?, ?, ?, ?)
merchant_authorization_records.update=UPDATE merchant_authorization_records SET updated_at = ?, delete_at = ? WHERE authorization_record_id = ? merchant_authorization_records.update=UPDATE merchant_authorization_records SET updated_at = ?, deleted_at = ? WHERE authorization_record_id = ?
# --------------------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------------------
merchant_authorization_permissions.insert=INSERT INTO merchant_authorization_permissions (authorization_permission_id, authorization_record_id, permission_id, start_time, end_time, created_at) VALUE (?, ?, ?, ?, ?, ?) merchant_authorization_permissions.insert=INSERT INTO merchant_authorization_permissions (authorization_permission_id, authorization_record_id, permission_id, start_time, end_time, created_at) VALUE (?, ?, ?, ?, ?, ?)
...@@ -37,7 +37,7 @@ kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ? ...@@ -37,7 +37,7 @@ kylin_performances_status.onLine=UPDATE kylin_performance_status SET status = ?
kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_ticket_status.update_status=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_ticket_status.onLine=UPDATE kylin_ticket_status SET status = ?, updated_at = ? WHERE ticket_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 场地审核演出 ---- # ---- 场地审核演出 ----
kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , audit_status = ? , reject_txt = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_performance_status.fieldsStatus = UPDATE kylin_performance_status SET field_audit_status = ? , audit_status = ? , reject_txt = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
# ---- 演出第二步骤操作 ---- # ---- 演出第二步骤操作 ----
kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_performance.updateStep2=UPDATE kylin_performances SET audit_time = ? , notice_image = ? WHERE performances_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_performance_status.updateStep2=UPDATE kylin_performance_status SET field_audit_status = ? ,audit_status = ? , is_true_name = ? , limit_count = ? WHERE performance_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
......
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