From db34efa087eac4f89a2ae5911ffba9b32797024e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 27 May 2020 17:48:33 +0800
Subject: [PATCH] 20200527  代码提交

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
index d3aa7ad..4d13205 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
@@ -35,6 +35,7 @@
 import com.xcong.excoin.modules.coin.parameter.vo.MemberSelectSymbolsVo;
 import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealListVo;
 import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealVo;
+import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinListVo;
 import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinVo;
 import com.xcong.excoin.modules.coin.parameter.vo.TransactionPageOfWalletCoinVo;
 import com.xcong.excoin.modules.coin.service.OrderCoinService;
@@ -304,10 +305,18 @@
 	public Result getEntrustWalletCoinOrder(String symbol, Integer status) {
 		//获取用户ID
 		Long memberId = LoginUserUtils.getAppLoginUser().getId();
+		OrderWalletCoinListVo orderWalletCoinListVo = new OrderWalletCoinListVo();
 		
-		OrderCoinsEntity orderCoin = orderCoinsDao.findCoinOrderListByMemberIdAndSysmbol(memberId, symbol, status);
-		OrderWalletCoinVo entityToVo = OrderWalletCoinMapper.INSTANCE.entityToVo(orderCoin);
-		return Result.ok(entityToVo);
+		List<OrderWalletCoinVo> arrayList = new ArrayList<>();
+		List<OrderCoinsEntity> findCoinOrderListByMemberIdAndSysmbol = orderCoinsDao.findCoinOrderListByMemberIdAndSysmbol(memberId, symbol, status);
+		if(CollUtil.isNotEmpty(findCoinOrderListByMemberIdAndSysmbol)) {
+			for(OrderCoinsEntity orderCoinsEntity : findCoinOrderListByMemberIdAndSysmbol) {
+				OrderWalletCoinVo entityToVo = OrderWalletCoinMapper.INSTANCE.entityToVo(orderCoinsEntity);
+				arrayList.add(entityToVo);
+			}
+		}
+		orderWalletCoinListVo.setOrderWalletCoinVo(arrayList);
+		return Result.ok(arrayList);
 	}
 
 	@Override

--
Gitblit v1.9.1