From e21fb7543c9199cfbaa7f44e99133eb747ad742c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 25 May 2021 15:04:17 +0800 Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc --- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java index 063802d..c422f84 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java +++ b/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; @@ -20,13 +21,16 @@ 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.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.service.OtcOrderService; import com.xcong.excoin.modules.otc.vo.BuyOrderDetailVo; import com.xcong.excoin.modules.otc.vo.OrderListVo; @@ -48,6 +52,7 @@ private final OtcMarketBussinessDao otcMarketBussinessDao; private final OtcEntrustOrderDao otcEntrustOrderDao; + private final OtcOrderAppealDao otcOrderAppealDao; private final CommonService commonService; private final MemberWalletCoinDao memberWalletCoinDao; private final MemberDao memberDao; @@ -396,4 +401,32 @@ 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("请填写申诉原因"); + } + String content = orderApealDto.getContent(); + if(StrUtil.isEmpty(content)){ + return Result.fail("请填写申诉内容"); + } + OtcOrderAppeal otcOrderAppeal = new OtcOrderAppeal(); + otcOrderAppeal.setMemberId(memberId); + otcOrderAppeal.setOrderId(orderId); + otcOrderAppeal.setReason(reason); + otcOrderAppeal.setContent(content); + otcOrderAppeal.setStatus(OtcOrderAppeal.STATUS_ONE); + otcOrderAppealDao.insert(otcOrderAppeal); + return Result.ok("成功"); + } } -- Gitblit v1.9.1