From 61a8a1b57718b83b6f8ac09e817fabf09e96fdc0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 18:01:56 +0800
Subject: [PATCH] fix(member): 修正会员累计订单统计
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 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 4be125f..404035b 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
@@ -552,7 +552,11 @@
happyActivityOrder.setNumCnt(dto.getNumCnt());
happyActivityOrder.setAmount(amount);
happyActivityOrder.setPayState(StateUpDownEnum.PAY_STATE_NOT_PAY.getCode());
- happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
+ if(BigDecimal.ZERO.compareTo(amount) == 0){
+ happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_NO_PAY.getCode());
+ }else{
+ happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
+ }
happyActivityOrder.setFailTime(failTime);
log.info("创建订单，订单号="+JSONUtil.parse(happyActivityOrder));
happyActivityOrderMapper.insert(happyActivityOrder);
@@ -578,6 +582,7 @@
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("orderId",happyActivityOrder.getId());
stringObjectHashMap.put("amount",amount);
+ stringObjectHashMap.put("payType",happyActivityOrder.getPayType());
stringObjectHashMap.put("failTime",failTime);
return new FebsResponse().success().data(stringObjectHashMap);
@@ -619,6 +624,7 @@
try {
// 根据支付类型处理不同的支付逻辑
if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
+// if (BigDecimal.ZERO.compareTo(happyActivityOrder.getAmount()) == 0) {
// 处理无需支付的订单逻辑
processNoPayOrder(happyActivityOrder, orderId);
} else if (StateUpDownEnum.PAY_METHOD_WECHAT.getCode() == payType) {
@@ -899,31 +905,25 @@
HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
new LambdaQueryWrapper<HappyActivityOrderItem>()
.eq(HappyActivityOrderItem::getCode, orderItemCode)
- .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
.last("limit 1")
);
- if(happyActivityOrderItem != null){
-
- if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("该票号已核销！");
- }
-
- HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
- ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
- apiCheckOrderVo.setActivityName(happyActivity.getName());
- apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
- apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
- apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
- apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
- apiCheckOrderVo.setName(happyActivityOrderItem.getName());
- apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
- apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
- apiCheckOrderVo.setState(happyActivityOrderItem.getState());
-
- return new FebsResponse().success().data(apiCheckOrderVo);
+ if(happyActivityOrderItem == null){
+ throw new FebsException("票号不存在！");
}
- return new FebsResponse().fail().message("核销失败！");
+ HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
+ ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
+ apiCheckOrderVo.setActivityName(happyActivity.getName());
+ apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
+ apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
+ apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
+ apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
+ apiCheckOrderVo.setName(happyActivityOrderItem.getName());
+ apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
+ apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
+ apiCheckOrderVo.setState(happyActivityOrderItem.getState());
+
+ return new FebsResponse().success().data(apiCheckOrderVo);
}
@Override
@@ -942,19 +942,20 @@
HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
new LambdaQueryWrapper<HappyActivityOrderItem>()
.eq(HappyActivityOrderItem::getCode, orderItemCode)
- .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
.last("limit 1")
);
- if(happyActivityOrderItem != null){
- if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
- throw new FebsException("该票号已核销！");
- }
-
- happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
- happyActivityOrderItem.setTransferItemId(memberId);
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
- agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
+ if(happyActivityOrderItem == null){
+ throw new FebsException("票号不存在！");
}
+ if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
+ throw new FebsException("票号已核销！");
+ }
+
+ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
+ happyActivityOrderItem.setTransferItemId(memberId);
+ happyActivityOrderItem.setUpdatedTime(DateUtil.date());
+ happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
+ agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
return new FebsResponse().success().message("操作成功");
}
--
Gitblit v1.9.1