modify

Helius

2021-05-25 44d0f6dd3d6c757a388fa9a1c7cdba71cde4bc2f

modify

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

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

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

        OtcBlackList otcBlackList = new OtcBlackList();
        otcBlackList.setMemberId(member.getId());
        otcBlackList.setBlackMemberId(otcOrder.getEntrustMemberId());

 src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java

@@ -1,5 +1,6 @@
package com.xcong.excoin.modules.otc.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
import lombok.Data;
@@ -70,4 +71,7 @@
    private Integer isMb;
    public static final Integer IS_MB_Y = 1;
    public static final Integer IS_MB_N = 2;

    @TableField(exist = false)
    private String payType;
}

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

@@ -19,18 +19,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.OtcEntrustOrderDao;
import com.xcong.excoin.modules.otc.dao.OtcMarketBussinessDao;
import com.xcong.excoin.modules.otc.dao.OtcOrderAppealDao;
import com.xcong.excoin.modules.otc.dao.*;
import com.xcong.excoin.modules.otc.dto.HasPayDto;
import com.xcong.excoin.modules.otc.dto.OrderApealDto;
import com.xcong.excoin.modules.otc.dto.OrderListDto;
import com.xcong.excoin.modules.otc.dto.OtcOrderAddDto;
import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
import com.xcong.excoin.modules.otc.entity.OtcOrder;
import com.xcong.excoin.modules.otc.dao.OtcOrderDao;
import com.xcong.excoin.modules.otc.entity.OtcOrderAppeal;
import com.xcong.excoin.modules.otc.entity.*;
import com.xcong.excoin.modules.otc.service.OtcOrderService;
import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
import com.xcong.excoin.modules.otc.vo.OrderListVo;
@@ -57,6 +51,7 @@
    private final MemberWalletCoinDao memberWalletCoinDao;
    private final MemberDao memberDao;
    private final MemberPaymentMethodDao memberPaymentMethodDao;
    private final OtcBlackListDao otcBlackListDao;


    @Override
@@ -316,6 +311,13 @@
        OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
        MemberEntity saleMember = memberDao.selectById(saleOrder.getMemberId());

        OtcBlackList otcBlackList = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), buyOrder.getEntrustMemberId());
        if (otcBlackList != null) {
            buyDetail.setIsBlack(1);
        } else {
            buyDetail.setIsBlack(2);
        }

        buyDetail.setSaleName(saleMember.getName());

        buyDetail.setBankName(buyOrder.getBankName());
@@ -353,7 +355,6 @@
        }
        MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());


        SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
        saleDetail.setOrderNo(saleOrder.getOrderNo());
        saleDetail.setUsdtAmount(saleOrder.getCoinAmount());
@@ -366,6 +367,12 @@
        saleDetail.setSaleName(buyMember.getName());
        saleDetail.setPayType(saleOrder.getPayType());

        OtcBlackList otcBlackList = otcBlackListDao.selectByMemberIdAndBlackMemberId(member.getId(), saleOrder.getEntrustMemberId());
        if (otcBlackList != null) {
            saleDetail.setIsBlack(1);
        } else {
            saleDetail.setIsBlack(2);
        }
        if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
            OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(saleOrder.getEntrustMemberId());
            saleDetail.setMbId(otcMb.getId());

 src/main/java/com/xcong/excoin/modules/otc/vo/BuyOrderDetailVo.java

@@ -68,4 +68,7 @@

    @ApiModelProperty(value = "剩余秒数")
    private Long times;

    @ApiModelProperty(value = "是否已拉黑 1-是 2-否")
    private Integer isBlack;
}

 src/main/java/com/xcong/excoin/modules/otc/vo/SaleOrderDetailVo.java

@@ -59,4 +59,7 @@

    @ApiModelProperty(value = "剩余秒数")
    private Long times;

    @ApiModelProperty(value = "是否已拉黑")
    private Integer isBlack;
}

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

@@ -31,19 +31,21 @@
    </select>

    <select id="selectEntrustOrderByOrderType" resultType="com.xcong.excoin.modules.otc.entity.OtcEntrustOrder">
        select * from otc_entrust_order
        select a.*, b.payment_type payType
        from otc_entrust_order a
        left join member_payment_method b on a.member_id=b.member_id and b.is_defualt=1
        <where>
            <if test="record.orderType != null and record.orderType != ''" >
               and order_type = #{record.orderType}
               and a.order_type = #{record.orderType}
            </if>
            <if test="record.memberId != null">
                and member_id = #{record.memberId}
                and a.member_id = #{record.memberId}
            </if>
            <if test="record.status != null and record.status == 3">
                and status != #{record.status}
                and a.status != #{record.status}
            </if>
            <if test="record.status != null and record.status != 3">
                and status = #{record.status}
                and a.status = #{record.status}
            </if>
        </where>
    </select>