From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 141 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 110 insertions(+), 31 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 27f52ae..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
@@ -14,10 +14,7 @@
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.mall.dto.ApiOperateDoDto;
-import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderInfoVo;
-import cc.mrbird.febs.mall.vo.activity.ApiActivityOrderListVo;
-import cc.mrbird.febs.mall.vo.activity.ApiCheckOrderVo;
-import cc.mrbird.febs.mall.vo.activity.ApiVoteActivityHotVo;
+import cc.mrbird.febs.mall.vo.activity.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
@@ -418,6 +415,7 @@
new LambdaQueryWrapper<HappyActivityConnect>()
.eq(HappyActivityConnect::getMemberId, memberId)
.eq(HappyActivityConnect::getName, dto.getName())
+ .eq(HappyActivityConnect::getPhone, dto.getPhone())
);
if(CollUtil.isNotEmpty(happyActivityConnects)){
throw new FebsException("已经添加过该联系人");
@@ -474,6 +472,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())){
@@ -487,6 +505,24 @@
}
Long activityId = dto.getActivityId();
+
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getActivityId, activityId)
+ .in(HappyActivityOrderItem::getConnectId, connectIds)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ //stream流操作happyActivityOrderItems，返回一个orderId的Set集合
+ Set<Long> orderIdSet = happyActivityOrderItems.stream().map(HappyActivityOrderItem::getOrderId).collect(Collectors.toSet());
+ List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrder>()
+ .in(HappyActivityOrder::getId, orderIdSet)
+ .in(HappyActivityOrder::getState, Arrays.asList(StateUpDownEnum.ORDER_STATE_WAIT_PAY.getCode(),StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode()))
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrders)){
+ throw new FebsException("有报名人重复报名了活动，请重新选择");
+ }
+ }
HappyActivity happyActivity = this.baseMapper.selectById(activityId);
if (ObjectUtil.isEmpty(happyActivity)) {
throw new FebsException("活动不存在");
@@ -507,6 +543,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);
@@ -515,6 +552,13 @@
happyActivityOrder.setNumCnt(dto.getNumCnt());
happyActivityOrder.setAmount(amount);
happyActivityOrder.setPayState(StateUpDownEnum.PAY_STATE_NOT_PAY.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);
for(Long connectId : connectIds){
@@ -538,6 +582,8 @@
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);
}
@@ -578,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) {
@@ -601,8 +648,6 @@
log.error("支付失败，订单ID：{}，支付类型：{}", orderId, payType, e);
throw new FebsException("支付失败：" + e.getMessage());
}
-
- // todo 支付失败要把对应的人数加回来
// 构造返回结果，包含支付相关信息
Map<String, Object> map = new HashMap<>();
@@ -692,7 +737,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());
@@ -706,6 +751,7 @@
List<HappyActivity> happyActivities = this.baseMapper.selectList(
new LambdaQueryWrapper<HappyActivity>()
.select(
+ HappyActivity::getId,
HappyActivity::getCategoryId,
HappyActivity::getName,
HappyActivity::getStartTime,
@@ -755,7 +801,7 @@
List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
new LambdaQueryWrapper<HappyActivityOrderItem>()
- .eq(HappyActivityOrderItem::getOrderId, happyActivityOrder.getActivityId())
+ .eq(HappyActivityOrderItem::getOrderId, happyActivityOrder.getId())
.eq(HappyActivityOrderItem::getMemberId, memberId)
);
if(CollUtil.isNotEmpty(happyActivityOrderItems)){
@@ -859,31 +905,58 @@
HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
new LambdaQueryWrapper<HappyActivityOrderItem>()
.eq(HappyActivityOrderItem::getCode, orderItemCode)
- .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
.last("limit 1")
);
- if(happyActivityOrderItem != null){
- happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
- happyActivityOrderItem.setTransferItemId(memberId);
- happyActivityOrderItemMapper.updateById(happyActivityOrderItem);
-
- agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());
-
- 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());
-
- 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
+ public FebsResponse insureOrder(ApiCheckOrderDto dto) {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+
+ if(StateUpDownEnum.UP.getCode() != mallMember.getCheckOrder()){
+ throw new FebsException("您不是核销员！");
+ }
+
+ String orderItemCode = dto.getOrderItemCode();
+
+ HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getCode, orderItemCode)
+ .last("limit 1")
+ );
+ 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("操作成功");
}
/**
@@ -921,7 +994,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 -> {
@@ -930,7 +1003,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);
});
}
@@ -966,6 +1039,12 @@
}
@Override
+ public List<ApiActivityCommentVo> commentByActivityId(ApiActivityCommentDto dto) {
+ Page<ApiActivityCommentVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ return this.baseMapper.selectActivityCommentPage(page,dto);
+ }
+
+ @Override
public FebsResponse voteActivityHot(Long id) {
ApiVoteActivityHotVo apiVoteActivityHotVo = new ApiVoteActivityHotVo();
--
Gitblit v1.9.1