GitBucket
4.23.0
Toggle navigation
Sign in
Files
Branches
1
Releases
Issues
Pull requests
Labels
Priorities
Milestones
Wiki
Forks
fujun
/
dxCard-service
Browse code
修改报错
master
1 parent
91b148d
commit
a10bbc8b742b728da46a581369f5a9ef6f35d0ce
jiangqihao
authored
28 days ago
Patch
Showing
1 changed file
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/GroupRecordServiceImpl.java
Ignore Space
Show notes
View
jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/impl/GroupRecordServiceImpl.java
package org.jeecg.modules.service.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; import org.jeecg.modules.service.dto.SubmitReservationDTO; import org.jeecg.modules.service.entity.AuthUser; import org.jeecg.modules.service.entity.GroupMembers; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.mapper.AuthUserMapper; import org.jeecg.modules.service.mapper.GroupMembersMapper; import org.jeecg.modules.service.mapper.GroupRecordMapper; import org.jeecg.modules.service.service.IGroupRecordService; import org.jeecg.modules.service.vo.GroupMemberVO; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.jeecg.modules.system.entity.BasicConfig; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.mapper.BasicConfigMapper; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; import org.jeecg.modules.system.mapper.CommissionRefundMapper; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ @Service public class GroupRecordServiceImpl extends ServiceImpl<GroupRecordMapper, GroupRecord> implements IGroupRecordService { @Resource private GroupRecordMapper groupRecordMapper; @Resource private GroupMembersMapper groupMembersMapper; @Resource private BasicConfigMapper basicConfigMapper; @Resource private AuthUserMapper authUserMapper; @Resource private CommissionRefundMapper commissionRefundMapper; @Resource private CardApplicationCustomersMapper cardApplicationCustomersMapper; @Override public GroupRecordVO getGroupRecordVO(String userId) { //查询当前操作人是否有进行中团 QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_leader_id", userId); queryWrapper.eq("status", "0"); //进行中 GroupRecord groupRecord = groupRecordMapper.selectOne(queryWrapper); if (groupRecord == null){ //创建新的团 //查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(null); BasicConfig basicConfig = new BasicConfig(); if (basicConfigs.isEmpty()) { //获取不到配置时默认配置 basicConfig.setDistributionCommission(new BigDecimal("20.00")); basicConfig.setMinPeopleNumber(2); basicConfig.setMaxPeopleNumber(3); basicConfig.setMinAmount(new BigDecimal("30.00")); basicConfig.setMaxAmount(new BigDecimal("50.00")); basicConfig.setGroundTime(24);//24小时 } else { basicConfig = basicConfigs.get(0); } groupRecord = new GroupRecord(); groupRecord.setGroupLeaderId(userId); groupRecord.setStatus("0"); //默认进行中 groupRecord.setStartTime(new Date()); //结束时间 groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000)); this.baseMapper.insert(groupRecord); } GroupRecordVO groupRecordVO = new GroupRecordVO(); groupRecordVO.setId(groupRecord.getId()); groupRecordVO.setUserId(groupRecord.getGroupLeaderId()); groupRecordVO.setStartTime(groupRecord.getStartTime().getTime()); groupRecordVO.setEndTime(groupRecord.getEndTime().getTime()); groupRecordVO.setGroupMembers(new ArrayList<>()); //查询当前团团成员 QueryWrapper<GroupMembers> queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("group_id", groupRecord.getId()); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper1); for (GroupMembers groupMember : groupMembers) { GroupMemberVO memberVO = new GroupMemberVO(); memberVO.setId(groupMember.getId()); memberVO.setUserId(groupMember.getClientId()); //查询用户信息 AuthUser authUser = authUserMapper.selectById(groupMember.getClientId()); if (authUser != null){ memberVO.setName(authUser.getWxName()); //查询该团是否已返钱 memberVO.setIsMoney(false); CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId()); if (commissionRefund != null && commissionRefund.getActualAmount() != null){ memberVO.setIsMoney(true); memberVO.setAmount(commissionRefund.getActualAmount()); memberVO.setReservationId(groupMember.getReservationId()); } } groupRecordVO.getGroupMembers().add(memberVO); } return groupRecordVO; } @Override public ReservationSuccessVO submitReservation(SubmitReservationDTO dto) { //校验是否已存在对应预约单 if (dto.getType().equals("0")){ QueryWrapper<CardApplicationCustomers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("card_application_id", dto.getCardApplicationId()); queryWrapper.eq("distribution_customers_id", dto.getDistributionCustomersId()); CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersMapper.selectOne(queryWrapper); if (cardApplicationCustomers != null){ throw new RuntimeException("当前用户已参加过该分销"); } }else if (dto.getType().equals("1")){ QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("client_id", dto.getCardApplicationId()); queryWrapper.eq("group_id", dto.getGroupId()); GroupMembers groupMembers = groupMembersMapper.selectOne(queryWrapper); if (groupMembers != null){ throw new RuntimeException("当前用户已加入了该团"); } } CardApplicationCustomers cardApplicationCustomers = createCardApplicationCustomers(dto); ReservationSuccessVO vo = new ReservationSuccessVO(); vo.setId(cardApplicationCustomers.getId()); vo.setReservationTime(DateUtil.format(cardApplicationCustomers.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); vo.setAddress(cardApplicationCustomers.getProvince() + cardApplicationCustomers.getCity() + cardApplicationCustomers.getArea() + cardApplicationCustomers.getAddress()); return vo; } /** * 创建预约单 * @param dto * @return */ private CardApplicationCustomers createCardApplicationCustomers(SubmitReservationDTO dto) { CardApplicationCustomers cardApplicationCustomers = new CardApplicationCustomers(); BeanUtils.copyProperties(dto, cardApplicationCustomers); if (dto.getType().equals("0")){ AuthUser authUser = authUserMapper.selectById(dto.getDistributionCustomersId()); cardApplicationCustomers.setDistributionCustomersName(authUser.getWxName()); cardApplicationCustomers.setDistributionCustomersPhone(authUser.getWxPhone()); cardApplicationCustomers.setDistributionCustomersId(authUser.getId()); } cardApplicationCustomers.setRefundableTime(new Date(dto.getReservationTime())); cardApplicationCustomers.setStatus("0"); //待处理 cardApplicationCustomersMapper.insert(cardApplicationCustomers); //创建团成员 if (dto.getType().equals("1")){ GroupMembers groupMembers = new GroupMembers(); groupMembers.setClientId(dto.getCardApplicationId()); groupMembers.setGroupId(dto.getGroupId()); groupMembers.setStatus("0"); groupMembers.setReservationId(cardApplicationCustomers.getId()); groupMembersMapper.insert(groupMembers); } return cardApplicationCustomers; } }
package org.jeecg.modules.service.service.impl; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import jakarta.annotation.Resource; import org.jeecg.modules.service.dto.SubmitReservationDTO; import org.jeecg.modules.service.entity.AuthUser; import org.jeecg.modules.service.entity.GroupMembers; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.mapper.AuthUserMapper; import org.jeecg.modules.service.mapper.GroupMembersMapper; import org.jeecg.modules.service.mapper.GroupRecordMapper; import org.jeecg.modules.service.service.IGroupRecordService; import org.jeecg.modules.service.vo.GroupMemberVO; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.jeecg.modules.system.entity.BasicConfig; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.mapper.BasicConfigMapper; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; import org.jeecg.modules.system.mapper.CommissionRefundMapper; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ @Service public class GroupRecordServiceImpl extends ServiceImpl<GroupRecordMapper, GroupRecord> implements IGroupRecordService { @Resource private GroupRecordMapper groupRecordMapper; @Resource private GroupMembersMapper groupMembersMapper; @Resource private BasicConfigMapper basicConfigMapper; @Resource private AuthUserMapper authUserMapper; @Resource private CommissionRefundMapper commissionRefundMapper; @Resource private CardApplicationCustomersMapper cardApplicationCustomersMapper; @Override public GroupRecordVO getGroupRecordVO(String userId) { //查询当前操作人是否有进行中团 QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_leader_id", userId); queryWrapper.eq("status", "0"); //进行中 GroupRecord groupRecord = groupRecordMapper.selectOne(queryWrapper); if (groupRecord == null){ //创建新的团 //查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(null); BasicConfig basicConfig = basicConfigs.get(0); if (basicConfig == null){ //获取不到配置时默认配置 basicConfig = new BasicConfig(); basicConfig.setDistributionCommission(new BigDecimal("20.00")); basicConfig.setMinPeopleNumber(2); basicConfig.setMaxPeopleNumber(3); basicConfig.setMinAmount(new BigDecimal("30.00")); basicConfig.setMaxAmount(new BigDecimal("50.00")); basicConfig.setGroundTime(24);//24小时 } groupRecord = new GroupRecord(); groupRecord.setGroupLeaderId(userId); groupRecord.setStatus("0"); //默认进行中 groupRecord.setStartTime(new Date()); //结束时间 groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000)); this.baseMapper.insert(groupRecord); } GroupRecordVO groupRecordVO = new GroupRecordVO(); groupRecordVO.setId(groupRecord.getId()); groupRecordVO.setUserId(groupRecord.getGroupLeaderId()); groupRecordVO.setStartTime(groupRecord.getStartTime().getTime()); groupRecordVO.setEndTime(groupRecord.getEndTime().getTime()); groupRecordVO.setGroupMembers(new ArrayList<>()); //查询当前团团成员 QueryWrapper<GroupMembers> queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("group_id", groupRecord.getId()); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper1); for (GroupMembers groupMember : groupMembers) { GroupMemberVO memberVO = new GroupMemberVO(); memberVO.setId(groupMember.getId()); memberVO.setUserId(groupMember.getClientId()); //查询用户信息 AuthUser authUser = authUserMapper.selectById(groupMember.getClientId()); if (authUser != null){ memberVO.setName(authUser.getWxName()); //查询该团是否已返钱 memberVO.setIsMoney(false); CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId()); if (commissionRefund != null && commissionRefund.getActualAmount() != null){ memberVO.setIsMoney(true); memberVO.setAmount(commissionRefund.getActualAmount()); memberVO.setReservationId(groupMember.getReservationId()); } } groupRecordVO.getGroupMembers().add(memberVO); } return groupRecordVO; } @Override public ReservationSuccessVO submitReservation(SubmitReservationDTO dto) { //校验是否已存在对应预约单 if (dto.getType().equals("0")){ QueryWrapper<CardApplicationCustomers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("card_application_id", dto.getCardApplicationId()); queryWrapper.eq("distribution_customers_id", dto.getDistributionCustomersId()); CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersMapper.selectOne(queryWrapper); if (cardApplicationCustomers != null){ throw new RuntimeException("当前用户已参加过该分销"); } }else if (dto.getType().equals("1")){ QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("client_id", dto.getCardApplicationId()); queryWrapper.eq("group_id", dto.getGroupId()); GroupMembers groupMembers = groupMembersMapper.selectOne(queryWrapper); if (groupMembers != null){ throw new RuntimeException("当前用户已加入了该团"); } } CardApplicationCustomers cardApplicationCustomers = createCardApplicationCustomers(dto); ReservationSuccessVO vo = new ReservationSuccessVO(); vo.setId(cardApplicationCustomers.getId()); vo.setReservationTime(DateUtil.format(cardApplicationCustomers.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); vo.setAddress(cardApplicationCustomers.getProvince() + cardApplicationCustomers.getCity() + cardApplicationCustomers.getArea() + cardApplicationCustomers.getAddress()); return vo; } /** * 创建预约单 * @param dto * @return */ private CardApplicationCustomers createCardApplicationCustomers(SubmitReservationDTO dto) { CardApplicationCustomers cardApplicationCustomers = new CardApplicationCustomers(); BeanUtils.copyProperties(dto, cardApplicationCustomers); if (dto.getType().equals("0")){ AuthUser authUser = authUserMapper.selectById(dto.getDistributionCustomersId()); cardApplicationCustomers.setDistributionCustomersName(authUser.getWxName()); cardApplicationCustomers.setDistributionCustomersPhone(authUser.getWxPhone()); cardApplicationCustomers.setDistributionCustomersId(authUser.getId()); } cardApplicationCustomers.setRefundableTime(new Date(dto.getReservationTime())); cardApplicationCustomers.setStatus("0"); //待处理 cardApplicationCustomersMapper.insert(cardApplicationCustomers); //创建团成员 if (dto.getType().equals("1")){ GroupMembers groupMembers = new GroupMembers(); groupMembers.setClientId(dto.getCardApplicationId()); groupMembers.setGroupId(dto.getGroupId()); groupMembers.setStatus("0"); groupMembers.setReservationId(cardApplicationCustomers.getId()); groupMembersMapper.insert(groupMembers); } return cardApplicationCustomers; } }
Show line notes below