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

Skip to content

L
liquidnet-bus-v1
Commit 2a7b5cdb authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents 52cb493f 2b8a481e
Hide whitespace changes
Inline Side-by-side
Showing with 352 additions and 333 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java
View file @ 2a7b5cdb
...@@ -31,6 +31,8 @@ public class AdamRedisConst { ...@@ -31,6 +31,8 @@ public class AdamRedisConst {
public static final String INFO_MEMBER_RIGHTS = INFO.concat("member:rights:"); public static final String INFO_MEMBER_RIGHTS = INFO.concat("member:rights:");
public static final String INFO_MEMBER_AGREEMENT = INFO.concat("member:agreement"); public static final String INFO_MEMBER_AGREEMENT = INFO.concat("member:agreement");
public static final String INFO_MEMBER_CODE = INFO.concat("member:code:"); public static final String INFO_MEMBER_CODE = INFO.concat("member:code:");
public static final String INFO_MEMBER_ORDER = INFO.concat("morder:");
public static final String INFO_BUY_MEMBER_ORDER_CODE = INFO.concat("mordercode:");
public static final String INFO_LIBRARY_NKNAME = INFO.concat("library:nkname"); public static final String INFO_LIBRARY_NKNAME = INFO.concat("library:nkname");
......
liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java
View file @ 2a7b5cdb
...@@ -45,8 +45,6 @@ public final class RedisUtil { ...@@ -45,8 +45,6 @@ public final class RedisUtil {
public boolean expire(String key, long time) { public boolean expire(String key, long time) {
try {
if (time > 0) { if (time > 0) {
redisTemplate.expire(key, time, TimeUnit.SECONDS); redisTemplate.expire(key, time, TimeUnit.SECONDS);
...@@ -55,14 +53,6 @@ public final class RedisUtil { ...@@ -55,14 +53,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -95,18 +85,8 @@ public final class RedisUtil { ...@@ -95,18 +85,8 @@ public final class RedisUtil {
public boolean hasKey(String key) { public boolean hasKey(String key) {
try {
return redisTemplate.hasKey(key); return redisTemplate.hasKey(key);
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
/** /**
...@@ -187,19 +167,11 @@ public final class RedisUtil { ...@@ -187,19 +167,11 @@ public final class RedisUtil {
public boolean set(String key, Object value) { public boolean set(String key, Object value) {
try {
redisTemplate.opsForValue().set(key, value); redisTemplate.opsForValue().set(key, value);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -221,7 +193,6 @@ public final class RedisUtil { ...@@ -221,7 +193,6 @@ public final class RedisUtil {
public boolean set(String key, Object value, long time) { public boolean set(String key, Object value, long time) {
try {
if (time > 0) { if (time > 0) {
...@@ -235,13 +206,6 @@ public final class RedisUtil { ...@@ -235,13 +206,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -350,19 +314,11 @@ public final class RedisUtil { ...@@ -350,19 +314,11 @@ public final class RedisUtil {
public boolean hmset(String key, Map<String, Object> map) { public boolean hmset(String key, Map<String, Object> map) {
try {
redisTemplate.opsForHash().putAll(key, map); redisTemplate.opsForHash().putAll(key, map);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -383,7 +339,6 @@ public final class RedisUtil { ...@@ -383,7 +339,6 @@ public final class RedisUtil {
public boolean hmset(String key, Map<String, Object> map, long time) { public boolean hmset(String key, Map<String, Object> map, long time) {
try {
redisTemplate.opsForHash().putAll(key, map); redisTemplate.opsForHash().putAll(key, map);
...@@ -395,13 +350,6 @@ public final class RedisUtil { ...@@ -395,13 +350,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -422,19 +370,11 @@ public final class RedisUtil { ...@@ -422,19 +370,11 @@ public final class RedisUtil {
public boolean hset(String key, String item, Object value) { public boolean hset(String key, String item, Object value) {
try {
redisTemplate.opsForHash().put(key, item, value); redisTemplate.opsForHash().put(key, item, value);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -457,7 +397,6 @@ public final class RedisUtil { ...@@ -457,7 +397,6 @@ public final class RedisUtil {
public boolean hset(String key, String item, Object value, long time) { public boolean hset(String key, String item, Object value, long time) {
try {
redisTemplate.opsForHash().put(key, item, value); redisTemplate.opsForHash().put(key, item, value);
...@@ -469,13 +408,6 @@ public final class RedisUtil { ...@@ -469,13 +408,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -572,17 +504,9 @@ public final class RedisUtil { ...@@ -572,17 +504,9 @@ public final class RedisUtil {
public Set<Object> sGet(String key) { public Set<Object> sGet(String key) {
try {
return redisTemplate.opsForSet().members(key); return redisTemplate.opsForSet().members(key);
} catch (Exception e) {
e.printStackTrace();
return null;
}
} }
...@@ -601,17 +525,9 @@ public final class RedisUtil { ...@@ -601,17 +525,9 @@ public final class RedisUtil {
public boolean sHasKey(String key, Object value) { public boolean sHasKey(String key, Object value) {
try {
return redisTemplate.opsForSet().isMember(key, value); return redisTemplate.opsForSet().isMember(key, value);
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -630,17 +546,9 @@ public final class RedisUtil { ...@@ -630,17 +546,9 @@ public final class RedisUtil {
public long sSet(String key, Object... values) { public long sSet(String key, Object... values) {
try {
return redisTemplate.opsForSet().add(key, values); return redisTemplate.opsForSet().add(key, values);
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
...@@ -661,7 +569,6 @@ public final class RedisUtil { ...@@ -661,7 +569,6 @@ public final class RedisUtil {
public long sSetAndTime(String key, long time, Object... values) { public long sSetAndTime(String key, long time, Object... values) {
try {
Long count = redisTemplate.opsForSet().add(key, values); Long count = redisTemplate.opsForSet().add(key, values);
...@@ -671,13 +578,6 @@ public final class RedisUtil { ...@@ -671,13 +578,6 @@ public final class RedisUtil {
return count; return count;
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
...@@ -694,17 +594,9 @@ public final class RedisUtil { ...@@ -694,17 +594,9 @@ public final class RedisUtil {
public long sGetSetSize(String key) { public long sGetSetSize(String key) {
try {
return redisTemplate.opsForSet().size(key); return redisTemplate.opsForSet().size(key);
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
...@@ -723,19 +615,11 @@ public final class RedisUtil { ...@@ -723,19 +615,11 @@ public final class RedisUtil {
public long setRemove(String key, Object... values) { public long setRemove(String key, Object... values) {
try {
Long count = redisTemplate.opsForSet().remove(key, values); Long count = redisTemplate.opsForSet().remove(key, values);
return count; return count;
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
...@@ -758,17 +642,9 @@ public final class RedisUtil { ...@@ -758,17 +642,9 @@ public final class RedisUtil {
public List<Object> lGet(String key, long start, long end) { public List<Object> lGet(String key, long start, long end) {
try {
return redisTemplate.opsForList().range(key, start, end); return redisTemplate.opsForList().range(key, start, end);
} catch (Exception e) {
e.printStackTrace();
return null;
}
} }
...@@ -785,17 +661,9 @@ public final class RedisUtil { ...@@ -785,17 +661,9 @@ public final class RedisUtil {
public long lGetListSize(String key) { public long lGetListSize(String key) {
try {
return redisTemplate.opsForList().size(key); return redisTemplate.opsForList().size(key);
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
...@@ -814,17 +682,9 @@ public final class RedisUtil { ...@@ -814,17 +682,9 @@ public final class RedisUtil {
public Object lGetIndex(String key, long index) { public Object lGetIndex(String key, long index) {
try {
return redisTemplate.opsForList().index(key, index); return redisTemplate.opsForList().index(key, index);
} catch (Exception e) {
e.printStackTrace();
return null;
}
} }
...@@ -837,19 +697,11 @@ public final class RedisUtil { ...@@ -837,19 +697,11 @@ public final class RedisUtil {
*/ */
public boolean lSet(String key, Object value) { public boolean lSet(String key, Object value) {
try {
redisTemplate.opsForList().rightPush(key, value); redisTemplate.opsForList().rightPush(key, value);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -870,7 +722,6 @@ public final class RedisUtil { ...@@ -870,7 +722,6 @@ public final class RedisUtil {
public boolean lSet(String key, Object value, long time) { public boolean lSet(String key, Object value, long time) {
try {
redisTemplate.opsForList().rightPush(key, value); redisTemplate.opsForList().rightPush(key, value);
...@@ -880,13 +731,6 @@ public final class RedisUtil { ...@@ -880,13 +731,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -899,19 +743,11 @@ public final class RedisUtil { ...@@ -899,19 +743,11 @@ public final class RedisUtil {
*/ */
public boolean lSet(String key, List<Object> value) { public boolean lSet(String key, List<Object> value) {
try {
redisTemplate.opsForList().rightPushAll(key, value); redisTemplate.opsForList().rightPushAll(key, value);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -934,7 +770,6 @@ public final class RedisUtil { ...@@ -934,7 +770,6 @@ public final class RedisUtil {
public boolean lSet(String key, List<Object> value, long time) { public boolean lSet(String key, List<Object> value, long time) {
try {
redisTemplate.opsForList().rightPushAll(key, value); redisTemplate.opsForList().rightPushAll(key, value);
...@@ -944,13 +779,6 @@ public final class RedisUtil { ...@@ -944,13 +779,6 @@ public final class RedisUtil {
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -971,19 +799,11 @@ public final class RedisUtil { ...@@ -971,19 +799,11 @@ public final class RedisUtil {
public boolean lUpdateIndex(String key, long index, Object value) { public boolean lUpdateIndex(String key, long index, Object value) {
try {
redisTemplate.opsForList().set(key, index, value); redisTemplate.opsForList().set(key, index, value);
return true; return true;
} catch (Exception e) {
e.printStackTrace();
return false;
}
} }
...@@ -1004,19 +824,11 @@ public final class RedisUtil { ...@@ -1004,19 +824,11 @@ public final class RedisUtil {
public long lRemove(String key, long count, Object value) { public long lRemove(String key, long count, Object value) {
try {
Long remove = redisTemplate.opsForList().remove(key, count, value); Long remove = redisTemplate.opsForList().remove(key, count, value);
return remove; return remove;
} catch (Exception e) {
e.printStackTrace();
return 0;
}
} }
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @ 2a7b5cdb
...@@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils; ...@@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Slf4j @Slf4j
...@@ -51,7 +48,7 @@ public class AdamRdmService { ...@@ -51,7 +48,7 @@ public class AdamRdmService {
public boolean setSmsCodeByMobile(String mobile, String smsCode) { public boolean setSmsCodeByMobile(String mobile, String smsCode) {
// TODO: 2021/7/29 改为1分钟 // TODO: 2021/7/29 改为1分钟
return redisUtil.set(AdamRedisConst.VALID_SMS_CODE_MOBILE + mobile, smsCode, 1 * 60); return redisUtil.set(AdamRedisConst.VALID_SMS_CODE_MOBILE + mobile, smsCode, 60);
} }
public String getSmsCodeByMobile(String mobile) { public String getSmsCodeByMobile(String mobile) {
...@@ -240,6 +237,23 @@ public class AdamRdmService { ...@@ -240,6 +237,23 @@ public class AdamRdmService {
return vos; return vos;
} }
public boolean addEntersVoByUid(String uid, List<AdamEntersVo> vos, AdamEntersVo vo) {
if (CollectionUtils.isEmpty(vos)) {
vos = Collections.singletonList(vo);
} else {
vos.add(vo);
}
return redisUtil.set(AdamRedisConst.INFO_ENTERS + uid, vos);
}
public boolean rmvEntersVoByUid(String uid, List<AdamEntersVo> vos, String entersId) {
if (CollectionUtils.isEmpty(vos)) {
return true;
}
vos.removeIf(r -> r.getEntersId().equals(entersId));
return redisUtil.set(AdamRedisConst.INFO_ENTERS + uid, vos);
}
public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) { public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
} }
...@@ -281,6 +295,23 @@ public class AdamRdmService { ...@@ -281,6 +295,23 @@ public class AdamRdmService {
return vos; return vos;
} }
public boolean addAddressesVoByUid(String uid, List<AdamAddressesVo> vos, AdamAddressesVo vo) {
if (CollectionUtils.isEmpty(vos)) {
vos = Collections.singletonList(vo);
} else {
vos.add(vo);
}
return redisUtil.set(AdamRedisConst.INFO_ADDRESSES + uid, vos);
}
public boolean rmvAddressesVoByUid(String uid, List<AdamAddressesVo> vos, String addressesId) {
if (CollectionUtils.isEmpty(vos)) {
return true;
}
vos.removeIf(r -> r.getAddressesId().equals(addressesId));
return redisUtil.set(AdamRedisConst.INFO_ADDRESSES + uid, vos);
}
public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) { public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
} }
...@@ -455,6 +486,40 @@ public class AdamRdmService { ...@@ -455,6 +486,40 @@ public class AdamRdmService {
return val; return val;
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, MEMBER_ORDER_LIST(SUCC)> */
public boolean setMemberOrderVosByUid(String uid, List<AdamMemberOrderVo> vos) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
}
public ArrayList<AdamMemberOrderVo> getMemberOrderVosByUid(String uid) {
long s = System.currentTimeMillis();
ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_ORDER + uid);
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vos;
}
public boolean addMemberOrderVoByUid(String uid, List<AdamMemberOrderVo> vos, AdamMemberOrderVo vo) {
if (CollectionUtils.isEmpty(vos)) {
vos = Collections.singletonList(vo);
} else {
vos.add(vo);
}
return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
}
public boolean rmvMemberOrderVoByUid(String uid, List<AdamMemberOrderVo> vos, String orderNo) {
if (CollectionUtils.isEmpty(vos)) {
return true;
}
vos.removeIf(r -> r.getOrderNo().equals(orderNo));
return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
}
public void delMemberOrderVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER + uid);
}
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ORDER_NO, MEMBER_ORDER_INFO> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ORDER_NO, MEMBER_ORDER_INFO> */
public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) { public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) {
...@@ -528,11 +593,15 @@ public class AdamRdmService { ...@@ -528,11 +593,15 @@ public class AdamRdmService {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <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(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo, memberCode);
} }
public String getMemberCodeByBuyOrderNo(String buyOrderNo) { public String getMemberCodeByBuyOrderNo(String buyOrderNo) {
return (String) redisUtil.get(buyOrderNo); return (String) redisUtil.get(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
}
public void delMemberCodeByBuyOrderNo(String buyOrderNo) {
redisUtil.del(AdamRedisConst.INFO_BUY_MEMBER_ORDER_CODE + buyOrderNo);
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | */
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @ 2a7b5cdb
...@@ -63,8 +63,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -63,8 +63,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
// adamRdmService.delAddressesVoByUid(currentUid); // adamRdmService.delAddressesVoByUid(currentUid);
vos.add(vo); adamRdmService.addAddressesVoByUid(currentUid, vos, 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();
...@@ -201,13 +200,14 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -201,13 +200,14 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
// Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName() // Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
// ); // );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid); // List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
vos.removeIf(r -> r.getAddressesId().equals(addressesId)); // vos.removeIf(r -> r.getAddressesId().equals(addressesId));
long s = System.currentTimeMillis(); // s = System.currentTimeMillis();
adamRdmService.setAddressesVoByUid(uid, vos); // adamRdmService.setAddressesVoByUid(uid, vos);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
adamRdmService.rmvAddressesVoByUid(uid, adamRdmService.getAddressesVoByUid(uid), addressesId);
s = System.currentTimeMillis(); long s = System.currentTimeMillis();
queueUtils.sendMsgByRedis( queueUtils.sendMsgByRedis(
MQConst.AdamQueue.SQL_UCENTER.getKey(), MQConst.AdamQueue.SQL_UCENTER.getKey(),
SqlMapping.get("adam_addresses.remove", now, now, addressesId) SqlMapping.get("adam_addresses.remove", now, now, addressesId)
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @ 2a7b5cdb
...@@ -78,8 +78,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -78,8 +78,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
// adamRdmService.delEntersVoByUid(currentUid); // adamRdmService.delEntersVoByUid(currentUid);
vos.add(vo); adamRdmService.addEntersVoByUid(currentUid, vos, vo);
adamRdmService.setEntersVoByUid(currentUid, vos);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
...@@ -220,13 +219,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -220,13 +219,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
// Query.query(Criteria.where("uid").is(currentUid).and("entersId").is(entersId)), AdamEntersVo.class.getSimpleName() // Query.query(Criteria.where("uid").is(currentUid).and("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
// ); // );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid); // List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
vos.removeIf(r -> r.getEntersId().equals(entersId)); // vos.removeIf(r -> r.getEntersId().equals(entersId));
long s = System.currentTimeMillis(); // s = System.currentTimeMillis();
adamRdmService.setEntersVoByUid(uid, vos); // adamRdmService.setEntersVoByUid(uid, vos);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); // log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
adamRdmService.rmvEntersVoByUid(uid, adamRdmService.getEntersVoByUid(uid), entersId);
s = System.currentTimeMillis(); long s = System.currentTimeMillis();
queueUtils.sendMsgByRedis( queueUtils.sendMsgByRedis(
MQConst.AdamQueue.SQL_UCENTER.getKey(), MQConst.AdamQueue.SQL_UCENTER.getKey(),
SqlMapping.get("adam_enters.remove", now, now, entersId) SqlMapping.get("adam_enters.remove", now, now, entersId)
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 2a7b5cdb
...@@ -29,6 +29,7 @@ import java.math.BigDecimal; ...@@ -29,6 +29,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
@Slf4j @Slf4j
@Service @Service
...@@ -167,20 +168,20 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -167,20 +168,20 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
@Override @Override
public ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter) { public ResponseDto<Object> paymentNotifyCallBack(AdamMemberOrderCallbackParam parameter) {
AdamMemberOrderVo handleMemberOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(parameter.getOrderCode()); final AdamMemberOrderVo shotMemberOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(parameter.getOrderCode());
if (null == handleMemberOrderVo) { if (null == shotMemberOrderVo) {
return ResponseDto.failure(ErrorMapping.get("10501"), parameter); return ResponseDto.failure(ErrorMapping.get("10501"), parameter);
} }
// AdamMemberConst.STATUS_*:0-待支付,1-已支付,2-已过期,3-超时付,4-退款中,5-退款完成 // AdamMemberConst.STATUS_*:0-待支付,1-已支付,2-已过期,3-超时付,4-退款中,5-退款完成
if (1 == handleMemberOrderVo.getState() || 3 == handleMemberOrderVo.getState()) { if (1 == shotMemberOrderVo.getState() || 3 == shotMemberOrderVo.getState()) {
return ResponseDto.failure(ErrorMapping.get("10502"), parameter); return ResponseDto.failure(ErrorMapping.get("10502"), parameter);
} }
if (parameter.getPrice().compareTo(handleMemberOrderVo.getPrice()) != 0) { if (parameter.getPrice().compareTo(shotMemberOrderVo.getPrice()) != 0) {
// 订单金额比对 // 订单金额比对
return ResponseDto.failure(ErrorMapping.get("10503"), parameter); return ResponseDto.failure(ErrorMapping.get("10503"), parameter);
} }
AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId( AdamMemberPriceVo memberPriceVo = adamRdmService.getMemberPriceVoByPriceId(
handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId()); shotMemberOrderVo.getMemberId(), shotMemberOrderVo.getMemberPriceId());
if (null == memberPriceVo) { if (null == memberPriceVo) {
return ResponseDto.failure(ErrorMapping.get("10504")); return ResponseDto.failure(ErrorMapping.get("10504"));
} }
...@@ -191,118 +192,149 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -191,118 +192,149 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
* 2-使用会员码(购买的) 仅限从未购买过会员的用户使用，需要填写地址 * 2-使用会员码(购买的) 仅限从未购买过会员的用户使用，需要填写地址
* 3-使用礼包码(赠送的) 仅限从未购买过会员的用户使用，不需要填写地址 * 3-使用礼包码(赠送的) 仅限从未购买过会员的用户使用，不需要填写地址
*/ */
LinkedList<String> toMqSqls = CollectionUtil.linkedListString(); boolean handlerResultFailed = false;
LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(), AdamMemberCodeVo initMemberCodeVo = null;
updateMemberOrderObjs = CollectionUtil.linkedListObjectArr(); AdamUserMemberVo existUserMemberVo = null;
LocalDateTime now = LocalDateTime.now(); try {
if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调 AdamMemberOrderVo handleMemberOrderVo = shotMemberOrderVo;
AdamUserMemberVo existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid()); LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
if (null == existUserMemberVo) {// 创建会员 LinkedList<Object[]> operationObjs = CollectionUtil.linkedListObjectArr(),
updateMemberOrderObjs = CollectionUtil.linkedListObjectArr();
LocalDateTime now = LocalDateTime.now();
if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
if (null == existUserMemberVo) {// 创建会员
String memberNo = adamUserMemberService.getNextMemberNo(handleMemberOrderVo.getMemberId());
AdamUserMemberVo initUserMemberVo = AdamUserMemberVo.getNew();
initUserMemberVo.setUid(handleMemberOrderVo.getUid());
initUserMemberVo.setMemberId(handleMemberOrderVo.getMemberId());
initUserMemberVo.setMemberNo(memberNo);
initUserMemberVo.setState(1);// 1-正常,2-失效
initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).with(LocalTime.MAX));
initUserMemberVo.setCreatedAt(now);
// long s = System.currentTimeMillis();
// mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), initUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(memberNo);
toMqSqls.add(SqlMapping.get("adam_user_member.add"));
operationObjs.add(new Object[]{
initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
} else {// 续费
AdamUserMemberVo updateExistUserMemberVo = existUserMemberVo;
LocalDateTime currentExpiryAt = updateExistUserMemberVo.getExpiryAt();
LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX);
// long s = System.currentTimeMillis();
// mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("uid").is(updateExistUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
// );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
updateExistUserMemberVo.setState(1);
updateExistUserMemberVo.setExpiryAt(expiryAt);
long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), updateExistUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(updateExistUserMemberVo.getMemberNo());
toMqSqls.add(SqlMapping.get("adam_user_member.update"));
operationObjs.add(new Object[]{
updateExistUserMemberVo.getState(), updateExistUserMemberVo.getExpiryAt(), now, updateExistUserMemberVo.getUid()
});
}
}
if (1 == handleMemberOrderVo.getMode()) {// 购买会员码回调
String memberNo = adamUserMemberService.getNextMemberNo(handleMemberOrderVo.getMemberId()); String memberNo = adamUserMemberService.getNextMemberNo(handleMemberOrderVo.getMemberId());
AdamUserMemberVo initUserMemberVo = AdamUserMemberVo.getNew(); initMemberCodeVo = AdamMemberCodeVo.getNew();
initUserMemberVo.setUid(handleMemberOrderVo.getUid()); initMemberCodeVo.setCode(MemberUtil.buyCode());
initUserMemberVo.setMemberId(handleMemberOrderVo.getMemberId()); initMemberCodeVo.setMemberId(handleMemberOrderVo.getMemberId());
initUserMemberVo.setMemberNo(memberNo); initMemberCodeVo.setMemberPriceId(handleMemberOrderVo.getMemberPriceId());
initUserMemberVo.setState(1);// 1-正常,2-失效 initMemberCodeVo.setType(1);// 1-购买,2-赠送
initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).with(LocalTime.MAX)); initMemberCodeVo.setMemberNo(memberNo);
initUserMemberVo.setCreatedAt(now); initMemberCodeVo.setState(0);
initMemberCodeVo.setBuyOrderNo(handleMemberOrderVo.getOrderNo());
// long s = System.currentTimeMillis(); initMemberCodeVo.setBuyUid(handleMemberOrderVo.getUid());
// mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName()); initMemberCodeVo.setBuyAt(handleMemberOrderVo.getCreatedAt());
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s); initMemberCodeVo.setCreatedAt(now);
long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), initUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(memberNo); // long s = System.currentTimeMillis();
// mongoTemplate.insert(initMemberCodeVo, AdamMemberCodeVo.class.getSimpleName());
toMqSqls.add(SqlMapping.get("adam_user_member.add")); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
operationObjs.add(new Object[]{
initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
} else {// 续费
LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX);
// long s = System.currentTimeMillis();
// mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("uid").is(existUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
// );
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
existUserMemberVo.setState(1);
existUserMemberVo.setExpiryAt(expiryAt);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo); adamRdmService.setMemberCodeByBuyOrderNo(initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getCode());
adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(existUserMemberVo.getMemberNo()); toMqSqls.add(SqlMapping.get("adam_member_code.add"));
toMqSqls.add(SqlMapping.get("adam_user_member.update"));
operationObjs.add(new Object[]{ operationObjs.add(new Object[]{
existUserMemberVo.getState(), existUserMemberVo.getExpiryAt(), now, existUserMemberVo.getUid() initMemberCodeVo.getCode(), initMemberCodeVo.getType(), initMemberCodeVo.getMemberId(), initMemberCodeVo.getMemberPriceId(),
initMemberCodeVo.getMemberNo(), initMemberCodeVo.getState(), initMemberCodeVo.getCreatedAt(),
initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getBuyUid(), initMemberCodeVo.getBuyAt()
}); });
} }
} handleMemberOrderVo.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(parameter.getPaymentAt()));
if (1 == handleMemberOrderVo.getMode()) {// 购买会员码回调 handleMemberOrderVo.setUpdatedAt(now);
String memberNo = adamUserMemberService.getNextMemberNo(handleMemberOrderVo.getMemberId()); handleMemberOrderVo.setState(1);// 1-已支付
AdamMemberCodeVo initMemberCodeVo = AdamMemberCodeVo.getNew(); // long s = System.currentTimeMillis();
initMemberCodeVo.setCode(MemberUtil.buyCode()); // mongoTemplate.insert(handleMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
initMemberCodeVo.setMemberId(handleMemberOrderVo.getMemberId()); // log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
initMemberCodeVo.setMemberPriceId(handleMemberOrderVo.getMemberPriceId());
initMemberCodeVo.setType(1);// 1-购买,2-赠送
initMemberCodeVo.setMemberNo(memberNo);
initMemberCodeVo.setState(0);
initMemberCodeVo.setBuyOrderNo(handleMemberOrderVo.getOrderNo());
initMemberCodeVo.setBuyUid(handleMemberOrderVo.getUid());
initMemberCodeVo.setBuyAt(handleMemberOrderVo.getCreatedAt());
initMemberCodeVo.setCreatedAt(now);
// long s = System.currentTimeMillis();
// mongoTemplate.insert(initMemberCodeVo, AdamMemberCodeVo.class.getSimpleName());
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
adamRdmService.setMemberCodeByBuyOrderNo(initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getCode() + 0); // adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo); adamRdmService.addMemberOrderVoByUid(
handleMemberOrderVo.getUid(), adamRdmService.getMemberOrderVosByUid(handleMemberOrderVo.getUid()), handleMemberOrderVo);
adamRdmService.delShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_code.add")); toMqSqls.add(SqlMapping.get("adam_member_order.add"));
operationObjs.add(new Object[]{ updateMemberOrderObjs.add(new Object[]{
initMemberCodeVo.getCode(), initMemberCodeVo.getType(), initMemberCodeVo.getMemberId(), initMemberCodeVo.getMemberPriceId(), handleMemberOrderVo.getOrderNo(), handleMemberOrderVo.getUid(), handleMemberOrderVo.getMode(), handleMemberOrderVo.getPrice(),
initMemberCodeVo.getMemberNo(), initMemberCodeVo.getState(), initMemberCodeVo.getCreatedAt(), handleMemberOrderVo.getPricePaid(), handleMemberOrderVo.getMemberName(), handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId(),
initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getBuyUid(), initMemberCodeVo.getBuyAt() handleMemberOrderVo.getDays(), handleMemberOrderVo.getState(), handleMemberOrderVo.getMemberNo(), handleMemberOrderVo.getBirthday(),
handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
}); });
s = System.currentTimeMillis();
queueUtils.sendMsgByRedis(
MQConst.AdamQueue.SQL_UMEMBER.getKey(),
SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
);
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
} catch (Exception e) {
log.error("购买会员支付回调处理异常[CallbackParam={}]", JsonUtils.toJson(parameter), e);
handlerResultFailed = true;
} finally {
if (handlerResultFailed) {
adamRdmService.rmvMemberOrderVoByUid(
shotMemberOrderVo.getUid(), adamRdmService.getMemberOrderVosByUid(shotMemberOrderVo.getUid()), shotMemberOrderVo.getOrderNo());
adamRdmService.setShotMemberOrderVoByOrderNo(shotMemberOrderVo.getOrderNo(), shotMemberOrderVo);
if (0 == shotMemberOrderVo.getMode()) {// 购买会员回调
if (null == existUserMemberVo) {
adamRdmService.delUserMemberVoByUid(shotMemberOrderVo.getUid());
} else {
adamRdmService.setUserMemberVoByUid(shotMemberOrderVo.getUid(), existUserMemberVo);
}
}
if (1 == shotMemberOrderVo.getMode() && null != initMemberCodeVo) {// 购买会员码回调
adamRdmService.delMemberCodeByBuyOrderNo(initMemberCodeVo.getBuyOrderNo());
adamRdmService.delMemberCodeVoByCode(initMemberCodeVo.getCode());
}
}
} }
handleMemberOrderVo.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(parameter.getPaymentAt()));
handleMemberOrderVo.setUpdatedAt(now);
handleMemberOrderVo.setState(1);// 1-已支付
// long s = System.currentTimeMillis();
// mongoTemplate.insert(handleMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
// log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_order.add"));
updateMemberOrderObjs.add(new Object[]{
handleMemberOrderVo.getOrderNo(), handleMemberOrderVo.getUid(), handleMemberOrderVo.getMode(), handleMemberOrderVo.getPrice(),
handleMemberOrderVo.getPricePaid(), handleMemberOrderVo.getMemberName(), handleMemberOrderVo.getMemberId(), handleMemberOrderVo.getMemberPriceId(),
handleMemberOrderVo.getDays(), handleMemberOrderVo.getState(), handleMemberOrderVo.getMemberNo(), handleMemberOrderVo.getBirthday(),
handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
});
long s = System.currentTimeMillis();
adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis();
queueUtils.sendMsgByRedis(
com.liquidnet.service.base.constant.MQConst.AdamQueue.SQL_UMEMBER.getKey(),
SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs)
);
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
return ResponseDto.success(); return ResponseDto.success();
} }
...@@ -312,6 +344,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -312,6 +344,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
if (null == memberCodeVo) { if (null == memberCodeVo) {
return ResponseDto.failure(ErrorMapping.get("10207")); return ResponseDto.failure(ErrorMapping.get("10207"));
} }
List<AdamMemberOrderVo> memberOrderVos = null;
AdamMemberOrderVo initMemberOrderVo = null; AdamMemberOrderVo initMemberOrderVo = null;
try { try {
adamRdmService.delMemberCodeVoByCode(param.getMemberCode()); adamRdmService.delMemberCodeVoByCode(param.getMemberCode());
...@@ -389,6 +423,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -389,6 +423,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
}); });
} }
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
memberOrderVos = adamRdmService.getMemberOrderVosByUid(initMemberOrderVo.getUid());
adamRdmService.addMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo);
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), upsertUserMemberVo); adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), upsertUserMemberVo);
// adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode()); // adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
...@@ -433,6 +469,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -433,6 +469,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
adamRdmService.setMemberCodeVoByCode(memberCodeVo.getCode(), memberCodeVo); adamRdmService.setMemberCodeVoByCode(memberCodeVo.getCode(), memberCodeVo);
if (null != initMemberOrderVo) { if (null != initMemberOrderVo) {
adamRdmService.delUserMemberVoByUid(initMemberOrderVo.getUid()); adamRdmService.delUserMemberVoByUid(initMemberOrderVo.getUid());
adamRdmService.rmvMemberOrderVoByUid(initMemberOrderVo.getUid(), memberOrderVos, initMemberOrderVo.getOrderNo());
} }
return ResponseDto.failure(ErrorMapping.get("10214")); return ResponseDto.failure(ErrorMapping.get("10214"));
} }
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/com/liquidnet/service/adam/test/TestRedis.java 0 → 100644
View file @ 2a7b5cdb
package com.liquidnet.service.adam.test;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: TestRedis
* @Package com.liquidnet.service.adam.test
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/7/29 13:36
*/
@Slf4j
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestRedis {
@Autowired
private RedisUtil redisUtil;
@Test
public void getsetValu(){
System.out.println(redisUtil.sGet("kylin:agent:info"));
System.out.println(redisUtil.sHasKey("kylin:agent:info",14));
}
}
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java
View file @ 2a7b5cdb
...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; ...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -90,7 +91,7 @@ public class DragonPayBiz { ...@@ -90,7 +91,7 @@ public class DragonPayBiz {
params.add("price", payNotifyDto.getPrice().toString()); params.add("price", payNotifyDto.getPrice().toString());
params.add("paymentType", payNotifyDto.getPaymentType()); params.add("paymentType", payNotifyDto.getPaymentType());
params.add("paymentAt", payNotifyDto.getPaymentAt()); params.add("paymentAt", payNotifyDto.getPaymentAt());
jsonData = JsonUtils.toJson(params); jsonData = JsonUtils.toJson(covertNVPS2Params(params));
log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl()); log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
log.info("dragon:notify:post data:{}",jsonData); log.info("dragon:notify:post data:{}",jsonData);
...@@ -205,4 +206,12 @@ public class DragonPayBiz { ...@@ -205,4 +206,12 @@ public class DragonPayBiz {
} }
return rsMap; return rsMap;
} }
private static Map<String, Object> covertNVPS2Params(MultiValueMap<String, String> params) {
Map<String, Object> rsMap = new HashMap<>();
for (Map.Entry<String, List<String>> param : params.entrySet()) {
rsMap.put(param.getKey(), param.getValue().get(0));
}
return rsMap;
}
} }
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/test/java/com/liquidnet/service/DragonPayTest.java
View file @ 2a7b5cdb
...@@ -2,8 +2,10 @@ package com.liquidnet.service; ...@@ -2,8 +2,10 @@ package com.liquidnet.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.dragon.utils.ObjectUtil;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.BasicNameValuePair;
import org.springframework.util.MultiValueMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
...@@ -37,7 +39,22 @@ public class DragonPayTest { ...@@ -37,7 +39,22 @@ public class DragonPayTest {
System.out.println("jsonDate === "+jsonData); System.out.println("jsonDate === "+jsonData);
System.out.println("covertNVPS2Params jsonDate === "+covertNVPS2Params(nvps)); System.out.println("covertNVPS2Params jsonDate === "+covertNVPS2Params(nvps));
System.out.println("covertNVPS2Params jsonDate === "+ JsonUtils.toJson(covertNVPS2Params(nvps))); System.out.println("covertNVPS2Params jsonDate === "+ JsonUtils.toJson(covertNVPS2Params(nvps)));
System.out.println("covertNVPS2Params jsonDate === "+ covertNVPS2KeyValue(nvps)); System.out.println("covertNVPS2KeyValue jsonDate === "+ covertNVPS2KeyValue(nvps));
}
public static void testMap2() {
MultiValueMap<String, String> params = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
params.add("status", "1");
params.add("type", "TICKET");
params.add("code","PAY20210727111746415639688");
params.add("paymentId", "4200001121202107274119605305");
params.add("orderCode", "11766977997930496418880635");
params.add("price", "0.01");
params.add("paymentType", "APPWEPAY");
params.add("paymentAt", "2021-07-27 11:18:03");
String jsonData = JsonUtils.toJson(params);
System.out.println("jsonData === "+jsonData);
System.out.println("jsonData === " + JsonUtils.toJson(covertNVPS2Params(params)));
} }
private static ArrayList<NameValuePair> covertParams2NVPS(Map<String, Object> params) { private static ArrayList<NameValuePair> covertParams2NVPS(Map<String, Object> params) {
ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>(); ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>();
...@@ -47,6 +64,14 @@ public class DragonPayTest { ...@@ -47,6 +64,14 @@ public class DragonPayTest {
return pairs; return pairs;
} }
private static ArrayList<NameValuePair> covertParams2NVPS(MultiValueMap<String, String> params) {
ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>();
for (Map.Entry<String, List<String>> param : params.entrySet()) {
pairs.add(new BasicNameValuePair(param.getKey(), param.getValue().get(0)));
}
return pairs;
}
private static Map<String, Object> covertNVPS2Params(List<NameValuePair> nvpList) { private static Map<String, Object> covertNVPS2Params(List<NameValuePair> nvpList) {
Map<String, Object> rsMap = new HashMap<>(); Map<String, Object> rsMap = new HashMap<>();
for (NameValuePair nameValuePair : nvpList) { for (NameValuePair nameValuePair : nvpList) {
...@@ -63,7 +88,22 @@ public class DragonPayTest { ...@@ -63,7 +88,22 @@ public class DragonPayTest {
return sb.toString(); return sb.toString();
} }
private static String covertNVPS2KeyValue(MultiValueMap<String, String> mapParam) {
ArrayList<NameValuePair> pairs = covertParams2NVPS(mapParam);
return covertNVPS2KeyValue(pairs);
}
private static Map<String, Object> covertNVPS2Params(MultiValueMap<String, String> params) {
Map<String, Object> rsMap = new HashMap<>();
for (Map.Entry<String, List<String>> param : params.entrySet()) {
rsMap.put(param.getKey(), param.getValue().get(0));
}
return rsMap;
}
public static void main(String[] args) { public static void main(String[] args) {
testMap();
// testMap();
testMap2();
} }
} }
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java
View file @ 2a7b5cdb
...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; ...@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -90,7 +91,7 @@ public class DragonPayBiz { ...@@ -90,7 +91,7 @@ public class DragonPayBiz {
params.add("price", payNotifyDto.getPrice().toString()); params.add("price", payNotifyDto.getPrice().toString());
params.add("paymentType", payNotifyDto.getPaymentType()); params.add("paymentType", payNotifyDto.getPaymentType());
params.add("paymentAt", payNotifyDto.getPaymentAt()); params.add("paymentAt", payNotifyDto.getPaymentAt());
jsonData = JsonUtils.toJson(params); jsonData = JsonUtils.toJson(covertNVPS2Params(params));
log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl()); log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
log.info("dragon:notify:post data:{}",jsonData); log.info("dragon:notify:post data:{}",jsonData);
...@@ -205,4 +206,12 @@ public class DragonPayBiz { ...@@ -205,4 +206,12 @@ public class DragonPayBiz {
} }
return rsMap; return rsMap;
} }
private static Map<String, Object> covertNVPS2Params(MultiValueMap<String, String> params) {
Map<String, Object> rsMap = new HashMap<>();
for (Map.Entry<String, List<String>> param : params.entrySet()) {
rsMap.put(param.getKey(), param.getValue().get(0));
}
return rsMap;
}
} }
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java
View file @ 2a7b5cdb
...@@ -39,18 +39,18 @@ public class KylinOrderTicketsController { ...@@ -39,18 +39,18 @@ public class KylinOrderTicketsController {
@Autowired @Autowired
IKylinOrderTicketsOrderService orderTicketsOrderService; IKylinOrderTicketsOrderService orderTicketsOrderService;
@PostMapping("pre") // @PostMapping("pre")
@ApiOperation("下单") // @ApiOperation("下单")
@ApiResponse(code = 200, message = "接口返回对象参数") // @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) { // public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
return orderTicketsOrderService.checkCanOrder(payOrderParam); // return orderTicketsOrderService.checkCanOrder(payOrderParam);
} // }
@DecryptAndVerify(decryptedClass = PayOrderParam.class) @DecryptAndVerify(decryptedClass = PayOrderParam.class)
@PostMapping("pre2") @PostMapping("pre")
@ApiOperation("下单2") @ApiOperation("下单")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayInnerResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) { public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
PayOrderParam payOrderParam = encryptedReq.getData(); PayOrderParam payOrderParam = encryptedReq.getData();
return orderTicketsOrderService.checkCanOrder(payOrderParam); return orderTicketsOrderService.checkCanOrder(payOrderParam);
} }
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/test/java/com/liquidnet/service/order/test/CodecTest.java
View file @ 2a7b5cdb
...@@ -33,7 +33,8 @@ public class CodecTest { ...@@ -33,7 +33,8 @@ public class CodecTest {
System.out.println("时间戳：" + timestamp); System.out.println("时间戳：" + timestamp);
// UserLoginReq userLoginReq = new UserLoginReq("admin", "admin"); // UserLoginReq userLoginReq = new UserLoginReq("admin", "admin");
// String data = JSON.toJSONString(userLoginReq); // String data = JSON.toJSONString(userLoginReq);
String data = "{\"number\":1,\"ticketId\":\"2811887059054592999181\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":0.01,\"performanceId\":\"2811713813327872196937\",\"timeId\":\"2811766812553216086853\",\"returnUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"showUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"expressType\":2,\"agentId\":0,\"payType\":\"alipay\"}"; // String data = "{\"number\":1,\"ticketId\":\"2811887059054592999181\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":0.01,\"performanceId\":\"2811713813327872196937\",\"timeId\":\"2811766812553216086853\",\"returnUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"showUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"expressType\":2,\"agentId\":0,\"payType\":\"alipay\"}";
String data = "{\"number\":1,\"ticketId\":\"11316\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":220,\"performanceId\":\"5936371\",\"timeId\":\"126207700372889606864872\",\"returnUrl\":\"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=\",\"showUrl\":\"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=\",\"expressType\":1,\"agentId\":0,\"payType\":\"wepay\"}";
System.out.println("加密前的数据：" + data); System.out.println("加密前的数据：" + data);
String encryptedData = CodecUtil.aesEncrypt(data); String encryptedData = CodecUtil.aesEncrypt(data);
System.out.println("加密后的数据：" + encryptedData); System.out.println("加密后的数据：" + encryptedData);
...@@ -46,3 +47,12 @@ public class CodecTest { ...@@ -46,3 +47,12 @@ public class CodecTest {
System.out.println("加密后的请求：" + JSON.toJSONString(encryptedReq)); System.out.println("加密后的请求：" + JSON.toJSONString(encryptedReq));
} }
} }
//CodecUtil.AES_SECRET_KEY_BYTES=== XjjkaLnlzAFbR399IP4kdQ==
// f52666839c984e5720a06a9ca4673dd12e8f4ffa
// 时间戳：1627622460314
// 加密前的数据：{"number":1,"ticketId":"11316","isElectronic":1,"isExpress":0,"deviceFrom":"wap","actual":220,"performanceId":"5936371","timeId":"126207700372889606864872","returnUrl":"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=","showUrl":"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=","expressType":1,"agentId":0,"payType":"wepay"}
// 加密后的数据：HGGFm1DHHYnRZHgvB25eSEneEFPRCvNcrheFlSTGRRLVzY4QscH4v1TmzJ5MXzhIfh3iYsBj/NEfZ7ynNZ2qO8QeOTxBLjVJSxU3NZNArsz52BpMmbF70GlGT5b++0QszHvDo9lNTMHNWLqh8711tdYxLbtFMMKTSpJcvzJOiyCmA3d5vLdkNvZ9IjkTrjoDQ3KEYCumGUue6n4CmA6VRqSvc4HnD6A4tkzyhgOR5o0pLJduvnkuGSqtsdZpkBnXpos91xTfNNUm7i1tiYPZXA0EVn7OfFfh+zEEfyQx/Nfn3SNQ079abatubI4Yko4NoP7FgG2i5J6JVB6UgpWqeMcKHACDlxQmadTdQ9eR4qCjKlf38MoNuAIfdwLCSHPeMRjgl2WeQAqCmOR/+L7V8pGDYZR+6oFgBjl6zx3HANJsMhpNsUPKYO9qO1iqdGsMuq7ZYlXlNy1txroij5usZcLHwD/bmOXKO/X07yV559g=
// 签名：4465b794fe277545cfcd37cdbf7dbecae491213f
// 加密后的请求：{"encryptedData":"HGGFm1DHHYnRZHgvB25eSEneEFPRCvNcrheFlSTGRRLVzY4QscH4v1TmzJ5MXzhIfh3iYsBj/NEfZ7ynNZ2qO8QeOTxBLjVJSxU3NZNArsz52BpMmbF70GlGT5b++0QszHvDo9lNTMHNWLqh8711tdYxLbtFMMKTSpJcvzJOiyCmA3d5vLdkNvZ9IjkTrjoDQ3KEYCumGUue6n4CmA6VRqSvc4HnD6A4tkzyhgOR5o0pLJduvnkuGSqtsdZpkBnXpos91xTfNNUm7i1tiYPZXA0EVn7OfFfh+zEEfyQx/Nfn3SNQ079abatubI4Yko4NoP7FgG2i5J6JVB6UgpWqeMcKHACDlxQmadTdQ9eR4qCjKlf38MoNuAIfdwLCSHPeMRjgl2WeQAqCmOR/+L7V8pGDYZR+6oFgBjl6zx3HANJsMhpNsUPKYO9qO1iqdGsMuq7ZYlXlNy1txroij5usZcLHwD/bmOXKO/X07yV559g=","sign":"4465b794fe277545cfcd37cdbf7dbecae491213f","timestamp":1627622460314}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualShopController.java
View file @ 2a7b5cdb
...@@ -58,7 +58,7 @@ public class SweetManualShopController { ...@@ -58,7 +58,7 @@ public class SweetManualShopController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册iid", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册iid", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = false), @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "描述", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
...@@ -66,11 +66,11 @@ public class SweetManualShopController { ...@@ -66,11 +66,11 @@ public class SweetManualShopController {
public ResponseDto<Boolean> add(@RequestParam String manualId, public ResponseDto<Boolean> add(@RequestParam String manualId,
@RequestParam String title, @RequestParam String title,
@RequestParam String picUrl, @RequestParam String picUrl,
@RequestParam String describe, @RequestParam String describes,
@RequestParam Integer type, @RequestParam Integer type,
@RequestParam Integer isRecommend, @RequestParam Integer isRecommend,
@RequestParam Integer sort) { @RequestParam Integer sort) {
return sweetManualShopService.add(manualId, title, picUrl, describe, type, isRecommend, sort); return sweetManualShopService.add(manualId, title, picUrl, describes, type, isRecommend, sort);
} }
@PostMapping("change") @PostMapping("change")
...@@ -79,7 +79,7 @@ public class SweetManualShopController { ...@@ -79,7 +79,7 @@ public class SweetManualShopController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "描述", required = true), @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 1吃喝 2玩乐", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "isRecommend", value = "是否推荐", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true), @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
...@@ -87,11 +87,11 @@ public class SweetManualShopController { ...@@ -87,11 +87,11 @@ public class SweetManualShopController {
public ResponseDto<Boolean> change(@RequestParam String manualShopId, public ResponseDto<Boolean> change(@RequestParam String manualShopId,
@RequestParam String title, @RequestParam String title,
@RequestParam String picUrl, @RequestParam String picUrl,
@RequestParam String describe, @RequestParam String describes,
@RequestParam Integer type, @RequestParam Integer type,
@RequestParam Integer isRecommend, @RequestParam Integer isRecommend,
@RequestParam Integer sort) { @RequestParam Integer sort) {
return sweetManualShopService.change(manualShopId, title, picUrl, describe, type, isRecommend, sort); return sweetManualShopService.change(manualShopId, title, picUrl, describes, type, isRecommend, sort);
} }
......
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