|
|
@@ -641,9 +641,9 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
|
|
|
List<Userinfo> uiList = iUserinfoMapper.selectList(new QueryWrapper<Userinfo>()
|
|
|
.eq("userstatus", 1)
|
|
|
.ne("userid", ui.getUserid())
|
|
|
- .and(a -> a.eq("cardnum", ui.getCardnum())
|
|
|
+ .and(a -> a.eq(StringUtils.isNotBlank(ui.getCardnum()),"cardnum", ui.getCardnum())
|
|
|
.or()
|
|
|
- .eq("mobile", ui.getMobile()))
|
|
|
+ .eq(StringUtils.isNotBlank(ui.getMobile()),"mobile", ui.getMobile()))
|
|
|
);
|
|
|
if (CollectionUtils.isNotEmpty(uiList)) {
|
|
|
for (Userinfo userinfo : uiList) {
|
|
|
@@ -888,7 +888,7 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
|
|
|
//注销状态
|
|
|
ta.setTradestatus(SysEnums.TradeStatusEnum.CANCELED.getType());
|
|
|
ta.setTradestatuschangetime(new Date());
|
|
|
- iTaaccountMapper.updateById(ta);
|
|
|
+ iTaaccountMapper.update(ta,new QueryWrapper<Taaccount>().eq("accountid",ta.getAccountid()));
|
|
|
|
|
|
Userinfo info = iUserinfoMapper.selectOne(new QueryWrapper<Userinfo>().eq("userid", userid));
|
|
|
info.setUserstatus(2);
|