Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberBankServiceImpl.java

@@ -43,7 +43,7 @@

    @Override
    public void deleteById(Integer id) {
        memberBankMapper.deleteById(id);
        memberBankMapper.update(new UpdateWrapper<MemberBank>().lambda().set(MemberBank::getIsdeleted,Constants.ONE).eq(MemberBank::getId,id));
    }

    @Override
@@ -156,9 +156,9 @@
        if(Objects.isNull(request)
                ||Objects.isNull(request.getIsDefault())
                ||Objects.isNull(request.getMemberId())
                || StringUtils.isNotBlank(request.getBankName())
                || StringUtils.isNotBlank(request.getBankAccount())
                || StringUtils.isNotBlank(request.getName())
                || StringUtils.isBlank(request.getBankName())
                || StringUtils.isBlank(request.getBankAccount())
                || StringUtils.isBlank(request.getName())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -176,6 +176,7 @@
            BeanUtils.copyProperties(request,memberBank);
            memberBank.setCreateDate(new Date());
            memberBank.setEditDate(new Date());
            memberBank.setIsdeleted(Constants.ZERO);
            memberBankMapper.insert(memberBank);
        } else {
            MemberBank memberBank = memberBankMapper.selectById(request.getId());
@@ -197,9 +198,11 @@
                .eq(MemberBank::getMemberId,shopId)
                .orderByDesc(MemberBank::getIsDefault,MemberBank::getId)
        );
        for (MemberBank memberBank:memberBanks) {
            memberBank.setBankInfo(Constants.getBankInfo(memberBank.getBankName(),memberBank.getBankAccount()));
        }
        return memberBanks;
    }