From 1fc8fde81cbf79ebe95e927f9099cf94c2ccc6e5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 17:39:04 +0800
Subject: [PATCH] refactor(mall): 优化退款流程和逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java | 673 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 595 insertions(+), 78 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 05d3b88..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
@@ -7,15 +7,17 @@
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.mall.dto.*;
-import cc.mrbird.febs.mall.dto.activity.ApiVoteOptionInPageDto;
+import cc.mrbird.febs.mall.dto.activity.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.HappyActivityService;
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.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
@@ -35,6 +37,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.function.Function;
import java.util.stream.Collectors;
@Slf4j
@@ -48,9 +51,12 @@
private final HappyActivityOptionMapper happyActivityOptionMapper;
private final HappyActivityConnectMapper happyActivityConnectMapper;
private final HappyActivityOrderMapper happyActivityOrderMapper;
+ private final HappyActivityCommentMapper happyActivityCommentMapper;
private final HappyActivityOrderItemMapper happyActivityOrderItemMapper;
private final IXcxPayService iXcxPayService;
private final IApiMallMemberWalletService iApiMallMemberWalletService;
+ private final HappyActivityCategoryMapper happyActivityCategoryMapper;
+ private final AgentProducer agentProducer;
@Override
public FebsResponse activityList(ApiActivityInfoDto dto) {
@@ -62,56 +68,33 @@
// 检查分页结果是否包含数据
if(CollUtil.isNotEmpty(happyActivityPage.getRecords())){
List<ApiActivityInfoVo> records = happyActivityPage.getRecords();
- // 使用Stream流操作records，获取所有活动的ID
- List<Long> ids = records.stream().map(ApiActivityInfoVo::getId).collect(Collectors.toList());
-
- // 查询关注点赞转发记录，筛选出关注活动类型且未删除的关注记录，并按ID升序排序，限制结果数量为3
- List<HappyFollow> happyFollows = happyFollowMapper.selectList(
- new LambdaQueryWrapper<HappyFollow>()
- .select(HappyFollow::getMemberId)
- .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
- .in(HappyFollow::getSourceId, ids)
- .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
- .orderByAsc(HappyFollow::getId)
- .last("limit 3")
- );
-
- // 检查关注记录是否不为空
- if(CollUtil.isNotEmpty(happyFollows)){
- // 使用Stream流操作关注记录，获取所有成员ID的集合
- Set<Long> memberIds = happyFollows.stream().collect(Collectors.mapping(HappyFollow::getMemberId, Collectors.toSet()));
-
- // 查询成员信息，获取成员的ID和头像
- List<MallMember> mallMembers = mallMemberMapper.selectList(
- new LambdaQueryWrapper<MallMember>()
- .select(MallMember::getId,MallMember::getAvatar)
- .in(MallMember::getId, memberIds)
+ // 遍历活动记录，为每个活动添加成员头像信息
+ records.forEach(record -> {
+ // 查询关注点赞转发记录，筛选出关注活动类型且未删除的关注记录，并按ID升序排序，限制结果数量为3
+ List<HappyFollow> happyFollows = happyFollowMapper.selectList(
+ new LambdaQueryWrapper<HappyFollow>()
+ .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
+ .eq(HappyFollow::getSourceId, record.getId())
+ .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ .groupBy(HappyFollow::getMemberId)
+ .orderByAsc(HappyFollow::getId)
+ .last("limit 3")
);
+ // 检查关注记录是否不为空
+ if(CollUtil.isNotEmpty(happyFollows)){
+ // 使用Stream流操作关注记录，获取所有成员ID的集合
+ Set<Long> memberIds = happyFollows.stream().collect(Collectors.mapping(HappyFollow::getMemberId, Collectors.toSet()));
- // 使用Stream流操作成员信息，生成一个以成员ID为键，成员信息为值的Map
- Map<Long, MallMember> memberMap = mallMembers.stream()
- .collect(Collectors.toMap(MallMember::getId, member -> member));
-
- // 使用Stream流操作关注记录，生成一个以活动ID为键，成员ID列表为值的Map
- Map<Long, List<Long>> followMap = happyFollows.stream()
- .collect(Collectors.groupingBy(
- HappyFollow::getSourceId,
- Collectors.mapping(HappyFollow::getMemberId, Collectors.toList())
- ));
-
- // 遍历活动记录，为每个活动添加成员头像信息
- records.forEach(record -> {
- List<Long> memberIdsForRecord = followMap.get(record.getId());
- if (CollUtil.isNotEmpty(memberIdsForRecord)) {
- List<String> memberAvatars = memberIdsForRecord.stream()
- .map(memberMap::get)
- .filter(member -> member != null)
- .map(MallMember::getAvatar)
- .collect(Collectors.toList());
- record.setMemberAvatars(memberAvatars);
- }
- });
- }
+ // 查询成员信息，获取成员的ID和头像
+ List<MallMember> mallMembers = mallMemberMapper.selectList(
+ new LambdaQueryWrapper<MallMember>()
+ .select(MallMember::getAvatar)
+ .in(MallMember::getId, memberIds)
+ );
+ List<String> memberAvatars = mallMembers.stream().map(MallMember::getAvatar).collect(Collectors.toList());
+ record.setMemberAvatars(memberAvatars);
+ }
+ });
}
// 返回成功响应，包含活动分页数据
return new FebsResponse().success().data(happyActivityPage);
@@ -124,12 +107,38 @@
HappyActivity happyActivity = this.baseMapper.selectOne(
new LambdaQueryWrapper<HappyActivity>()
.eq(HappyActivity::getId, dto.getId())
- .eq(HappyActivity::getType, dto.getType())
.eq(HappyActivity::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
.ne(HappyActivity::getState, StateUpDownEnum.ACTIVITY_STATE_NOT_START.getCode())
);
if(happyActivity != null){
BeanUtil.copyProperties(happyActivity,apiActivityVo);
+
+ Integer commentCount = happyActivityCommentMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityComment>()
+ .eq(HappyActivityComment::getActivityId, happyActivity.getId())
+ .eq(HappyActivityComment::getShowState, StateUpDownEnum.UP.getCode())
+ );
+ apiActivityVo.setCommentCount(commentCount);
+
+ List<HappyFollow> happyFollows = happyFollowMapper.selectList(
+ new LambdaQueryWrapper<HappyFollow>()
+ .select(HappyFollow::getId, HappyFollow::getType)
+ .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
+ .eq(HappyFollow::getSourceId, happyActivity.getId())
+ .in(HappyFollow::getType, Arrays.asList(StateUpDownEnum.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
+ .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ if(CollUtil.isNotEmpty(happyFollows)){
+ // 使用Stream流操作happyFollows，按照type分类，返回每一个不同type的总数量，并返回一个Map
+ Map<Integer, Long> typeCountMap = happyFollows.stream()
+ .collect(Collectors.groupingBy(HappyFollow::getType, Collectors.counting()));
+ Long zanCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.LIKE.getCode()), 0L);
+ apiActivityVo.setZanCnt(Math.toIntExact(zanCnt));
+ Long sendCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.SHARE.getCode()), 0L);
+ apiActivityVo.setSendCnt(Math.toIntExact(sendCnt));
+ }
+
+
}
return new FebsResponse().success().data(apiActivityVo);
}
@@ -143,6 +152,14 @@
}
@Override
+ public FebsResponse voteOptionRecordInPage(ApiVoteOptionRecordInPageDto dto) {
+ // 创建分页对象，传入当前页和每页大小
+ Page<ApiActivityOptionListVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
+ Page<ApiActivityOptionListVo> voteRecordInPage = this.baseMapper.getVoteOptionRecordInPage(page, dto);
+ return new FebsResponse().success().data(voteRecordInPage);
+ }
+
+ @Override
public FebsResponse voteOption(Long id) {
ApiActivityOptionVo apiActivityOptionVo = new ApiActivityOptionVo();
@@ -150,6 +167,44 @@
if(happyActivityOption != null){
BeanUtil.copyProperties(happyActivityOption, apiActivityOptionVo);
}
+
+ //投票人数
+ List<HappyFollow> happyFollows = happyFollowMapper.selectList(
+ new LambdaQueryWrapper<HappyFollow>()
+ .select(HappyFollow::getId)
+ .eq(HappyFollow::getSourceOptionId, id)
+ .eq(HappyFollow::getType, StateUpDownEnum.VOTE.getCode())
+ .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ .groupBy(HappyFollow::getMemberId)
+ );
+ apiActivityOptionVo.setVoteCnt(CollUtil.isNotEmpty(happyFollows) ? happyFollows.size() : 0);
+
+ List<HappyActivityOption> happyActivityOptions = happyActivityOptionMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOption>()
+ .select(HappyActivityOption::getId,HappyActivityOption::getLikesCnt)
+ .eq(HappyActivityOption::getActivityId, happyActivityOption.getActivityId())
+ .eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ .eq(HappyActivityOption::getState, StateUpDownEnum.VOTE_OPTION_STATE_AUDIT_SUCCESS.getCode())
+ .orderByDesc(HappyActivityOption::getLikesCnt)
+ );
+ //获取上一个名次的数据
+ int firstCnt = 1;
+ int distanceCnt = 0;
+ for (HappyActivityOption option : happyActivityOptions){
+ if(option.getId().equals(id)){
+ apiActivityOptionVo.setFirstCnt(firstCnt);
+ if( firstCnt == 1 ){
+ apiActivityOptionVo.setDistanceCnt(distanceCnt);
+ }else{
+ apiActivityOptionVo.setDistanceCnt(distanceCnt- option.getLikesCnt());
+ }
+ break;
+ }else{
+ firstCnt = firstCnt + 1;
+ distanceCnt = option.getLikesCnt();
+ }
+ }
+
return new FebsResponse().success().data(apiActivityOptionVo);
}
@@ -168,16 +223,18 @@
throw new FebsException("活动不存在");
}
- if (StateUpDownEnum.ACTIVITY_TYPE_VOTE.getCode() == happyActivity.getType()) {
- Long sourceOptionId = dto.getSourceOptionId();
- if (sourceOptionId == null) {
- throw new FebsException("选项ID不能为空");
- }
- this.operateDoVote(memberId, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode(), sourceId, sourceOptionId, type);
- this.addLikeCnt(sourceOptionId);
- } else {
- this.operateDo(memberId, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode(), sourceId, type);
- }
+ this.operateDo(memberId, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode(), sourceId, type);
+
+// if (StateUpDownEnum.ACTIVITY_TYPE_VOTE.getCode() == happyActivity.getType()) {
+// Long sourceOptionId = dto.getSourceOptionId();
+// if (sourceOptionId == null) {
+// throw new FebsException("选项ID不能为空");
+// }
+// this.operateDoVote(memberId, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode(), sourceId, sourceOptionId, type);
+// this.addLikeCnt(sourceOptionId);
+// } else {
+// this.operateDo(memberId, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode(), sourceId, type);
+// }
} else if (StateUpDownEnum.SOURCE_TYPE_SOCIAL_CIRCLE.getCode() == sourceType) {
// 朋友圈点赞或关注
this.operateDo(memberId, StateUpDownEnum.SOURCE_TYPE_SOCIAL_CIRCLE.getCode(), sourceId, type);
@@ -225,6 +282,12 @@
if(StateUpDownEnum.ACTIVITY_TYPE_VOTE.getCode() != happyActivity.getType()){
throw new FebsException("当前活动无法投票");
}
+ if (StateUpDownEnum.ACTIVITY_STATE_NOT_START.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动尚未开始");
+ }
+ if (StateUpDownEnum.ACTIVITY_STATE_END.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动已结束");
+ }
HappyActivityOption happyActivityOption = happyActivityOptionMapper.selectById(sourceOptionId);
if (null == happyActivityOption) {
@@ -238,7 +301,6 @@
new LambdaQueryWrapper<HappyFollow>()
.eq(HappyFollow::getMemberId, memberId)
.eq(HappyFollow::getSourceId, sourceId)
- .eq(HappyFollow::getSourceOptionId, sourceOptionId)
.eq(HappyFollow::getType, type)
.gt(HappyFollow::getCreatedTime, DateUtil.beginOfDay(new Date()))
);
@@ -260,7 +322,7 @@
if(CollUtil.isNotEmpty(records)){
//stream流操作records，获取全部的memberId(全部投票人)
Set<Long> memberIds = records.stream().map(ApiVoteRecordInPageVo::getMemberId).collect(Collectors.toSet());
- if(CollUtil.isEmpty(memberIds)){
+ if(CollUtil.isNotEmpty(memberIds)){
List<MallMember> mallMembers = mallMemberMapper.selectList(
new LambdaQueryWrapper<MallMember>()
.select(MallMember::getId, MallMember::getName, MallMember::getAvatar)
@@ -282,14 +344,82 @@
}
@Override
+ public FebsResponse operateValidRegister(ApiOperateValidRegisterActivityDto dto) {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ HappyActivity happyActivity = this.baseMapper.selectById(dto.getActivityId());
+
+ if (StateUpDownEnum.ACTIVITY_STATE_END.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动已结束");
+ }
+ if (StateUpDownEnum.DOWN.getCode() == happyActivity.getAddState()) {
+ throw new FebsException("活动尚未开启报名");
+ }
+ //判断用户是否重复报名
+ Integer registerCnt = happyActivityOptionMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityOption>()
+ .eq(HappyActivityOption::getMemberId, memberId)
+ .eq(HappyActivityOption::getActivityId, dto.getActivityId())
+ .ne(HappyActivityOption::getState, StateUpDownEnum.VOTE_OPTION_STATE_AUDIT_REFUSE.getCode())
+ .eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ if (registerCnt > 0) {
+ throw new FebsException("您已经报名过了");
+ }
+ return new FebsResponse().success();
+ }
+
+ @Override
public FebsResponse operateRegister(ApiOperateRegisterActivityDto dto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
- return null;
+
+ HappyActivity happyActivity = this.baseMapper.selectById(dto.getActivityId());
+
+ if (StateUpDownEnum.ACTIVITY_STATE_END.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动已结束");
+ }
+ if (StateUpDownEnum.DOWN.getCode() == happyActivity.getAddState()) {
+ throw new FebsException("活动尚未开启报名");
+ }
+ //判断用户是否重复报名
+ Integer registerCnt = happyActivityOptionMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityOption>()
+ .eq(HappyActivityOption::getMemberId, memberId)
+ .eq(HappyActivityOption::getActivityId, dto.getActivityId())
+ .ne(HappyActivityOption::getState, StateUpDownEnum.VOTE_OPTION_STATE_AUDIT_REFUSE.getCode())
+ .eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ if (registerCnt > 0) {
+ throw new FebsException("您已经报名过了");
+ }
+
+ Integer optionCnt = happyActivityOptionMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityOption>()
+ .eq(HappyActivityOption::getActivityId, dto.getActivityId())
+ .eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+
+ HappyActivityOption happyActivityOption = new HappyActivityOption();
+ BeanUtil.copyProperties(dto, happyActivityOption);
+ happyActivityOption.setOrderCnt(optionCnt + 1);
+ happyActivityOption.setMemberId(memberId);
+ happyActivityOption.setOptionName(dto.getRealName());
+ happyActivityOptionMapper.insert(happyActivityOption);
+ return new FebsResponse().success().message("报名成功");
}
@Override
public FebsResponse addConnect(ApiOperateRegisterUserDto dto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ List<HappyActivityConnect> happyActivityConnects = happyActivityConnectMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityConnect>()
+ .eq(HappyActivityConnect::getMemberId, memberId)
+ .eq(HappyActivityConnect::getName, dto.getName())
+ .eq(HappyActivityConnect::getPhone, dto.getPhone())
+ );
+ if(CollUtil.isNotEmpty(happyActivityConnects)){
+ throw new FebsException("已经添加过该联系人");
+ }
HappyActivityConnect happyActivityConnect = new HappyActivityConnect();
happyActivityConnect.setMemberId(memberId);
@@ -342,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())){
@@ -355,20 +505,45 @@
}
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("活动不存在");
}
+ if (StateUpDownEnum.ACTIVITY_STATE_NOT_START.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动尚未开始");
+ }
+ if (StateUpDownEnum.ACTIVITY_STATE_END.getCode() == happyActivity.getState()) {
+ throw new FebsException("活动已结束");
+ }
- Integer joinCnt = happyActivity.getJoinCnt();
- if(joinCnt < numCnt){
- throw new FebsException("报名额度剩下"+joinCnt+"，请减少报名人数");
+ Integer surplusCnt = happyActivity.getSurplusCnt();
+ if(surplusCnt < numCnt){
+ throw new FebsException("报名额度剩下"+surplusCnt+"，请减少报名人数");
}
//支付总金额
BigDecimal amount = happyActivity.getPayAmount().multiply(new BigDecimal(dto.getNumCnt())).setScale(2, RoundingMode.DOWN);
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);
@@ -377,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){
@@ -395,10 +577,13 @@
happyActivityOrderItemMapper.insert(happyActivityOrderItem);
}
- this.substructJoinCnt(activityId, happyActivityOrder.getNumCnt());
+ this.baseMapper.updateHappyActivitySurplusCnt(activityId, happyActivityOrder.getNumCnt() * (-1));
+
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);
}
@@ -439,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) {
@@ -463,8 +649,6 @@
throw new FebsException("支付失败：" + e.getMessage());
}
- // todo 支付失败要把对应的人数加回来
-
// 构造返回结果，包含支付相关信息
Map<String, Object> map = new HashMap<>();
map.put("orderInfo", payResultStr);
@@ -481,15 +665,6 @@
HappyActivityOption happyActivityOption = happyActivityOptionMapper.selectById(sourceOptionId);
happyActivityOption.setLikesCnt(happyActivityOption.getLikesCnt() + 1);
happyActivityOptionMapper.updateById(happyActivityOption);
- }
-
- @Override
- public void substructJoinCnt(Long activityId, Integer numCnt) {
- HappyActivity happyActivity = this.baseMapper.selectById(activityId);
- if(ObjectUtil.isNotEmpty(happyActivity)){
- happyActivity.setJoinCnt(happyActivity.getJoinCnt() -numCnt);
- this.baseMapper.updateById(happyActivity);
- }
}
// 处理无需支付订单
@@ -552,6 +727,348 @@
return happyActivityOrder.getOrderNo();
}
+ @Override
+ public FebsResponse orderList(ApiActivityOrderListDto dto) {
+
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ ArrayList<ApiActivityOrderListVo> apiActivityOrderListVos = new ArrayList<>();
+
+ LambdaQueryWrapper<HappyActivityOrder> happyActivityOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getMemberId, memberId);
+ if(ObjectUtil.isNotEmpty(dto.getState()) && dto.getState() != 0){
+ happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getState, dto.getState());
+ }
+ happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getDeleteFlag, StateUpDownEnum.DOWN.getCode());
+ happyActivityOrderLambdaQueryWrapper.orderByDesc(HappyActivityOrder::getCreatedTime);
+ Page<HappyActivityOrder> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+ Page<HappyActivityOrder> voteActivityPage = happyActivityOrderMapper.selectPage(page, happyActivityOrderLambdaQueryWrapper);
+
+ List<HappyActivityOrder> records = voteActivityPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ Set<Long> activityIds = records.stream().map(HappyActivityOrder::getActivityId).collect(Collectors.toSet());
+ List<HappyActivity> happyActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<HappyActivity>()
+ .select(
+ HappyActivity::getId,
+ HappyActivity::getCategoryId,
+ HappyActivity::getName,
+ HappyActivity::getStartTime,
+ HappyActivity::getEndTime,
+ HappyActivity::getAddress)
+ .in(HappyActivity::getId, activityIds)
+ );
+ Map<Long, HappyActivity> activityMap = happyActivities.stream().collect(Collectors.toMap(HappyActivity::getId, Function.identity()));
+
+ Set<Long> categoryIds = happyActivities.stream().map(HappyActivity::getCategoryId).collect(Collectors.toSet());
+ //stream流操作categoryIds得到一个Map<categoryId,HappyActivityCategory>的map对象
+ List<HappyActivityCategory> happyActivityCategories = happyActivityCategoryMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityCategory>()
+ .select(
+ HappyActivityCategory::getId,
+ HappyActivityCategory::getName)
+ .in(HappyActivityCategory::getId,categoryIds)
+ );
+ Map<Long, HappyActivityCategory> categoryMap = happyActivityCategories.stream().collect(Collectors.toMap(HappyActivityCategory::getId, Function.identity()));
+
+ for(HappyActivityOrder happyActivityOrder : records){
+ ApiActivityOrderListVo apiActivityOrderListVo = new ApiActivityOrderListVo();
+ BeanUtil.copyProperties(happyActivityOrder, apiActivityOrderListVo);
+
+ apiActivityOrderListVo.setActivityName(activityMap.get(happyActivityOrder.getActivityId()).getName());
+ apiActivityOrderListVo.setStartTime(activityMap.get(happyActivityOrder.getActivityId()).getStartTime());
+ apiActivityOrderListVo.setEndTime(activityMap.get(happyActivityOrder.getActivityId()).getEndTime());
+ apiActivityOrderListVo.setAddress(activityMap.get(happyActivityOrder.getActivityId()).getAddress());
+ apiActivityOrderListVo.setCategoryName(categoryMap.get(activityMap.get(happyActivityOrder.getActivityId()).getCategoryId()).getName());
+
+ apiActivityOrderListVos.add(apiActivityOrderListVo);
+ }
+ }
+
+ return new FebsResponse().success().data(apiActivityOrderListVos);
+ }
+
+ @Override
+ public FebsResponse orderInfo(Long id) {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ ArrayList<ApiActivityOrderInfoVo> apiActivityOrderInfoVos = new ArrayList<>();
+
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
+
+ HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrder.getActivityId());
+
+ List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, happyActivityOrder.getId())
+ .eq(HappyActivityOrderItem::getMemberId, memberId)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrderItems)){
+ for(HappyActivityOrderItem happyActivityOrderItem : happyActivityOrderItems){
+ ApiActivityOrderInfoVo apiActivityOrderInfoVo = new ApiActivityOrderInfoVo();
+ BeanUtil.copyProperties(happyActivityOrderItem, apiActivityOrderInfoVo);
+
+ apiActivityOrderInfoVo.setOrderState(happyActivityOrder.getState());
+
+ apiActivityOrderInfoVo.setActivityName(happyActivity.getName());
+ apiActivityOrderInfoVo.setActivityStartTime(happyActivity.getStartTime());
+ apiActivityOrderInfoVo.setActivityEndTime(happyActivity.getEndTime());
+ apiActivityOrderInfoVo.setActivityAddress(happyActivity.getAddress());
+
+ apiActivityOrderInfoVos.add(apiActivityOrderInfoVo);
+ }
+ }
+
+
+ return new FebsResponse().success().data(apiActivityOrderInfoVos);
+ }
+
+ @Override
+ public FebsResponse orderDelete(Long id) {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+
+ List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrder>()
+ .eq(HappyActivityOrder::getId, id)
+ .eq(HappyActivityOrder::getMemberId, memberId)
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrders)){
+ happyActivityOrders.forEach(happyActivityOrder -> {
+ happyActivityOrder.setDeleteFlag(StateUpDownEnum.UP.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ });
+ }
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public void activityEnd() {
+ Date date = new Date();
+ List<HappyActivity> happyActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<HappyActivity>()
+ .eq(HappyActivity::getState, StateUpDownEnum.ACTIVITY_STATE_ENROLLING.getCode())
+ .le(HappyActivity::getEndTime, date)
+ );
+ if(CollUtil.isEmpty(happyActivities)){
+ return;
+ }
+ happyActivities.forEach(happyActivity -> {
+ happyActivity.setState(StateUpDownEnum.ACTIVITY_STATE_END.getCode());
+ this.baseMapper.updateById(happyActivity);
+ });
+ }
+
+ /**
+ * 当活动即将开始时自动更新活动状态
+ * 此方法旨在查询所有即将开始的活动，并将它们的状态更新为报名进行中
+ */
+ @Override
+ public void activityStart() {
+ // 获取当前日期和时间
+ DateTime date = DateUtil.date();
+
+ // 查询所有状态为未开始且当前时间在活动开始时间结束时间之间的活动
+ List<HappyActivity> happyActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<HappyActivity>()
+ .eq(HappyActivity::getState, StateUpDownEnum.ACTIVITY_STATE_NOT_START.getCode())
+ .le(HappyActivity::getStartTime, date)
+ .ge(HappyActivity::getEndTime, date)
+ );
+
+ // 如果没有找到任何符合条件的活动，则直接返回
+ if(CollUtil.isEmpty(happyActivities)){
+ return;
+ }
+
+ // 遍历每个符合条件的活动，将其状态更新为报名进行中，并保存更新
+ happyActivities.forEach(happyActivity -> {
+ happyActivity.setState(StateUpDownEnum.ACTIVITY_STATE_ENROLLING.getCode());
+ this.baseMapper.updateById(happyActivity);
+ });
+ }
+
+ @Override
+ public FebsResponse checkOrder(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("票号不存在！");
+ }
+
+ 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("操作成功");
+ }
+
+ /**
+ * 检查活动订单项的状态
+ * 当指定订单的所有活动订单项都不处于"未使用"状态时，将订单状态更新为"已使用"
+ *
+ * @param orderId 订单ID，用于查询活动订单项和订单信息
+ */
+ @Override
+ public void checkActivityItem(Long orderId) {
+ // 查询指定订单ID的活动订单项数量，且状态为"未使用"
+ Integer integer = happyActivityOrderItemMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityOrderItem>()
+ .eq(HappyActivityOrderItem::getOrderId, orderId)
+ .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
+ );
+ // 如果没有找到任何未使用的活动订单项
+ if(0 == integer){
+ // 根据订单ID查询订单信息
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(orderId);
+ if(happyActivityOrder == null){
+ return;
+ }
+ // 更新订单状态为"已使用"
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_USED.getCode());
+ // 保存更新后的订单信息
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ }
+ // 结束方法执行
+ return;
+ }
+
+ @Override
+ public void overtimeJob() {
+ List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(
+ new LambdaQueryWrapper<HappyActivityOrder>()
+ .eq(HappyActivityOrder::getState, StateUpDownEnum.ORDER_STATE_WAIT_PAY.getCode())
+ .lt(HappyActivityOrder::getFailTime, new Date())
+ );
+ if(CollUtil.isNotEmpty(happyActivityOrders)){
+ happyActivityOrders.forEach(happyActivityOrder -> {
+
+ Long activityId = happyActivityOrder.getActivityId();
+ Integer numCnt = happyActivityOrder.getNumCnt();
+ this.baseMapper.updateHappyActivitySurplusCnt(activityId,numCnt);
+
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+ });
+ }
+ }
+
+ @Override
+ public FebsResponse addComment(ApiPayOrderAddCommentDto dto) {
+ // 获取当前登录用户的ID
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ Long orderId = dto.getOrderId();
+
+ HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(orderId);
+ if(StateUpDownEnum.ORDER_STATE_USED.getCode() != happyActivityOrder.getState()){
+ throw new FebsException("该订单状态不是已使用状态！");
+ }
+
+ happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_COMMENT.getCode());
+ happyActivityOrderMapper.updateById(happyActivityOrder);
+
+ HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrder.getActivityId());
+
+ HappyActivityComment happyActivityComment = new HappyActivityComment();
+ happyActivityComment.setActivityId(happyActivity.getId());
+ happyActivityComment.setActivityName(happyActivity.getName());
+ happyActivityComment.setMemberId(memberId);
+ happyActivityComment.setOrderId(orderId);
+ happyActivityComment.setStar(dto.getStar());
+ happyActivityComment.setComment(dto.getComment());
+ happyActivityComment.setImages(dto.getImages());
+ happyActivityCommentMapper.insert(happyActivityComment);
+
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @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();
+
+ Integer optionCnt = happyActivityOptionMapper.selectCount(
+ new LambdaQueryWrapper<HappyActivityOption>()
+ .eq(HappyActivityOption::getActivityId, id)
+ .eq(HappyActivityOption::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ .eq(HappyActivityOption::getState, StateUpDownEnum.VOTE_OPTION_STATE_AUDIT_SUCCESS.getCode())
+ );
+ apiVoteActivityHotVo.setOptionCnt(optionCnt);
+
+ Integer followVoteCnt = happyFollowMapper.selectCount(
+ new LambdaQueryWrapper<HappyFollow>()
+ .eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_ACTIVITY.getCode())
+ .eq(HappyFollow::getSourceId, id)
+ .eq(HappyFollow::getType, StateUpDownEnum.VOTE.getCode())
+ .eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
+ );
+ apiVoteActivityHotVo.setFollowVoteCnt(followVoteCnt);
+
+ return new FebsResponse().success().data(apiVoteActivityHotVo);
+ }
+
public static void main(String[] args) {
Date date = new Date();
--
Gitblit v1.9.1