From 57cddad3c7841774720eb3112259b0d5b64d3059 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 20 May 2021 10:17:37 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderDao.java | 2 + src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 45 ++++++++++++++++++++++ src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 3 + src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 2 src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java | 2 + src/main/resources/mapper/otc/OtcOrderDao.xml | 5 ++ src/main/resources/mapper/member/MemberWalletCoinDao.xml | 5 ++ src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java | 2 + 8 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java index 66a50dc..0ff2d65 100644 --- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java +++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberWalletCoinDao.java @@ -22,4 +22,6 @@ int subFrozenBalance(@Param("memberId") Long memberId, @Param("id") Long id, @Param("amount") BigDecimal amount); int updateBlockBalance(@Param("id") Long id, @Param("availableBalance") BigDecimal availableBalance, @Param("earlyBalance") BigDecimal earlyBalance, @Param("blockNumber") Integer blockNumber); + + int reduceFrozenBalance(@Param("id") Long id, @Param("amount") BigDecimal amount); } diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java index 9d4605a..f355d01 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java +++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java @@ -69,7 +69,7 @@ } - @ApiOperation(value = "findMbInfo", notes = "获取市商信息") + @ApiOperation(value = "获取市商信息", notes = "获取市商信息") @ApiResponses({ @ApiResponse(code = 200, message = "获取成功", response = MarketBussinessInfoVo.class) }) diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java index bf2f366..6881d04 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java +++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java @@ -56,6 +56,7 @@ @ApiOperation(value = "确认收款") @PostMapping(value = "/finishOrder/{id}") public Result finishOrder(@PathVariable("id") Long id) { - return null; + otcOrderService.finishOrder(id); + return Result.ok("操作成功"); } } diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderDao.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderDao.java index 46705e1..6d44837 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderDao.java +++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderDao.java @@ -16,4 +16,6 @@ IPage<OrderListVo> selectOrdderListInPage(@Param("record") OtcOrder order, Page<OrderListVo> page); int updateOrderStatusByOrderNo(@Param("status") Integer status, @Param("orderNo") String orderNo); + + OtcOrder selectOrderByOrderNoAndType(String orderNo, String orderType); } diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java index 8649544..c0bb223 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java +++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java @@ -16,4 +16,6 @@ IPage<OrderListVo> findOrderListInPage(OrderListDto orderListDto); void hasPay(Long id); + + void finishOrder(Long id); } 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 23c9c20..b58f507 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 @@ -29,6 +29,7 @@ import java.math.BigDecimal; import java.util.Date; +import java.util.List; @Slf4j @Service @@ -155,6 +156,50 @@ public void hasPay(Long id) { OtcOrder otcOrder = this.baseMapper.selectById(id); + if (otcOrder == null) { + throw new GlobalException("订单不存在"); + } + + if (OtcOrder.STATUS_PAY.equals(otcOrder.getStatus())) { + throw new GlobalException("状态不正确"); + } + + if (OtcEntrustOrder.ORDER_TYPE_B.equals(otcOrder.getOrderType())) { + throw new GlobalException("不是购买单"); + } + + this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_PAY, otcOrder.getOrderNo()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void finishOrder(Long id) { + MemberEntity member = LoginUserUtils.getAppLoginUser(); + OtcOrder otcOrder = this.baseMapper.selectById(id); + + if (otcOrder == null) { + throw new GlobalException("订单不存在"); + } + + if (OtcOrder.STATUS_PAY.equals(otcOrder.getStatus())) { + throw new GlobalException("状态不正确"); + } + + if (OtcEntrustOrder.ORDER_TYPE_S.equals(otcOrder.getOrderType())) { + throw new GlobalException("不是购买单"); + } + + OtcOrder buyOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_B); + OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S); + MemberWalletCoinEntity buyWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(buyOrder.getMemberId(), "USDT"); + MemberWalletCoinEntity saleWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(saleOrder.getMemberId(), "USDT"); + + // 购买者钱包可用新增币 + memberWalletCoinDao.updateBlockBalance(buyWallet.getId(), buyOrder.getCoinAmount(), BigDecimal.ZERO, 0); + + // 出售者钱包冻结减少币 + memberWalletCoinDao.reduceFrozenBalance(saleWallet.getId(), buyOrder.getCoinAmount()); + this.baseMapper.updateOrderStatusByOrderNo(OtcOrder.STATUS_PAY, otcOrder.getOrderNo()); } } diff --git a/src/main/resources/mapper/member/MemberWalletCoinDao.xml b/src/main/resources/mapper/member/MemberWalletCoinDao.xml index 79979c5..764eb39 100644 --- a/src/main/resources/mapper/member/MemberWalletCoinDao.xml +++ b/src/main/resources/mapper/member/MemberWalletCoinDao.xml @@ -39,5 +39,10 @@ where id=#{id} </update> + <update id="reduceFrozenBalance"> + update member_wallet_coin + set frozen_balance = frozen_balance - #{amount} + where id=#{id} + </update> </mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml index 3f2277b..de07544 100644 --- a/src/main/resources/mapper/otc/OtcOrderDao.xml +++ b/src/main/resources/mapper/otc/OtcOrderDao.xml @@ -43,4 +43,9 @@ set status=#{status} where order_no=#{orderNo} </update> + + <select id="selectOrderByOrderNoAndType" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder"> + select * from otc_order + where order_no=#{orderNo} and order_type=#{orderType} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1