modify

Helius

2021-05-25 2049e6d4ebdf711ded2593808e7b16abaaf6586c

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

@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,15 +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.*;
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.*;
import com.xcong.excoin.modules.otc.service.OtcOrderService;
import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo;
import com.xcong.excoin.modules.otc.vo.OrderListVo;
@@ -48,10 +46,12 @@

    private final OtcMarketBussinessDao otcMarketBussinessDao;
    private final OtcEntrustOrderDao otcEntrustOrderDao;
    private final OtcOrderAppealDao otcOrderAppealDao;
    private final CommonService commonService;
    private final MemberWalletCoinDao memberWalletCoinDao;
    private final MemberDao memberDao;
    private final MemberPaymentMethodDao memberPaymentMethodDao;
    private final OtcBlackListDao otcBlackListDao;


    @Override
@@ -244,9 +244,8 @@
            throw new GlobalException("不是购买单");
        }

        log.info("======={}", hasPayDto.getName());
        if (StrUtil.isBlank(hasPayDto.getName())) {
            MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), 3, "1");
            MemberPaymentMethodEntity defualtMethod = memberPaymentMethodDao.selectDefualtMethod(member.getId(), null, "1");
            hasPayDto.setName(defualtMethod.getName());
        }

@@ -308,9 +307,17 @@
        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());

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

        buyDetail.setSaleName(saleMember.getName());

@@ -326,7 +333,6 @@
            buyDetail.setFinishRatio(otcMb.getFinishRatio());
            buyDetail.setOrderCnt(otcMb.getBuyCnt());
        }


        if (OtcOrder.STATUS_SUBMIT.equals(buyOrder.getStatus())) {
            long between = DateUtil.between(new Date(), DateUtil.offsetMinute(buyOrder.getCreateTime(), 30), DateUnit.SECOND, false);
@@ -350,7 +356,6 @@
        }
        MemberEntity buyMember = memberDao.selectById(saleOrder.getOppositeMemberId());


        SaleOrderDetailVo saleDetail = new SaleOrderDetailVo();
        saleDetail.setOrderNo(saleOrder.getOrderNo());
        saleDetail.setUsdtAmount(saleOrder.getCoinAmount());
@@ -361,7 +366,15 @@
        saleDetail.setIsMb(member.getIsTrader());
        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) {
            saleDetail.setIsBlack(1);
        } else {
            saleDetail.setIsBlack(2);
        }
        if (!saleOrder.getMemberId().equals(saleOrder.getEntrustMemberId())) {
            OtcMarketBussiness otcMb = otcMarketBussinessDao.selectMarketBussinessByMemberId(saleOrder.getEntrustMemberId());
            saleDetail.setMbId(otcMb.getId());
@@ -397,4 +410,29 @@
        otcEntrustOrderDao.updateRemainAmount(otcOrder.getEntrustOrderId(), otcOrder.getCoinAmount());
        this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_CANCEL, null, otcOrder.getOrderNo());
    }

    @Override
    public Result orderApeal(OrderApealDto orderApealDto) {
        MemberEntity member = LoginUserUtils.getAppLoginUser();
        Long memberId = member.getId();
//        long memberId = 446L;
        Long orderId = orderApealDto.getOrderId();
        OtcOrder otcOrder = this.baseMapper.selectById(orderId);
        if(ObjectUtil.isEmpty(otcOrder)){
            return Result.fail("订单不存在");
        }
        String reason = orderApealDto.getReason();
        if(StrUtil.isEmpty(reason)){
            return Result.fail("请填写申诉原因");
        }
        List<String> content = orderApealDto.getContent();
        OtcOrderAppeal otcOrderAppeal = new OtcOrderAppeal();
        otcOrderAppeal.setMemberId(memberId);
        otcOrderAppeal.setOrderId(orderId);
        otcOrderAppeal.setReason(reason);
        otcOrderAppeal.setContent(content.toString());
        otcOrderAppeal.setStatus(OtcOrderAppeal.STATUS_ONE);
        otcOrderAppealDao.insert(otcOrderAppeal);
        return Result.ok("成功");
    }
}