Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

Helius

2021-05-27 7f133cb8fc080b64ab8002b35f04b646f95a6abf

 src/main/java/com/xcong/excoin/modules/otc/controller/OtcBlackListController.java

@@ -1,16 +1,22 @@
package com.xcong.excoin.modules.otc.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xcong.excoin.common.LoginUserUtils;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.otc.dao.OtcBlackListDao;
import com.xcong.excoin.modules.otc.dao.OtcOrderDao;
import com.xcong.excoin.modules.otc.dto.AddBlackDto;
import com.xcong.excoin.modules.otc.dto.BlackListDto;
import com.xcong.excoin.modules.otc.entity.OtcBlackList;
import com.xcong.excoin.modules.otc.entity.OtcOrder;
import com.xcong.excoin.modules.otc.vo.BlackListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +29,7 @@
@Validated
@RestController
@RequestMapping(value = "/api/black")
@Api(value = "OtcBlackListController", tags = "黑名单列表接口类")
@Api(value = "OtcBlackListController", tags = "otc黑名单列表接口类")
public class OtcBlackListController {

    @Autowired
@@ -41,6 +47,15 @@
            return Result.fail("订单不存在");
        }

        OtcBlackList isExist = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), otcOrder.getEntrustMemberId());
        if (isExist != null) {
            return Result.fail("请勿重复拉黑");
        }

        if (member.getId().equals(otcOrder.getEntrustMemberId())) {
            return Result.fail("不能拉黑自己");
        }

        OtcBlackList otcBlackList = new OtcBlackList();
        otcBlackList.setMemberId(member.getId());
        otcBlackList.setBlackMemberId(otcOrder.getEntrustMemberId());
@@ -50,9 +65,15 @@
    }

    @ApiOperation(value = "黑名单列表")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = BlackListVo.class)
    })
    @PostMapping(value = "/blackList")
    public Result blackList() {
        return null;
    public Result blackList(@RequestBody BlackListDto blackListDto) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        Page<BlackListVo> page = new Page<>(blackListDto.getPageNum(), blackListDto.getPageSize());
        IPage<BlackListVo> result = otcBlackListDao.selectBlackListInPage(member.getId(), page);
        return Result.ok(result.getRecords());
    }

    @ApiOperation(value = "删除黑名单")