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
a61a669
commit
3d82f18ec6f6a9aeeda885881b821840f26a5051
YFJ
authored
7 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.CardApplicationVO; 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) { final String STATUS_ACTIVE = "0"; final String STATUS_ENDED = "1"; // 查询当前操作人是否有进行中团 QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_leader_id", userId); queryWrapper.eq("status", STATUS_ACTIVE); GroupRecord groupRecord = groupRecordMapper.selectOne(queryWrapper); // 检查是否需要创建新团 boolean needCreateNewGroup = false; if (groupRecord == null) { // 没有进行中的团,需要创建新团 needCreateNewGroup = true; } else if (groupRecord.getEndTime().getTime() < System.currentTimeMillis()) { // 当前团已结束,更新状态并创建新团 groupRecord.setStatus(STATUS_ENDED); this.baseMapper.updateById(groupRecord); needCreateNewGroup = true; } // 如果需要创建新团,则创建 if (needCreateNewGroup) { groupRecord = createNewGroup(userId, STATUS_ACTIVE); } // 构建返回VO对象 GroupRecordVO groupRecordVO = buildGroupRecordVO(groupRecord); // 查询当前团成员信息 populateGroupMembers(groupRecordVO, groupRecord.getId()); return groupRecordVO; } /** * 创建新团 */ private GroupRecord createNewGroup(String userId, String status) { // 查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(new QueryWrapper<BasicConfig>()); BasicConfig basicConfig; if (basicConfigs.isEmpty()) { // 获取不到配置时默认配置 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小时 } else { basicConfig = basicConfigs.get(0); } GroupRecord groupRecord = new GroupRecord(); groupRecord.setGroupLeaderId(userId); groupRecord.setStatus(status); groupRecord.setStartTime(new Date()); groupRecord.setThisAmount(basicConfig.getMinAmount()); // 结束时间 groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000)); this.baseMapper.insert(groupRecord); return groupRecord; } /** * 构建GroupRecordVO基本信息 */ private GroupRecordVO buildGroupRecordVO(GroupRecord 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<>()); return groupRecordVO; } /** * 填充团成员信息 */ private void populateGroupMembers(GroupRecordVO groupRecordVO, String groupId) { // 查询当前团团成员 QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", groupId); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper); 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.setHeadImg(authUser.getAvatar()); // 查询该团是否已返钱 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); } } @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) { // 参数有效性校验 if (dto == null || dto.getType() == null || dto.getGroupId() == null) { throw new IllegalArgumentException("提交预约信息缺少必要参数"); } CardApplicationCustomers cardApplicationCustomers = new CardApplicationCustomers(); BeanUtils.copyProperties(dto, cardApplicationCustomers); //处理预约时间 cardApplicationCustomers.setReservationTime(new Date(dto.getReservationTime())); // 查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(new QueryWrapper<BasicConfig>().last("LIMIT 1")); BasicConfig basicConfig = getDefaultBasicConfig(); // 默认配置方法抽离 if (!basicConfigs.isEmpty()) { basicConfig = basicConfigs.get(0); } String statusPending = "0"; // 待处理状态码抽象化 if ("0".equals(dto.getType())) { AuthUser authUser = authUserMapper.selectById(dto.getDistributionCustomersId()); if (authUser == null) { throw new RuntimeException("找不到分销用户: " + dto.getDistributionCustomersId()); } cardApplicationCustomers.setDistributionCustomersName(authUser.getWxName()); cardApplicationCustomers.setDistributionCustomersPhone(authUser.getWxPhone()); cardApplicationCustomers.setDistributionCustomersId(authUser.getId()); cardApplicationCustomers.setRefundableCommission(basicConfig.getDistributionCommission()); } else if ("1".equals(dto.getType())) { GroupRecord groupRecord = groupRecordMapper.selectById(dto.getGroupId()); if (groupRecord == null) { throw new RuntimeException("找不到对应的团记录: " + dto.getGroupId()); } QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", dto.getGroupId()); List<GroupMembers> groupMembersList = groupMembersMapper.selectList(queryWrapper); int currentMemberCount = groupMembersList.size() + 1; synchronized (this) { // 防止并发修改 if (currentMemberCount >= basicConfig.getMaxPeopleNumber()) { groupRecord.setThisAmount(basicConfig.getMaxAmount()); } else { groupRecord.setThisAmount(basicConfig.getMinAmount()); } groupRecordMapper.updateById(groupRecord); // 更新团金额 } cardApplicationCustomers.setRefundableCommission(groupRecord.getThisAmount()); } try { cardApplicationCustomers.setRefundableTime(new Date(dto.getReservationTime())); } catch (Exception e) { throw new IllegalArgumentException("预约时间格式非法", e); } cardApplicationCustomers.setStatus(statusPending); cardApplicationCustomersMapper.insert(cardApplicationCustomers); // 创建团成员 if ("1".equals(dto.getType())) { GroupMembers groupMembers = new GroupMembers(); groupMembers.setClientId(dto.getCardApplicationId()); groupMembers.setGroupId(dto.getGroupId()); groupMembers.setStatus(statusPending); groupMembers.setReservationId(cardApplicationCustomers.getId()); groupMembersMapper.insert(groupMembers); } return cardApplicationCustomers; } // 抽象默认配置生成方法 private BasicConfig getDefaultBasicConfig() { BasicConfig config = new BasicConfig(); config.setDistributionCommission(new BigDecimal("20.00")); config.setMinPeopleNumber(2); config.setMaxPeopleNumber(3); config.setMinAmount(new BigDecimal("30.00")); config.setMaxAmount(new BigDecimal("50.00")); config.setGroundTime(24); // 24小时 return config; } @Override public List<CardApplicationVO> cardApplicationList(String groupId) { List<CardApplicationVO> list = new ArrayList<>(); QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", groupId); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper); for (GroupMembers groupMember : groupMembers) { CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId()); if (commissionRefund != null && commissionRefund.getActualAmount() != null){ CardApplicationVO vo = new CardApplicationVO(); vo.setId(commissionRefund.getReservationId()); vo.setName(commissionRefund.getCardApplicationName()); vo.setAmount(commissionRefund.getActualAmount()); vo.setReservationTime(DateUtil.format(commissionRefund.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); list.add(vo); } } return list; } }
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.CardApplicationVO; 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) { final String STATUS_ACTIVE = "0"; final String STATUS_ENDED = "1"; // 查询当前操作人是否有进行中团 QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_leader_id", userId); queryWrapper.eq("status", STATUS_ACTIVE); GroupRecord groupRecord = groupRecordMapper.selectOne(queryWrapper); // 检查是否需要创建新团 boolean needCreateNewGroup = false; if (groupRecord == null) { // 没有进行中的团,需要创建新团 needCreateNewGroup = true; } else if (groupRecord.getEndTime().getTime() < System.currentTimeMillis()) { // 当前团已结束,更新状态并创建新团 groupRecord.setStatus(STATUS_ENDED); this.baseMapper.updateById(groupRecord); needCreateNewGroup = true; } // 如果需要创建新团,则创建 if (needCreateNewGroup) { groupRecord = createNewGroup(userId, STATUS_ACTIVE); } // 构建返回VO对象 GroupRecordVO groupRecordVO = buildGroupRecordVO(groupRecord); // 查询当前团成员信息 populateGroupMembers(groupRecordVO, groupRecord.getId()); return groupRecordVO; } /** * 创建新团 */ private GroupRecord createNewGroup(String userId, String status) { // 查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(new QueryWrapper<BasicConfig>()); BasicConfig basicConfig; if (basicConfigs.isEmpty()) { // 获取不到配置时默认配置 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小时 } else { basicConfig = basicConfigs.get(0); } GroupRecord groupRecord = new GroupRecord(); groupRecord.setGroupLeaderId(userId); groupRecord.setStatus(status); groupRecord.setStartTime(new Date()); groupRecord.setThisAmount(basicConfig.getMinAmount()); // 结束时间 groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000)); this.baseMapper.insert(groupRecord); return groupRecord; } /** * 构建GroupRecordVO基本信息 */ private GroupRecordVO buildGroupRecordVO(GroupRecord 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<>()); return groupRecordVO; } /** * 填充团成员信息 */ private void populateGroupMembers(GroupRecordVO groupRecordVO, String groupId) { // 查询当前团团成员 QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", groupId); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper); 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.setHeadImg(authUser.getAvatar()); // 查询该团是否已返钱 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); } } @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) { // 参数有效性校验 if (dto == null || dto.getType() == null || dto.getGroupId() == null) { throw new IllegalArgumentException("提交预约信息缺少必要参数"); } CardApplicationCustomers cardApplicationCustomers = new CardApplicationCustomers(); BeanUtils.copyProperties(dto, cardApplicationCustomers); // 查询基础配置 List<BasicConfig> basicConfigs = basicConfigMapper.selectList(new QueryWrapper<BasicConfig>().last("LIMIT 1")); BasicConfig basicConfig = getDefaultBasicConfig(); // 默认配置方法抽离 if (!basicConfigs.isEmpty()) { basicConfig = basicConfigs.get(0); } String statusPending = "0"; // 待处理状态码抽象化 if ("0".equals(dto.getType())) { AuthUser authUser = authUserMapper.selectById(dto.getDistributionCustomersId()); if (authUser == null) { throw new RuntimeException("找不到分销用户: " + dto.getDistributionCustomersId()); } cardApplicationCustomers.setDistributionCustomersName(authUser.getWxName()); cardApplicationCustomers.setDistributionCustomersPhone(authUser.getWxPhone()); cardApplicationCustomers.setDistributionCustomersId(authUser.getId()); cardApplicationCustomers.setRefundableCommission(basicConfig.getDistributionCommission()); } else if ("1".equals(dto.getType())) { GroupRecord groupRecord = groupRecordMapper.selectById(dto.getGroupId()); if (groupRecord == null) { throw new RuntimeException("找不到对应的团记录: " + dto.getGroupId()); } QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", dto.getGroupId()); List<GroupMembers> groupMembersList = groupMembersMapper.selectList(queryWrapper); int currentMemberCount = groupMembersList.size() + 1; synchronized (this) { // 防止并发修改 if (currentMemberCount >= basicConfig.getMaxPeopleNumber()) { groupRecord.setThisAmount(basicConfig.getMaxAmount()); } else { groupRecord.setThisAmount(basicConfig.getMinAmount()); } groupRecordMapper.updateById(groupRecord); // 更新团金额 } cardApplicationCustomers.setRefundableCommission(groupRecord.getThisAmount()); } try { cardApplicationCustomers.setRefundableTime(new Date(dto.getReservationTime())); } catch (Exception e) { throw new IllegalArgumentException("预约时间格式非法", e); } cardApplicationCustomers.setStatus(statusPending); cardApplicationCustomersMapper.insert(cardApplicationCustomers); // 创建团成员 if ("1".equals(dto.getType())) { GroupMembers groupMembers = new GroupMembers(); groupMembers.setClientId(dto.getCardApplicationId()); groupMembers.setGroupId(dto.getGroupId()); groupMembers.setStatus(statusPending); groupMembers.setReservationId(cardApplicationCustomers.getId()); groupMembersMapper.insert(groupMembers); } return cardApplicationCustomers; } // 抽象默认配置生成方法 private BasicConfig getDefaultBasicConfig() { BasicConfig config = new BasicConfig(); config.setDistributionCommission(new BigDecimal("20.00")); config.setMinPeopleNumber(2); config.setMaxPeopleNumber(3); config.setMinAmount(new BigDecimal("30.00")); config.setMaxAmount(new BigDecimal("50.00")); config.setGroundTime(24); // 24小时 return config; } @Override public List<CardApplicationVO> cardApplicationList(String groupId) { List<CardApplicationVO> list = new ArrayList<>(); QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("group_id", groupId); List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper); for (GroupMembers groupMember : groupMembers) { CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId()); if (commissionRefund != null && commissionRefund.getActualAmount() != null){ CardApplicationVO vo = new CardApplicationVO(); vo.setId(commissionRefund.getReservationId()); vo.setName(commissionRefund.getCardApplicationName()); vo.setAmount(commissionRefund.getActualAmount()); vo.setReservationTime(DateUtil.format(commissionRefund.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); list.add(vo); } } return list; } }
Show line notes below