Merge branch 'follow' of https://gitee.com/chonggaoxiao/new_excoin into follow

Helius

2020-08-07 cd7a3a9b0960e700c4bd9c0f9c57ac3db98b6301

 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);

              }