From ca5353f982bc8b6a5cf50b9941b79939510e7eee Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Aug 2020 18:00:54 +0800
Subject: [PATCH] 20200821
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 5a23cb7..933c8e5 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -874,8 +874,9 @@
BigDecimal allRewardRatio = BigDecimal.ZERO;
Long orderId = contractOrderEntity.getId();
+ String orderNo = contractOrderEntity.getOrderNo();
Map<String, Object> columnMapRelation = new HashMap<>();
- columnMapRelation.put("trade_order_no", orderId);
+ columnMapRelation.put("trade_order_no", orderNo);
columnMapRelation.put("trade_member_id", memberId);
columnMapRelation.put("order_type", 2);
columnMapRelation.put("is_show", 1);
@@ -927,7 +928,7 @@
myFollowOrderVo.setOpeningTime(openingTime);
Date closingTime = contractOrderEntity.getClosingTime();
myFollowOrderVo.setClosingTime(closingTime);
- String orderNo = contractOrderEntity.getOrderNo();
+
myFollowOrderVo.setOrderNo(orderNo);
myFollowOrderVos.add(myFollowOrderVo);
}
@@ -1000,7 +1001,7 @@
FollowTraderInfoEntity traderInfoEntity = followTraderInfoDao.selectTraderInfoByMemberId(memberId);
if (traderInfoEntity != null) {
- LogRecordUtils.insertFollowerNotice(memberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));
+ LogRecordUtils.insertFollowerNotice(followMemberId, NoticeConstant.STOP_FOLLOW_TITLE, StrUtil.format(NoticeConstant.STOP_FOLLOW_CONTENT, traderInfoEntity.getNickname()));
}
return Result.ok(MessageSourceUtils.getString("member_service_0026"));
}
--
Gitblit v1.9.1