From c6f226f7f9f9aa46c27db28d6796cd15d101cfe9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 15:37:38 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml | 1 +
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 2 ++
src/main/java/com/xcong/excoin/modules/otc/dto/EntrustOrderListDto.java | 3 +++
src/main/resources/application.yml | 2 +-
4 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dto/EntrustOrderListDto.java b/src/main/java/com/xcong/excoin/modules/otc/dto/EntrustOrderListDto.java
index 0201df3..0f9b2e8 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/dto/EntrustOrderListDto.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/dto/EntrustOrderListDto.java
@@ -24,4 +24,7 @@
@NotBlank
@ApiModelProperty(value = "类型", example = "B-买 S-卖")
private String type;
+
+ @ApiModelProperty(hidden = true)
+ private Long memberId;
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 602b11a..532df17 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -155,7 +155,9 @@
@Override
public IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto) {
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
Page<EntrustListVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+ dto.setMemberId(member.getId());
return this.baseMapper.selectEntrustListInPage(dto, page);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d0d7807..7574bc3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -108,7 +108,7 @@
loop-job: false
rabbit-consumer: false
block-job: false
- otc-job: true
+ otc-job: false
aliyun:
oss:
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index da41c89..e164ebb 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -18,6 +18,7 @@
left join otc_market_bussiness b on a.member_id=b.member_id
left join member c on a.member_id=c.id
left join member_payment_method d on a.member_id=d.member_id and d.is_defualt=1
+ inner join otc_black_list e on a.member_id!=e.black_member_id and e.member_id=#{record.memberId}
<where>
a.status=1 and a.remain_coin_amount > 0
<if test="record != null">
--
Gitblit v1.9.1