From 864b77ebac060a40bb0a454e53fa851540a4cd19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 May 2020 16:05:22 +0800
Subject: [PATCH] 20200529 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/FindCollectListVo.java | 16 ++++++++++++++++
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 23 +++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 12 ++++++++++++
src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java | 2 ++
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java | 5 +++++
5 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
index 07e9a11..006490e 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java
@@ -15,6 +15,7 @@
import com.xcong.excoin.modules.coin.parameter.dto.CancelEntrustWalletCoinOrderDto;
import com.xcong.excoin.modules.coin.parameter.dto.FindCollectDto;
import com.xcong.excoin.modules.coin.parameter.dto.SubmitSalesWalletCoinOrderDto;
+import com.xcong.excoin.modules.coin.parameter.vo.FindCollectListVo;
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;
@@ -147,4 +148,15 @@
return orderCoinService.checkIsCollect(symbol);
}
+ /**
+ * 已自选的币种
+ * @return
+ */
+ @ApiOperation(value = "已自选的币种", notes = "已自选的币种")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = FindCollectListVo.class)})
+ @GetMapping(value = "/findCollectList")
+ public Result findCollectList() {
+ return orderCoinService.findCollectList();
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/FindCollectListVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/FindCollectListVo.java
new file mode 100644
index 0000000..2d68aad
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/FindCollectListVo.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.coin.parameter.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "FindCollectListVo", description = "币币是否自选返回")
+public class FindCollectListVo {
+
+ @ApiModelProperty(value = "币币自选")
+ private List<MemberSelectSymbolsVo> memberSelectSymbolsVo;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
index aaa695a..8a6f509 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java
@@ -13,6 +13,11 @@
@ApiModel(value = "OrderWalletCoinVo", description = "订单详情")
public class OrderWalletCoinVo {
/**
+ * 订单ID
+ */
+ @ApiModelProperty(value = "ID")
+ private Long id;
+ /**
* 订单编号
*/
@ApiModelProperty(value = "订单编号")
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java b/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
index a69a450..f824d5b 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java
@@ -27,4 +27,6 @@
public Result checkIsCollect(String symbol);
+ public Result findCollectList();
+
}
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 f265187..67c30c7 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
@@ -29,6 +29,7 @@
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinDealMapper;
import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinMapper;
+import com.xcong.excoin.modules.coin.parameter.vo.FindCollectListVo;
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;
@@ -461,4 +462,26 @@
return Result.ok(memberSelectSymbolsVo);
}
+ @Override
+ public Result findCollectList() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectByMap(columnMap);
+
+ FindCollectListVo findCollectListVo = new FindCollectListVo();
+ List<MemberSelectSymbolsVo> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(MemberSelectSymbolsEntity memberSelectSymbolsEntity : selectByMap) {
+ MemberSelectSymbolsVo memberSelectSymbolsVo = new MemberSelectSymbolsVo();
+ memberSelectSymbolsVo.setSymbol(memberSelectSymbolsEntity.getSymbol());
+ arrayList.add(memberSelectSymbolsVo);
+ }
+ }
+ findCollectListVo.setMemberSelectSymbolsVo(arrayList);
+
+ return Result.ok(findCollectListVo);
+ }
+
}
--
Gitblit v1.9.1