From 2049e6d4ebdf711ded2593808e7b16abaaf6586c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 17:12:15 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
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 c3f0d07..49cab63 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
@@ -307,6 +307,7 @@
buyDetail.setCreateTime(buyOrder.getCreateTime());
buyDetail.setIsMb(member.getIsTrader());
buyDetail.setPayName(buyOrder.getPayName());
+ buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustOrderId()) ? 1 : 2);
OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());
@@ -366,6 +367,7 @@
saleDetail.setPayName(saleOrder.getPayName());
saleDetail.setSaleName(buyMember.getName());
saleDetail.setPayType(saleOrder.getPayType());
+ saleDetail.setIsOwnEntrust(member.getId().equals(saleOrder.getEntrustOrderId()) ? 1 : 2);
OtcBlackList otcBlackList = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), saleOrder.getEntrustMemberId());
if (otcBlackList != null) {
@@ -423,15 +425,12 @@
if(StrUtil.isEmpty(reason)){
return Result.fail("请填写申诉原因");
}
- String content = orderApealDto.getContent();
- if(StrUtil.isEmpty(content)){
- return Result.fail("请填写申诉内容");
- }
+ List<String> content = orderApealDto.getContent();
OtcOrderAppeal otcOrderAppeal = new OtcOrderAppeal();
otcOrderAppeal.setMemberId(memberId);
otcOrderAppeal.setOrderId(orderId);
otcOrderAppeal.setReason(reason);
- otcOrderAppeal.setContent(content);
+ otcOrderAppeal.setContent(content.toString());
otcOrderAppeal.setStatus(OtcOrderAppeal.STATUS_ONE);
otcOrderAppealDao.insert(otcOrderAppeal);
return Result.ok("成功");
--
Gitblit v1.9.1