From d8fb05f44d8969921b7128d92be282176475ee80 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 20 May 2021 10:32:13 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java | 2 ++
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 10 +++++-----
src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 16 ++++++++++++++++
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
index e958f59..18ae926 100644
--- a/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java
@@ -192,4 +192,6 @@
public static final Integer PCSTATE_Y = 0;
public static final Integer PCSTATE_N = 1;
+
+ private String name;
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
index f355d01..3666fdc 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -2,6 +2,7 @@
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.otc.dto.MbAddDto;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
@@ -30,6 +31,7 @@
private final OtcMarketBussinessService otcMarketBussinessService;
private final OtcEntrustOrderService otcEntrustOrderService;
+ private final MemberDao memberDao;
// @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口")
@@ -78,4 +80,18 @@
return this.otcMarketBussinessService.findMbInfo(id);
}
+ @ApiOperation(value = "修改姓名")
+ @PostMapping(value = "/modifyName")
+ public Result modifyName(@RequestBody MbAddDto mbAddDto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ Long memberId = member.getId();
+
+ member = new MemberEntity();
+ member.setId(memberId);
+ member.setName(mbAddDto.getNickname());
+ memberDao.updateById(member);
+
+ return Result.ok("修改成功");
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index b58f507..9c3a8c1 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -160,11 +160,11 @@
throw new GlobalException("订单不存在");
}
- if (OtcOrder.STATUS_PAY.equals(otcOrder.getStatus())) {
+ if (!OtcOrder.STATUS_SUBMIT.equals(otcOrder.getStatus())) {
throw new GlobalException("状态不正确");
}
- if (OtcEntrustOrder.ORDER_TYPE_B.equals(otcOrder.getOrderType())) {
+ if (!OtcEntrustOrder.ORDER_TYPE_B.equals(otcOrder.getOrderType())) {
throw new GlobalException("不是购买单");
}
@@ -181,12 +181,12 @@
throw new GlobalException("订单不存在");
}
- if (OtcOrder.STATUS_PAY.equals(otcOrder.getStatus())) {
+ if (!OtcOrder.STATUS_PAY.equals(otcOrder.getStatus())) {
throw new GlobalException("状态不正确");
}
- if (OtcEntrustOrder.ORDER_TYPE_S.equals(otcOrder.getOrderType())) {
- throw new GlobalException("不是购买单");
+ if (!OtcEntrustOrder.ORDER_TYPE_S.equals(otcOrder.getOrderType())) {
+ throw new GlobalException("不是出售单");
}
OtcOrder buyOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_B);
--
Gitblit v1.9.1