From a627e9c243bd0de94d65fc178895491cf3a05c1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 20:36:35 +0800
Subject: [PATCH] conflex
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 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 b81522d..5278912 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
@@ -12,11 +13,14 @@
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.service.MallMemberService;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -32,9 +36,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
/**
* @author wzy
@@ -55,7 +57,10 @@
private final MallOrderRefundMapper mallOrderRefundMapper;
private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
+ private final IApiMallMemberService memberService;
private final RedisUtils redisUtils;
+
+ private final AgentProducer agentProducer;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -124,9 +129,7 @@
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);
-
+ agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
return orderInfo.getId();
}
@@ -150,7 +153,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public String payOrder(PayOrderDto payOrderDto) {
+ public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
@@ -161,19 +164,38 @@
throw new FebsException("订单状态不能支付");
}
+ String orderNo = "";
switch (payOrderDto.getType()) {
case "1":
- // TODO 微信支付
+ orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+ orderInfo.setPayImage(payOrderDto.getPayImage());
+ orderInfo.setPayMethod("微信支付");
break;
case "2":
- // TODO 支付宝支付
+ orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+ orderInfo.setPayImage(payOrderDto.getPayImage());
+ orderInfo.setPayMethod("支付宝支付");
break;
case "3":
- return balancePay(orderInfo, payOrderDto.getTradePwd());
+ orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());
+
+ orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+ orderInfo.setPayMethod("积分支付");
default:
}
- return "";
+
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
+
+ memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderNo", orderNo);
+ map.put("orderId", orderInfo.getId());
+ return map;
}
private String balancePay(MallOrderInfo orderInfo, String tradePwd) {
@@ -193,12 +215,6 @@
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();
}
@@ -259,6 +275,9 @@
orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
orderInfo.setReceivingTime(new Date());
this.baseMapper.updateById(orderInfo);
+
+ agentProducer.sendAutoLevelUpMsg(member.getId());
+ agentProducer.sendReturnMoneyMsg(orderInfo.getId());
}
@Override
@@ -344,4 +363,19 @@
operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getName(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
mallOrderRefundOperationMapper.insert(operation);
}
+
+ @Override
+ public void autoCancelOrder(Long id) {
+ MallOrderInfo orderInfo = this.baseMapper.selectById(id);
+ if (orderInfo == null) {
+ log.error("自动取消订单参数错误:{}", id);
+ return;
+ }
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) {
+ log.info("自动取消订单:{},{}", orderInfo.getMemberId(), id);
+ orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
+ orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
+ this.baseMapper.updateById(orderInfo);
+ }
+ }
}
--
Gitblit v1.9.1