fix;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -31,6 +31,8 @@ public class AdamRedisConst {
     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_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");
 

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -45,8 +45,6 @@ public final class RedisUtil {
 
     public boolean expire(String key, long time) {
 
-        try {
-
             if (time > 0) {
 
                 redisTemplate.expire(key, time, TimeUnit.SECONDS);
@@ -55,14 +53,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
-
     }
 
 
@@ -95,18 +85,8 @@ public final class RedisUtil {
 
     public boolean hasKey(String key) {
 
-        try {
-
             return redisTemplate.hasKey(key);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
-
     }
 
     /**
@@ -187,19 +167,11 @@ public final class RedisUtil {
 
     public boolean set(String key, Object value) {
 
-        try {
 
             redisTemplate.opsForValue().set(key, value);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
 
     }
@@ -221,7 +193,6 @@ public final class RedisUtil {
 
     public boolean set(String key, Object value, long time) {
 
-        try {
 
             if (time > 0) {
 
@@ -235,13 +206,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -350,19 +314,11 @@ public final class RedisUtil {
 
     public boolean hmset(String key, Map<String, Object> map) {
 
-        try {
 
             redisTemplate.opsForHash().putAll(key, map);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -383,7 +339,6 @@ public final class RedisUtil {
 
     public boolean hmset(String key, Map<String, Object> map, long time) {
 
-        try {
 
             redisTemplate.opsForHash().putAll(key, map);
 
@@ -395,13 +350,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -422,19 +370,11 @@ public final class RedisUtil {
 
     public boolean hset(String key, String item, Object value) {
 
-        try {
 
             redisTemplate.opsForHash().put(key, item, value);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -457,7 +397,6 @@ public final class RedisUtil {
 
     public boolean hset(String key, String item, Object value, long time) {
 
-        try {
 
             redisTemplate.opsForHash().put(key, item, value);
 
@@ -469,13 +408,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -572,17 +504,9 @@ public final class RedisUtil {
 
     public Set<Object> sGet(String key) {
 
-        try {
 
             return redisTemplate.opsForSet().members(key);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return null;
-
-        }
 
     }
 
@@ -601,17 +525,9 @@ public final class RedisUtil {
 
     public boolean sHasKey(String key, Object value) {
 
-        try {
 
             return redisTemplate.opsForSet().isMember(key, value);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -630,17 +546,9 @@ public final class RedisUtil {
 
     public long sSet(String key, Object... values) {
 
-        try {
 
             return redisTemplate.opsForSet().add(key, values);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return 0;
-
-        }
 
     }
 
@@ -661,7 +569,6 @@ public final class RedisUtil {
 
     public long sSetAndTime(String key, long time, Object... values) {
 
-        try {
 
             Long count = redisTemplate.opsForSet().add(key, values);
 
@@ -671,13 +578,6 @@ public final class RedisUtil {
 
             return count;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return 0;
-
-        }
 
     }
 
@@ -694,17 +594,9 @@ public final class RedisUtil {
 
     public long sGetSetSize(String key) {
 
-        try {
 
             return redisTemplate.opsForSet().size(key);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return 0;
-
-        }
 
     }
 
@@ -723,19 +615,11 @@ public final class RedisUtil {
 
     public long setRemove(String key, Object... values) {
 
-        try {
 
             Long count = redisTemplate.opsForSet().remove(key, values);
 
             return count;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return 0;
-
-        }
 
     }
 
@@ -758,17 +642,9 @@ public final class RedisUtil {
 
     public List<Object> lGet(String key, long start, long end) {
 
-        try {
 
             return redisTemplate.opsForList().range(key, start, end);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return null;
-
-        }
 
     }
 
@@ -785,17 +661,9 @@ public final class RedisUtil {
 
     public long lGetListSize(String key) {
 
-        try {
 
             return redisTemplate.opsForList().size(key);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return 0;
-
-        }
 
     }
 
@@ -814,17 +682,9 @@ public final class RedisUtil {
 
     public Object lGetIndex(String key, long index) {
 
-        try {
 
             return redisTemplate.opsForList().index(key, index);
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return null;
-
-        }
 
     }
 
@@ -837,19 +697,11 @@ public final class RedisUtil {
      */
     public boolean lSet(String key, Object value) {
 
-        try {
 
             redisTemplate.opsForList().rightPush(key, value);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -870,7 +722,6 @@ public final class RedisUtil {
 
     public boolean lSet(String key, Object value, long time) {
 
-        try {
 
             redisTemplate.opsForList().rightPush(key, value);
 
@@ -880,13 +731,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -899,19 +743,11 @@ public final class RedisUtil {
      */
     public boolean lSet(String key, List<Object> value) {
 
-        try {
 
             redisTemplate.opsForList().rightPushAll(key, value);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -934,7 +770,6 @@ public final class RedisUtil {
 
     public boolean lSet(String key, List<Object> value, long time) {
 
-        try {
 
             redisTemplate.opsForList().rightPushAll(key, value);
 
@@ -944,13 +779,6 @@ public final class RedisUtil {
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -971,19 +799,11 @@ public final class RedisUtil {
 
     public boolean lUpdateIndex(String key, long index, Object value) {
 
-        try {
 
             redisTemplate.opsForList().set(key, index, value);
 
             return true;
 
-        } catch (Exception e) {
-
-            e.printStackTrace();
-
-            return false;
-
-        }
 
     }
 
@@ -1004,19 +824,11 @@ public final class RedisUtil {
 
     public long lRemove(String key, long count, Object value) {
 
-        try {
 
             Long remove = redisTemplate.opsForList().remove(key, count, value);
 
             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

@@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -51,7 +48,7 @@ public class AdamRdmService {
 
     public boolean setSmsCodeByMobile(String mobile, String smsCode) {
         // 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) {
@@ -240,6 +237,23 @@ public class AdamRdmService {
         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) {
         return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
@@ -281,6 +295,23 @@ public class AdamRdmService {
         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) {
         return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
@@ -455,6 +486,40 @@ public class AdamRdmService {
         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> */
 
     public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) {
@@ -528,11 +593,15 @@ public class AdamRdmService {
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <AdamMemberCodeVo::buyOrderNo, MEMBER_CODE> */
 
     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) {
-        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

@@ -63,8 +63,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 
         long s = System.currentTimeMillis();
 //        adamRdmService.delAddressesVoByUid(currentUid);
-        vos.add(vo);
-        adamRdmService.setAddressesVoByUid(currentUid, vos);
+        adamRdmService.addAddressesVoByUid(currentUid, vos, vo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
         s = System.currentTimeMillis();
@@ -201,13 +200,14 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 //                Query.query(Criteria.where("uid").is(currentUid).and("addressesId").is(addressesId)), AdamAddressesVo.class.getSimpleName()
 //        );
 //        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
-        vos.removeIf(r -> r.getAddressesId().equals(addressesId));
-        long s = System.currentTimeMillis();
-        adamRdmService.setAddressesVoByUid(uid, vos);
-        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+//        List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
+//        vos.removeIf(r -> r.getAddressesId().equals(addressesId));
+//        s = System.currentTimeMillis();
+//        adamRdmService.setAddressesVoByUid(uid, vos);
+//        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+        adamRdmService.rmvAddressesVoByUid(uid, adamRdmService.getAddressesVoByUid(uid), addressesId);
 
-        s = System.currentTimeMillis();
+        long s = System.currentTimeMillis();
         queueUtils.sendMsgByRedis(
                 MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 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

@@ -78,8 +78,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         long s = System.currentTimeMillis();
 //        adamRdmService.delEntersVoByUid(currentUid);
-        vos.add(vo);
-        adamRdmService.setEntersVoByUid(currentUid, vos);
+        adamRdmService.addEntersVoByUid(currentUid, vos, vo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
         s = System.currentTimeMillis();
@@ -220,13 +219,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 //                Query.query(Criteria.where("uid").is(currentUid).and("entersId").is(entersId)), AdamEntersVo.class.getSimpleName()
 //        );
 //        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
-        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
-        vos.removeIf(r -> r.getEntersId().equals(entersId));
-        long s = System.currentTimeMillis();
-        adamRdmService.setEntersVoByUid(uid, vos);
-        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+//        List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
+//        vos.removeIf(r -> r.getEntersId().equals(entersId));
+//        s = System.currentTimeMillis();
+//        adamRdmService.setEntersVoByUid(uid, vos);
+//        log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
+        adamRdmService.rmvEntersVoByUid(uid, adamRdmService.getEntersVoByUid(uid), entersId);
 
-        s = System.currentTimeMillis();
+        long s = System.currentTimeMillis();
         queueUtils.sendMsgByRedis(
                 MQConst.AdamQueue.SQL_UCENTER.getKey(),
                 SqlMapping.get("adam_enters.remove", now, now, entersId)