From 987b08f018be10550d6f48242633bd9a1d85a865 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 02 Jun 2020 16:28:03 +0800
Subject: [PATCH] 20200602 代码提交
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 4 ++--
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java | 7 +++++--
src/main/java/com/xcong/excoin/modules/coin/service/OrderCoinService.java | 2 +-
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java | 6 ++++++
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java | 2 ++
src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml | 12 ++++++++++++
6 files changed, 28 insertions(+), 5 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 ec7bc9d..4202ea9 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
@@ -102,9 +102,12 @@
*/
@ApiOperation(value = "获取币币交易历史订单信息", notes = "获取币币交易历史订单信息")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinDealListVo.class)})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+ })
@GetMapping(value = "/findAllWalletCoinOrder")
- public Result findAllWalletCoinOrder() {
- return orderCoinService.findAllWalletCoinOrder();
+ public Result findAllWalletCoinOrder(String symbol) {
+ return orderCoinService.findAllWalletCoinOrder(symbol);
}
/**
diff --git a/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java b/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
index 1d3f4d8..9d4ec60 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java
@@ -11,6 +11,8 @@
List<OrderCoinsDealEntity> selectAllWalletCoinOrder(@Param("memberId")Long memberId);
+ List<OrderCoinsDealEntity> selectAllWalletCoinOrderBySymbol(@Param("memberId")Long memberId,@Param("symbol")String symbol);
+
OrderCoinsDealEntity selectWalletCoinOrder(@Param("memberId")Long memberId,@Param("orderId")Long orderId);
}
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
index 649f2a5..0b5d4a7 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinDealVo.java
@@ -63,6 +63,12 @@
@ApiModelProperty(value = "成交金额")
private BigDecimal dealAmount;
/**
+ * 状态 2：撤单3：已成交
+ */
+ @ApiModelProperty(value = "状态 2：撤单3：已成交")
+ private Integer orderStatus;
+
+ /**
* 手续费
*/
@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 d073e3c..9ca2106 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
@@ -19,7 +19,7 @@
public Result cancelEntrustWalletCoinOrder(String orderId);
- public Result findAllWalletCoinOrder();
+ public Result findAllWalletCoinOrder(String symbol);
public Result findWalletCoinOrder(Long orderId);
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 0136a1e..f8d0554 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
@@ -391,14 +391,14 @@
}
@Override
- public Result findAllWalletCoinOrder() {
+ public Result findAllWalletCoinOrder(String symbol) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
OrderWalletCoinDealListVo orderWalletCoinDealListVo = new OrderWalletCoinDealListVo();
List<OrderWalletCoinDealVo> arrayList = new ArrayList<OrderWalletCoinDealVo>();
- List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrder(memberId);
+ List<OrderCoinsDealEntity> selectAllWalletCoinOrder = orderCoinDealDao.selectAllWalletCoinOrderBySymbol(memberId,symbol);
if(CollUtil.isNotEmpty(selectAllWalletCoinOrder)) {
for(OrderCoinsDealEntity orderCoinsDealEntity: selectAllWalletCoinOrder) {
OrderWalletCoinDealVo entityToVo = OrderWalletCoinDealMapper.INSTANCE.entityToVoOrder(orderCoinsDealEntity);
diff --git a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
index 998f72d..f498ab6 100644
--- a/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
+++ b/src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml
@@ -11,6 +11,18 @@
</where>
order by create_time desc
</select>
+ <select id="selectAllWalletCoinOrderBySymbol" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
+ select * from coins_order_deal
+ <where>
+ <if test="memberId != null and memberId != ''">
+ and member_id = #{memberId}
+ </if>
+ <if test="symbol != null and symbol != ''">
+ and symbol = #{symbol}
+ </if>
+ </where>
+ order by create_time desc
+ </select>
<select id="selectWalletCoinOrder" resultType="com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity">
select * from coins_order_deal where order_id= #{orderId} and member_id = #{memberId}
--
Gitblit v1.9.1