From 531863f590d1064ca4ec01afe95606dc1c6d9adc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Sep 2021 15:55:20 +0800
Subject: [PATCH] fix register
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d6b93d2..e02856a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -6,10 +6,14 @@
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.AddOrderDto;
import cc.mrbird.febs.mall.dto.AddOrderItemDto;
+import cc.mrbird.febs.mall.dto.PayOrderDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,9 +37,11 @@
private final MallGoodsSkuMapper mallGoodsSkuMapper;
private final MallAddressInfoMapper mallAddressInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
+ private final MallMemberMapper memberMapper;
+ private final IApiMallMemberWalletService memberWalletService;
@Override
- public String createOrder(AddOrderDto addOrderDto) {
+ public Long createOrder(AddOrderDto addOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
MallAddressInfo address = mallAddressInfoMapper.selectById(addOrderDto.getAddressId());
@@ -91,8 +97,64 @@
}
- return orderNo;
+ return orderInfo.getId();
}
+ @Override
+ public void cancelOrder(Long id) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), id);
+ if (orderInfo == null) {
+ throw new FebsException("订单不存在");
+ }
+ if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
+ throw new FebsException("订单不是待付款, 无法取消");
+ }
+
+ orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ orderInfo.setCancelType(MallOrderInfo.CANCEL_BY_SELF);
+ this.baseMapper.updateById(orderInfo);
+ }
+
+ @Override
+ public String payOrder(PayOrderDto payOrderDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
+ if (orderInfo == null) {
+ throw new FebsException("订单不存在");
+ }
+
+ if (OrderStatusEnum.WAIT_PAY.getValue() != orderInfo.getStatus()) {
+ throw new FebsException("订单状态不能支付");
+ }
+
+ switch (payOrderDto.getType()) {
+ case "1":
+ // TODO 微信支付
+ break;
+ case "2":
+ // TODO 支付宝支付
+ break;
+ case "3":
+ return balancePay(orderInfo, payOrderDto.getTradePwd());
+ default:
+
+ }
+ return "";
+ }
+
+ private String balancePay(MallOrderInfo orderInfo, String tradePwd) {
+ if (StrUtil.isBlank(tradePwd)) {
+ throw new FebsException("支付密码错误");
+ }
+
+ MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
+ if (!mallMember.getTradePassword().equals(SecureUtil.md5(tradePwd))) {
+ throw new FebsException("支付密码错误");
+ }
+
+ memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
+ return orderInfo.getOrderNo();
+ }
}
--
Gitblit v1.9.1