From d42a45cbc8f5caff3e0f83e3e4edd44ce423b380 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 16:43:09 +0800
Subject: [PATCH] feat(pay): 为幸福活动订单项生成代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
index 6f755cb..7b36573 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -471,6 +471,26 @@
}
@Override
+ public FebsResponse expireOrder(ApiExpireOrderDto dto) {
+ if(CollUtil.isEmpty(dto.getIds())){
+ throw new FebsException("请选择订单");
+ }
+
+ dto.getIds().forEach(id -> {
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+ if(ObjectUtil.isNotEmpty(happyActivityOrder)){
+ Long activityId = happyActivityOrder.getActivityId();
+ Integer numCnt = happyActivityOrder.getNumCnt();
+ this.baseMapper.updateHappyActivitySurplusCnt(activityId,numCnt);
+
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ }
+ });
+ return new FebsResponse().success();
+ }
+
+ @Override
public FebsResponse createOrder(ApiCreateOrderDto dto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
if(CollUtil.isEmpty(dto.getConnectIds())){
@@ -504,6 +524,7 @@
if(amount.compareTo(BigDecimal.ZERO) < 0){
throw new FebsException("支付金额错误");
}
+ DateTime failTime = DateUtil.offsetMinute(new Date(), StateUpDownEnum.ORDER_OVERTIME.getCode());
HappyActivityOrder happyActivityOrder = new HappyActivityOrder();
happyActivityOrder.setOrderNo(MallUtils.getOrderNum());
happyActivityOrder.setMemberId(memberId);
@@ -512,6 +533,9 @@
happyActivityOrder.setNumCnt(dto.getNumCnt());
happyActivityOrder.setAmount(amount);
happyActivityOrder.setPayState(StateUpDownEnum.PAY_STATE_NOT_PAY.getCode());
+ happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
+ happyActivityOrder.setFailTime(failTime);
+ log.info("创建订单，订单号="+JSONUtil.parse(happyActivityOrder));
happyActivityOrderMapper.insert(happyActivityOrder);
for(Long connectId : connectIds){
@@ -535,6 +559,7 @@
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("orderId",happyActivityOrder.getId());
stringObjectHashMap.put("amount",amount);
+ stringObjectHashMap.put("failTime",failTime);
return new FebsResponse().success().data(stringObjectHashMap);
}
@@ -598,8 +623,6 @@
log.error("支付失败，订单ID：{}，支付类型：{}", orderId, payType, e);
throw new FebsException("支付失败：" + e.getMessage());
}
-
- // todo 支付失败要把对应的人数加回来
// 构造返回结果，包含支付相关信息
Map<String, Object> map = new HashMap<>();
@@ -689,7 +712,7 @@
LambdaQueryWrapper<HappyActivityOrder> happyActivityOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getMemberId, memberId);
- if(ObjectUtil.isNotEmpty(dto.getState())){
+ if(ObjectUtil.isNotEmpty(dto.getState()) && dto.getState() != 0){
happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getState, dto.getState());
}
happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getDeleteFlag, StateUpDownEnum.DOWN.getCode());
@@ -703,6 +726,7 @@
List<HappyActivity> happyActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<HappyActivity>()
.select(
+ HappyActivity::getId,
HappyActivity::getCategoryId,
HappyActivity::getName,
HappyActivity::getStartTime,
@@ -918,7 +942,7 @@
List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(
new LambdaQueryWrapper<HappyActivityOrder>()
.eq(HappyActivityOrder::getState, StateUpDownEnum.ORDER_STATE_WAIT_PAY.getCode())
- .lt(HappyActivityOrder::getCreatedTime, DateUtil.offsetMinute(new Date(), -10))
+ .lt(HappyActivityOrder::getFailTime, new Date())
);
if(CollUtil.isNotEmpty(happyActivityOrders)){
happyActivityOrders.forEach(happyActivityOrder -> {
@@ -927,7 +951,7 @@
Integer numCnt = happyActivityOrder.getNumCnt();
this.baseMapper.updateHappyActivitySurplusCnt(activityId,numCnt);
- happyActivityOrder.setDeleteFlag(StateUpDownEnum.UP.getCode());
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode());
happyActivityOrderMapper.updateById(happyActivityOrder);
});
}
--
Gitblit v1.9.1