From 482cb2e21f5dd61f389815a3c1feb3ed80bab9c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Sep 2021 19:12:35 +0800
Subject: [PATCH] fix payOrder
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 e66a8cd..5a68f0e 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,6 +6,7 @@
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallOrderRefundConversion;
import cc.mrbird.febs.mall.dto.*;
@@ -17,6 +18,8 @@
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,13 +55,14 @@
private final MallOrderRefundMapper mallOrderRefundMapper;
private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
+ private final RedisUtils redisUtils;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
- MallAddressInfo address = mallAddressInfoMapper.selectById(addOrderDto.getAddressId());
+ MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
if (address == null) {
throw new FebsException("地址不存在");
}
@@ -119,6 +123,9 @@
orderInfo.setAmount(total);
this.baseMapper.updateById(orderInfo);
+ String redisKey = StrUtil.format(AppContants.REDIS_ORDER_OVERTIME, member.getId(), orderInfo.getId());
+ redisUtils.set(redisKey, orderInfo.getId(), 900);
+
return orderInfo.getId();
}
@@ -174,11 +181,23 @@
}
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
- if (!mallMember.getTradePassword().equals(SecureUtil.md5(tradePwd))) {
+
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("未设置支付密码");
+ }
+
+ if (!SecureUtil.md5(tradePwd).equals(mallMember.getTradePassword())) {
throw new FebsException("支付密码错误");
}
memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
+
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayMethod("积分支付");
+ orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+ orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
return orderInfo.getOrderNo();
}
@@ -211,6 +230,13 @@
OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
orderDetailVo.setOrderRefund(orderRefundVo);
}
+
+ if (OrderStatusEnum.WAIT_PAY.getValue() == orderInfo.getStatus()) {
+ Date endTime = DateUtil.offsetMinute(orderInfo.getOrderTime(), 15);
+
+ long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
+ orderDetailVo.setRemainTime(remainTime);
+ }
return orderDetailVo;
}
--
Gitblit v1.9.1