modify

Helius

2021-05-24 b7d5e7bf6cb6dc2c6455123a7facd9c903aa81c2

modify

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

@@ -539,9 +539,9 @@
        Long memberId = LoginUserUtils.getAppLoginUser().getId();
        MemberEntity member = memberDao.selectById(memberId);

        if (!MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString().equals(memberPaymethodDto.getPaymentType())) {
            return Result.fail("只能绑定银行卡");
        }
//        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"));

 src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java

@@ -14,8 +14,8 @@
    @ApiModelProperty(value = "id - 编辑时传")
    private Long id;

    @NotBlank(message = "昵称不能为空")
    @ApiModelProperty(value = "昵称", example = "123")
    private String nickname;
//    @NotBlank(message = "昵称不能为空")
//    @ApiModelProperty(value = "昵称", example = "123")
//    private String nickname;

}

 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java

@@ -66,6 +66,11 @@

        BigDecimal totalAmount = addDto.getUnitPrice().multiply(addDto.getAmount());
        otcEntrustOrder.setTotalAmount(totalAmount);

        if (addDto.getMax().compareTo(totalAmount) < 0) {
            throw new GlobalException("最大限额应小于总金额");
        }

        if (OtcEntrustOrder.ORDER_TYPE_S.equals(addDto.getType())) {
            MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
            if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {

 src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java

New file
@@ -0,0 +1,48 @@
package com.xcong.excoin.netty.bean;


import java.io.Serializable;

public class ChatRequest implements Serializable {
    private static final long serialVersionUID = 3079080008111369136L;

    private String to;

    private String from;

    private Integer msgType;

    private String content;

    public String getTo() {
        return to;
    }

    public void setTo(String to) {
        this.to = to;
    }

    public String getFrom() {
        return from;
    }

    public void setFrom(String from) {
        this.from = from;
    }

    public Integer getMsgType() {
        return msgType;
    }

    public void setMsgType(Integer msgType) {
        this.msgType = msgType;
    }

    public String getContent() {
        return content;
    }

    public void setContent(String content) {
        this.content = content;
    }
}

 src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java

@@ -88,7 +88,6 @@
    @Override
    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
        log.info("[触发器触发]");
//        super.userEventTriggered(ctx, evt);
        if (evt instanceof IdleStateEvent) {
            IdleStateEvent event = (IdleStateEvent) evt;
            if (event.state() == IdleState.READER_IDLE) {