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

Commit 50881f89 authored by 张国柄's avatar 张国柄

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

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