fix:adam:addresses|enters:def:5xx;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

@@ -79,6 +79,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
         if (vos.size() > 1) {// 取消原默认
             AdamAddressesVo defaultVo = queryDefault(vos, uid, false);
+            if (null != defaultVo) {
                 defaultVo.setIsDefault(false);
                 defaultVo.setUpdatedAt(now);
 
@@ -86,6 +87,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 
                 this.collectionProcess(vos, defaultVo.getAddressesId(), defaultVo);
             }
+        }
         {// 设置新默认
             AdamAddressesVo defaultVoAfter = adamRdmService.getAddressesVoByUidAddressesId(vos, addressesId);
             defaultVoAfter.setIsDefault(true);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

@@ -96,12 +96,14 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
         if (vos.size() > 1) {// 取消原默认
             AdamEntersVo defaultVo = queryDefault(vos, uid, false);
+            if (null != defaultVo) {
                 defaultVo.setIsDefault(false);
                 defaultVo.setUpdatedAt(now);
 
                 toMqObjs.add(new Object[]{false, now, defaultVo.getEntersId()});
 
-            vos = this.collectionProcess(vos, defaultVo.getEntersId(), defaultVo);
+                this.collectionProcess(vos, defaultVo.getEntersId(), defaultVo);
+            }
         }
         {// 设置新默认
             AdamEntersVo defaultVoAfter = adamRdmService.getEntersVoByUidEntersId(vos, entersId);
@@ -110,7 +112,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
             toMqObjs.add(new Object[]{true, now, entersId});
 
-            vos = this.collectionProcess(vos, defaultVoAfter.getEntersId(), defaultVoAfter);
+            this.collectionProcess(vos, defaultVoAfter.getEntersId(), defaultVoAfter);
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
             long s = System.currentTimeMillis();