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

Commit 7b2f5e84 authored by 张国柄's avatar 张国柄

fix:去除MONGO,入场人、收获地址添加不了;

parent 0fdf2daf
...@@ -87,9 +87,11 @@ public class AdamEntersController { ...@@ -87,9 +87,11 @@ public class AdamEntersController {
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid()); List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid());
Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny(); if (!CollectionUtils.isEmpty(vos)) {
if (any.isPresent()) { Optional<AdamEntersVo> any = vos.stream().filter(r -> (r.getIdCard().equals(parameter.getIdCard())) && r.getType().equals(parameter.getType())).findAny();
return ResponseDto.failure(ErrorMapping.get("10019")); if (any.isPresent()) {
return ResponseDto.failure(ErrorMapping.get("10019"));
}
} }
String entersId = adamEntersService.add(parameter); String entersId = adamEntersService.add(parameter);
......
...@@ -525,7 +525,7 @@ public class AdamRdmService { ...@@ -525,7 +525,7 @@ public class AdamRdmService {
redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode)); redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode));
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE + STATE> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */
public boolean setMemberCodeByBuyOrderNo(String buyOrderNo, String memberCode) { public boolean setMemberCodeByBuyOrderNo(String buyOrderNo, String memberCode) {
return redisUtil.set(buyOrderNo, memberCode); return redisUtil.set(buyOrderNo, memberCode);
...@@ -549,7 +549,10 @@ public class AdamRdmService { ...@@ -549,7 +549,10 @@ public class AdamRdmService {
// ); // );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
// return vo; // return vo;
return this.getMemberCodeVoByCode(this.getMemberCodeByBuyOrderNo(buyOrderNo)); // TODO: 2021/7/30 存在购买会员兑换码功能时,按需调整
AdamMemberCodeVo vo = AdamMemberCodeVo.getNew();
vo.setCode(this.getMemberCodeByBuyOrderNo(buyOrderNo));
return vo;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | TAGS:List<AdamTagVo> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | TAGS:List<AdamTagVo> */
......
...@@ -51,7 +51,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -51,7 +51,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
AdamAddressesVo vo = AdamAddressesVo.getNew(); AdamAddressesVo vo = AdamAddressesVo.getNew();
BeanUtils.copyProperties(parameter, vo); BeanUtils.copyProperties(parameter, vo);
vo.setAddressesId(String.valueOf(IDGenerator.nextSnowId())); vo.setAddressesId(IDGenerator.nextSnowId());
vo.setUid(currentUid); vo.setUid(currentUid);
vo.setIsDefault(CollectionUtils.isEmpty(vos)); vo.setIsDefault(CollectionUtils.isEmpty(vos));
vo.setState(1); vo.setState(1);
...@@ -62,7 +62,9 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -62,7 +62,9 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.delAddressesVoByUid(currentUid); // adamRdmService.delAddressesVoByUid(currentUid);
vos.add(vo);
adamRdmService.setAddressesVoByUid(currentUid, vos);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
......
...@@ -56,6 +56,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -56,6 +56,8 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
if (1 == parameter.getType()) { if (1 == parameter.getType()) {
if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) { if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
identityHandler(currentUid, parameter.getName(), parameter.getIdCard()); identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
} }
} }
...@@ -64,7 +66,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -64,7 +66,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
AdamEntersVo vo = AdamEntersVo.getNew(); AdamEntersVo vo = AdamEntersVo.getNew();
BeanUtils.copyProperties(parameter, vo); BeanUtils.copyProperties(parameter, vo);
vo.setEntersId(String.valueOf(IDGenerator.nextSnowId())); vo.setEntersId(IDGenerator.nextSnowId());
vo.setUid(currentUid); vo.setUid(currentUid);
vo.setIsDefault(CollectionUtils.isEmpty(vos)); vo.setIsDefault(CollectionUtils.isEmpty(vos));
vo.setState(1); vo.setState(1);
...@@ -75,10 +77,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -75,10 +77,9 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.delEntersVoByUid(currentUid); // adamRdmService.delEntersVoByUid(currentUid);
if (1 == parameter.getType()) { vos.add(vo);
adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName()); adamRdmService.setEntersVoByUid(currentUid, vos);
}
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
......
...@@ -404,6 +404,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -404,6 +404,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102"); ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage()); throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
} }
adamRdmService.setCertification(1, idCard, name);
} }
AdamRealName realName = new AdamRealName(); AdamRealName realName = new AdamRealName();
...@@ -425,7 +426,6 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -425,7 +426,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.setRealInfoVoByUid(uid, vo); adamRdmService.setRealInfoVoByUid(uid, vo);
adamRdmService.setCertification(1, idCard, name);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
// } // }
// RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid); // RedisLockUtil.unlock(AdamRedisConst.LOCK_KEY_UIDENTITY + uid);
......
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