From f91a65805c27c2bb01eb94f1ec9c2afa07a44020 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 11 Aug 2020 11:29:20 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..c9beb3a 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);
}
--
Gitblit v1.9.1