From b7d5e7bf6cb6dc2c6455123a7facd9c903aa81c2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 11:16:00 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 5 ++
src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java | 6 +-
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 6 +-
src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java | 48 ++++++++++++++++++++++++
src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java | 1
5 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index bbb6822..f0168a0 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/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"));
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java
index 1963888..da31baa 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/dto/MbAddDto.java
+++ b/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;
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 770eb57..35e9229 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/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) {
diff --git a/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java b/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java
new file mode 100644
index 0000000..ea7ab2b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/netty/bean/ChatRequest.java
@@ -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;
+ }
+}
diff --git a/src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java b/src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java
index 3e57246..2ceb827 100644
--- a/src/main/java/com/xcong/excoin/netty/handler/WebSocketServerHandler.java
+++ b/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) {
--
Gitblit v1.9.1