Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

KKSU

2024-09-30 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9

 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -28,6 +28,7 @@
import com.xcong.excoin.modules.member.parameter.dto.*;
import com.xcong.excoin.modules.member.parameter.vo.*;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.member.vo.DefaultWayVo;
import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
import com.xcong.excoin.modules.platform.entity.PlatformFeeSettingEntity;
@@ -152,14 +153,18 @@
//        }
        if (!AppContants.SYSTEM_REFERER.equals(registerDto.getRefererId())) {
            MemberEntity isExist = memberDao.selectMemberInfoByInviteId(registerDto.getRefererId());
            if (isExist != null) {
                member.setRefererId(registerDto.getRefererId());
//            if (isExist != null) {
//                member.setRefererId(registerDto.getRefererId());
//            }
            if (isExist == null) {
                return Result.fail("推荐人不存在");
            }
        }
        member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE);
        member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL);
        member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
        member.setCertifyStatus(MemberEntity.CERTIFY_STATUS_UN_SUBMIT);
        member.setRefererId(registerDto.getRefererId());
        member.setIsForce(1);
        member.setIsProfit(0);
        memberDao.insert(member);
@@ -512,6 +517,10 @@
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity member = memberDao.selectById(memberId);

//        if (!MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(memberPaymethodDto.getPaymentType())) {
//            return Result.fail("只能绑定银行卡");
//        }

        if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
            return Result.fail(MessageSourceUtils.getString("member_service_0077"));
        }
@@ -525,6 +534,12 @@
                    return Result.fail(MessageSourceUtils.getString("member_service_0097"));
                }
            }
        }

        String isDefault = "1";
        MemberPaymentMethodEntity defaultMethod = memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
        if (defaultMethod != null) {
            isDefault = "2";
        }
        String account = memberPaymethodDto.getAccount();
        String bank = memberPaymethodDto.getBank();
@@ -540,6 +555,7 @@
        memberPaymentMethodEntity.setPaymentQrcode(paymentQrcode);
        memberPaymentMethodEntity.setPaymentType(paymentType);
        memberPaymentMethodEntity.setSubBank(subBank);
        memberPaymentMethodEntity.setIsDefualt(isDefault);
        memberPaymentMethodDao.insert(memberPaymentMethodEntity);
        return Result.ok(MessageSourceUtils.getString("member_service_0024"));
    }
@@ -594,6 +610,7 @@
                memberPaymethodDetailVo.setPaymentQrcode(memberPaymentMethodEntity.getPaymentQrcode());
                memberPaymethodDetailVo.setPaymentType(memberPaymentMethodEntity.getPaymentType());
                memberPaymethodDetailVo.setSubBank(memberPaymentMethodEntity.getSubBank());
                memberPaymethodDetailVo.setIsDefault(memberPaymentMethodEntity.getIsDefualt());
                arrayList.add(memberPaymethodDetailVo);
            }
        }
@@ -601,6 +618,29 @@
        MemberPaymethodDetailListVo memberPaymethodDetailListVo = new MemberPaymethodDetailListVo();
        memberPaymethodDetailListVo.setMemberPaymethodDetailVo(arrayList);
        return Result.ok(memberPaymethodDetailListVo);
    }

    @Override
    public Result setDefaultPaymethod(Long id) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");

        if (defualtMethod != null) {
            if (id.equals(defualtMethod.getId())) {
                return Result.fail("不能关闭默认收款方式");
            }
        }

        MemberPaymentMethodEntity paymentMethodEntity = new MemberPaymentMethodEntity();
        paymentMethodEntity.setId(id);
        paymentMethodEntity.setIsDefualt("1");
        this.memberPaymentMethodDao.updateById(paymentMethodEntity);

        if (defualtMethod != null) {
            defualtMethod.setIsDefualt("2");
            this.memberPaymentMethodDao.updateById(defualtMethod);
        }
        return Result.ok("操作成功");
    }

    @Override
@@ -831,6 +871,13 @@
            memberPersonCenterInfoVo.setTradeAgingSetting(MemberPersonCenterInfoVo.PWD_NEED_NO);
        }

        if (StrUtil.isEmpty(member.getName())) {
            memberPersonCenterInfoVo.setNickName(2);
        } else {
            memberPersonCenterInfoVo.setNickName(1);
        }

        memberPersonCenterInfoVo.setIsMb(member.getIsTrader());
        return Result.ok(memberPersonCenterInfoVo);
    }

@@ -1099,6 +1146,19 @@
    }

    @Override
    public Result findDefaultWay() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        DefaultWayVo defaultWayVo = new DefaultWayVo();
        MemberPaymentMethodEntity defualtMethod = this.memberPaymentMethodDao.selectDefualtMethod(memberId, null, "1");
        if (ObjectUtil.isNotEmpty(defualtMethod)) {
            String paymentType = defualtMethod.getPaymentType();
            defaultWayVo.setPaymentType(paymentType);
        }
        return Result.ok(defaultWayVo);
    }

    public Result memberCoinAddressInList() {
        //获取用户ID
        Long memberId = LoginUserUtils.getAppLoginUser().getId();