src/main/java/com/xcong/excoin/modules/otc/controller/OtcBlackListController.java
@@ -52,6 +52,10 @@ return Result.fail("请勿重复拉黑"); } if (member.getId().equals(otcOrder.getEntrustMemberId())) { return Result.fail("不能拉黑自己"); } OtcBlackList otcBlackList = new OtcBlackList(); otcBlackList.setMemberId(member.getId()); otcBlackList.setBlackMemberId(otcOrder.getEntrustMemberId()); src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -36,7 +36,7 @@ private final MemberDao memberDao; // @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") @PostMapping(value = "/applyMaketBussiness") public Result applyMarketBussiness(@RequestBody MbAddDto mbAddDto) { otcMarketBussinessService.add(mbAddDto); @@ -66,7 +66,7 @@ return Result.ok("修改成功"); } // @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") @GetMapping(value = "/findMarketBussinessStatus") public Result findMarketBussinessStatus() { return Result.ok("获取成功", otcMarketBussinessService.findMbStatus()); src/main/java/com/xcong/excoin/modules/otc/dao/OtcBlackListDao.java
@@ -7,9 +7,13 @@ import com.xcong.excoin.modules.otc.vo.BlackListVo; import org.apache.ibatis.annotations.Param; import java.util.List; public interface OtcBlackListDao extends BaseMapper<OtcBlackList> { OtcBlackList selectByMemberIdAndBlackMemberId(@Param("memberId") Long memberId, @Param("blackMemberId") Long blackMemberId); IPage<BlackListVo> selectBlackListInPage(@Param("memberId") Long memberId, Page<BlackListVo> page); List<OtcBlackList> selectBlackListByMemberId(@Param("memberId") Long memberId); } src/main/java/com/xcong/excoin/modules/otc/entity/OtcSetting.java
New file @@ -0,0 +1,9 @@ package com.xcong.excoin.modules.otc.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data @TableName("otc_setting") public class OtcSetting { } src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -16,10 +16,12 @@ import com.xcong.excoin.modules.member.entity.MemberEntity; import com.xcong.excoin.modules.member.entity.MemberPaymentMethodEntity; import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity; import com.xcong.excoin.modules.otc.dao.OtcBlackListDao; import com.xcong.excoin.modules.otc.dao.OtcMarketBussinessDao; import com.xcong.excoin.modules.otc.dao.OtcOrderDao; import com.xcong.excoin.modules.otc.dto.EntrustOrderAddDto; import com.xcong.excoin.modules.otc.dto.EntrustOrderListDto; import com.xcong.excoin.modules.otc.entity.OtcBlackList; import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder; import com.xcong.excoin.modules.otc.dao.OtcEntrustOrderDao; import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness; @@ -46,6 +48,7 @@ private final MemberWalletCoinDao memberWalletCoinDao; private final OtcOrderDao otcOrderDao; private final CommonService commonService; private final OtcBlackListDao otcBlackListDao; @Override @Transactional(rollbackFor = Exception.class) @@ -157,7 +160,10 @@ public IPage<EntrustListVo> findEntrustListInPage(EntrustOrderListDto dto) { MemberEntity member = LoginUserUtils.getAppLoginUser(); Page<EntrustListVo> page = new Page<>(dto.getPageNum(), dto.getPageSize()); dto.setMemberId(member.getId()); List<OtcBlackList> blackLists = otcBlackListDao.selectBlackListByMemberId(member.getId()); if (CollUtil.isNotEmpty(blackLists)) { dto.setMemberId(member.getId()); } return this.baseMapper.selectEntrustListInPage(dto, page); }
@@ -38,7 +38,6 @@ } OtcMarketBussiness otcMb = new OtcMarketBussiness(); // otcMb.setNikename(mbAddDto.getNickname()); otcMb.setMemberId(member.getId()); otcMb.setAvgCoinTime(0); otcMb.setAvgPayTime(0); src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -307,6 +307,7 @@ buyDetail.setCreateTime(buyOrder.getCreateTime()); buyDetail.setIsMb(member.getIsTrader()); buyDetail.setPayName(buyOrder.getPayName()); buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustOrderId()) ? 1 : 2); OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S); MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId()); @@ -366,6 +367,7 @@ saleDetail.setPayName(saleOrder.getPayName()); saleDetail.setSaleName(buyMember.getName()); saleDetail.setPayType(saleOrder.getPayType()); saleDetail.setIsOwnEntrust(member.getId().equals(saleOrder.getEntrustOrderId()) ? 1 : 2); OtcBlackList otcBlackList = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), saleOrder.getEntrustMemberId()); if (otcBlackList != null) { src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java
@@ -71,4 +71,7 @@ @ApiModelProperty(value = "是否已拉黑 1-是 2-否") private Integer isBlack; @ApiModelProperty(value = "是否自己的委托单 1-是 2-否") private Integer isOwnEntrust; } src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java
@@ -62,4 +62,7 @@ @ApiModelProperty(value = "是否已拉黑") private Integer isBlack; @ApiModelProperty(value = "是否自己的委托单 1-是 2-否") private Integer isOwnEntrust; } src/main/resources/mapper/otc/OtcBlackListDao.xml
@@ -11,4 +11,9 @@ select a.id, a.create_time time, b.name from otc_black_list a, member b where a.black_member_id=b.id and a.member_id=#{memberId} </select> <select id="selectBlackListByMemberId" resultType="com.xcong.excoin.modules.otc.entity.OtcBlackList"> select * from otc_black_list where member_id=#{memberId} </select> </mapper> src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -18,7 +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 and e.member_id=#{record.memberId} 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">
