src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -32,14 +32,14 @@ private final OtcEntrustOrderService otcEntrustOrderService; @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") // @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") @PostMapping(value = "/applyMaketBussiness") public Result applyMarketBussiness(@RequestBody MbAddDto mbAddDto) { otcMarketBussinessService.add(mbAddDto); return Result.ok("申请成功, 等待审核"); } @ApiOperation(value = "modifyMarketBussiness", notes = "修改个人信息") // @ApiOperation(value = "modifyMarketBussiness", notes = "修改个人信息") @PostMapping(value = "/modifyMarketBussiness") public Result modifyMarketBussiness(@RequestBody MbAddDto mbAddDto) { if (mbAddDto.getId() == null) { @@ -62,12 +62,13 @@ return Result.ok("修改成功"); } @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") // @ApiOperation(value = "findMarketBussinessStatus", notes = "获取市商申请状态接口") @GetMapping(value = "/findMarketBussinessStatus") public Result findMarketBussinessStatus() { return Result.ok("获取成功", otcMarketBussinessService.findMbStatus()); } @ApiOperation(value = "findMbInfo", notes = "获取市商信息") @ApiResponses({ @ApiResponse(code = 200, message = "获取成功", response = MarketBussinessInfoVo.class) src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java
@@ -52,8 +52,8 @@ return null; } @ApiOperation(value = "完成订单") @PostMapping(value = "/finishSalesOrder/{id}") @ApiOperation(value = "确认收款") @PostMapping(value = "/finishOrder/{id}") public Result finishOrder(@PathVariable("id") Long id) { return null; } src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -40,7 +40,6 @@ @RequiredArgsConstructor public class OtcEntrustOrderServiceImpl extends ServiceImpl<OtcEntrustOrderDao, OtcEntrustOrder> implements OtcEntrustOrderService { private final OtcMarketBussinessDao otcMarketBussinessDao; private final MemberDao memberDao; private final MemberPaymentMethodDao memberPaymentMethodDao; private final MemberWalletCoinDao memberWalletCoinDao; @@ -75,11 +74,10 @@ memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), totalAmount); } OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId()); if (mb == null) { // OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId()); if (member.getIsTrader() == 2) { otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_N); } else { otcEntrustOrder.setMbId(mb.getId()); otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_Y); } @@ -114,11 +112,9 @@ throw new GlobalException("类型错误"); } OtcMarketBussiness mb = otcMarketBussinessDao.selectMarketBussinessByMemberId(member.getId()); if (mb == null) { if (member.getIsTrader() == 2) { otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_N); } else { otcEntrustOrder.setMbId(mb.getId()); otcEntrustOrder.setIsMb(OtcEntrustOrder.IS_MB_Y); }
@@ -62,7 +62,7 @@ @Override public Result findMbInfo(Long id) { OtcMarketBussiness mb = this.baseMapper.selectById(id); OtcMarketBussiness mb = this.baseMapper.selectMarketBussinessByMemberId(id); if (mb == null) { return Result.fail("未找到对应信息"); } src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -1,12 +1,15 @@ package com.xcong.excoin.modules.otc.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xcong.excoin.common.LoginUserUtils; import com.xcong.excoin.common.exception.GlobalException; import com.xcong.excoin.common.system.service.CommonService; import com.xcong.excoin.modules.member.dao.MemberDao; import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao; import com.xcong.excoin.modules.member.entity.MemberEntity; import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity; @@ -35,6 +38,7 @@ private final OtcEntrustOrderDao otcEntrustOrderDao; private final CommonService commonService; private final MemberWalletCoinDao memberWalletCoinDao; private final MemberDao memberDao; @Override @Transactional(rollbackFor = Exception.class) @@ -93,6 +97,15 @@ throw new GlobalException("无法出售"); } if (StrUtil.isBlank(orderAddDto.getPassword())) { throw new GlobalException("资金密码不能为空"); } MemberEntity memberEntity = memberDao.selectById(member.getId()); if (!SecureUtil.md5(orderAddDto.getPassword()).equals(memberEntity.getTradePassword())) { throw new GlobalException("资金密码错误"); } BigDecimal cny = orderAddDto.getUsdtAmount().multiply(entrustOrder.getUnitPrice()); if (cny.compareTo(orderAddDto.getCnyAmount()) != 0) { throw new GlobalException("数量与金额不符"); src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -6,7 +6,7 @@ select a.id, b.id mbId ,b.nikename nickname ,c.name nickname ,a.unit_price unitPrice ,a.remain_coin_amount amount ,a.limit_min_amount min @@ -14,7 +14,8 @@ ,b.total_order_cnt orderCnt ,b.finish_ratio finishRatio from otc_entrust_order a left join otc_market_bussiness b on a.mb_id=b.id left join otc_market_bussiness b on a.member_id=b.member_id left join member c on a.member_id=c.id <where> a.status=1 <if test="record != null">
