modify

Helius

2021-05-25 8a55639b2910601436f87e264af3050f6b57ef2f

modify

 src/main/java/com/xcong/excoin/modules/otc/dao/OtcSettingDao.java

New file
@@ -0,0 +1,5 @@
package com.xcong.excoin.modules.otc.dao;


public interface OtcSettingDao {
}

 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java

@@ -160,10 +160,10 @@
    public IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        Page<EntrustListVo> page = new Page<>(dto.getPageNum(), dto.getPageSize());
        List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
        if (CollUtil.isNotEmpty(blackLists)) {
//        List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId());
//        if (CollUtil.isNotEmpty(blackLists)) {
            dto.setMemberId(member.getId());
        }
//        }
        return this.baseMapper.selectEntrustListInPage(dto, page);
    }


 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java

@@ -307,7 +307,7 @@
        buyDetail.setCreateTime(buyOrder.getCreateTime());
        buyDetail.setIsMb(member.getIsTrader());
        buyDetail.setPayName(buyOrder.getPayName());
        buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustOrderId()) ? 1 : 2);
        buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustMemberId()) ? 1 : 2);

        OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
        MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());
@@ -367,7 +367,7 @@
        saleDetail.setPayName(saleOrder.getPayName());
        saleDetail.setSaleName(buyMember.getName());
        saleDetail.setPayType(saleOrder.getPayType());
        saleDetail.setIsOwnEntrust(member.getId().equals(saleOrder.getEntrustOrderId()) ? 1 : 2);
        saleDetail.setIsOwnEntrust(member.getId().equals(saleOrder.getEntrustMemberId()) ? 1 : 2);

        OtcBlackList otcBlackList = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), saleOrder.getEntrustMemberId());
        if (otcBlackList != null) {

 src/main/resources/mapper/otc/OtcEntrustOrderDao.xml

@@ -18,10 +18,10 @@
        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
            <if test="record.memberId != null">
                and e.member_id=#{record.memberId}
            </if>
<!--        inner join otc_black_list e on a.member_id!=e.black_member_id-->
<!--            <if test="record.memberId != null">-->
<!--                and e.member_id=#{record.memberId}-->
<!--            </if>-->
        <where>
            a.status=1 and a.remain_coin_amount > 0
            <if test="record != null">
@@ -29,6 +29,7 @@
                    and order_type = #{record.type}
                </if>
            </if>
            and and a.member_id not in (select black_member_id from otc_black_list x where x.member_id=#{memberId})
        </where>
        order by a.create_time desc
    </select>