todo内容处理及提交预约代码优化

fujun / dxCard-service

Browse code todo内容处理及提交预约代码优化 master
1 parent a2e9e75 commit 00b4c95b6a768fcfaf7b0538b448b1e318d991cd YFJ authored 16 days ago

Patch

Showing 5 changed files

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/entity/GroupRecord.java
package org.jeecg.modules.service.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Data @TableName("group_record") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="成团记录") public class GroupRecord implements Serializable { private static final long serialVersionUID = 1L; /主键/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*开始时间/ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "开始时间") private java.util.Date startTime; /*结束时间/ @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "结束时间") private java.util.Date endTime; /*团状态/ @Excel(name = "团状态", width = 15) @Schema(description = "团状态") private java.lang.String status; /*团长id/ @Excel(name = "团长id", width = 15) @Schema(description = "团长id") private java.lang.String groupLeaderId; /*当前佣金/ @Excel(name = "当前佣金", width = 15) @Schema(description = "当前佣金") private java.math.BigDecimal thisAmount; } package org.jeecg.modules.service.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Data @TableName("group_record") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="成团记录") public class GroupRecord implements Serializable { private static final long serialVersionUID = 1L; /主键/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*开始时间/ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "开始时间") private java.util.Date startTime; /*结束时间/ @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "结束时间") private java.util.Date endTime; /*团状态/ @Excel(name = "团状态", width = 15) @Schema(description = "团状态") private java.lang.String status; /*团长id/ @Excel(name = "团长id", width = 15) @Schema(description = "团长id") private java.lang.String groupLeaderId; /*当前佣金/ @Excel(name = "当前佣金", width = 15) @Schema(description = "当前佣金") private java.lang.String thisAmount; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/entity/GroupRecord.java

package org.jeecg.modules.service.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;

/**
 * @Description: 成团记录
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Data
@TableName("group_record")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="成团记录")
public class GroupRecord implements Serializable {
    private static final long serialVersionUID = 1L;

/**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description = "主键")
    private java.lang.String id;
    /**创建人*/
    @Schema(description = "创建人")
    private java.lang.String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "创建日期")
    private java.util.Date createTime;
    /**更新人*/
    @Schema(description = "更新人")
    private java.lang.String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "更新日期")
    private java.util.Date updateTime;
    /**所属部门*/
    @Schema(description = "所属部门")
    private java.lang.String sysOrgCode;
    /**开始时间*/
    @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "开始时间")
    private java.util.Date startTime;
    /**结束时间*/
    @Excel(name = "结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "结束时间")
    private java.util.Date endTime;
    /**团状态*/
    @Excel(name = "团状态", width = 15)
    @Schema(description = "团状态")
    private java.lang.String status;
    /**团长id*/
    @Excel(name = "团长id", width = 15)
    @Schema(description = "团长id")
    private java.lang.String groupLeaderId;
    /**当前佣金*/
    @Excel(name = "当前佣金", width = 15)
    @Schema(description = "当前佣金")
    private java.math.BigDecimal thisAmount;
}

package org.jeecg.modules.service.entity;

import java.io.Serializable;

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) { //查询当前操作人是否有进行中团 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(new QueryWrapper<BasicConfig>()); 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.setThisAmount(basicConfig.getMinAmount()); //结束时间 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.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); } 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) { // 参数有效性校验 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); } GroupRecord groupRecord = groupRecordMapper.selectById(dto.getGroupId()); if (groupRecord == null) { throw new RuntimeException("找不到对应的团记录: " + dto.getGroupId()); } 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())) { 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) { //查询当前操作人是否有进行中团 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.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); } 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; } @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; } }

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) {
        //查询当前操作人是否有进行中团
        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(new QueryWrapper<BasicConfig>());
            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.setThisAmount(basicConfig.getMinAmount());
            //结束时间
            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.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);
        }
        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) {
        // 参数有效性校验
        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);
        }

GroupRecord groupRecord = groupRecordMapper.selectById(dto.getGroupId());
        if (groupRecord == null) {
            throw new RuntimeException("找不到对应的团记录: " + dto.getGroupId());
        }

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())) {
            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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

@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.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);
        }
        return groupRecordVO;
    }

/**
     * 创建预约单
     * @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;
    }

@Override
    public List<CardApplicationVO> cardApplicationList(String groupId) {
        List<CardApplicationVO> list = new ArrayList<>();

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java
package org.jeecg.modules.system.controller; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonStatusDTO; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper; import org.jeecg.modules.system.mapper.CommissionRefundMapper; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import org.springframework.web.servlet.ModelAndView; import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; /* * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-22 15:35 / @Slf4j @RestController @RequestMapping("/card/cardDeliveryPerson") public class CardDeliveryPersonController extends JeecgController<CardDeliveryPerson, ICardDeliveryPersonService> { @Resource private ICardDeliveryPersonService cardDeliveryPersonService; @Resource private CardDeliveryPersonMapper cardDeliveryPersonMapper; @Resource private CommissionRefundMapper commissionRefundMapper; @GetMapping(value = "/list") public Result<IPage<CardDeliveryPersonVO>> queryPageList(CardDeliveryPerson cardDeliveryPerson, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { // 参数校验 if (pageNo <= 0) { pageNo = 1; } if (pageSize <= 0 \|\| pageSize > 100) { pageSize = 10; } try { // 构建查询条件 QueryWrapper<CardDeliveryPerson> queryWrapper = QueryGenerator.initQueryWrapper(cardDeliveryPerson, req.getParameterMap()); // 分页查询 Page<CardDeliveryPerson> page = new Page<>(pageNo, pageSize); IPage<CardDeliveryPerson> pageList = cardDeliveryPersonService.page(page, queryWrapper); // 转换为VO对象 Page<CardDeliveryPersonVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardDeliveryPersonVO> voList = pageList.getRecords().stream().map(record -> { CardDeliveryPersonVO vo = new CardDeliveryPersonVO(); BeanUtils.copyProperties(record, vo); //已收送卡费 vo.setReceivableFee(getReceivableFee(record.getId())); //总送卡费 vo.setAllFee(getReceivableFee(record.getId())); //格式化创建时间 vo.setCreateTime(DateUtil.format(record.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); //处理状态 switch (record.getStatus()) { case "0": vo.setStatus("停用"); break; case "1": vo.setStatus("启用"); break; default: vo.setStatus(""); break; } return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询配送人员列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } //获取应收送卡费 private BigDecimal getReceivableFee(String id) { //查询送卡人id对应的佣金返还记录 QueryWrapper<CommissionRefund> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("card_delivery_person_id", id); queryWrapper.isNotNull("refundable_card_amount"); List<CommissionRefund> list = commissionRefundMapper.selectList(queryWrapper); return list.stream().map(CommissionRefund::getRefundableCardAmount).reduce(BigDecimal.ZERO, BigDecimal::add); } @PostMapping(value = "/add") public Result<?> add(@RequestBody CardDeliveryPersonDTO dto) { dto.setId(null); CardDeliveryPerson entry = new CardDeliveryPerson(); BeanUtils.copyProperties(dto, entry); entry.setStatus("0"); //默认停用 cardDeliveryPersonService.save(entry); return Result.OK("添加成功！"); } @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody CardDeliveryPersonDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(dto.getId()); BeanUtils.copyProperties(dto, entry); entry.setStatus("0"); //默认停用 cardDeliveryPersonService.updateById(entry); return Result.OK("修改成功,请重新启用！"); } @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { cardDeliveryPersonService.removeById(id); return Result.OK("删除成功!"); } @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.cardDeliveryPersonService.removeByIds(java.util.Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(id); return Result.OK(cardDeliveryPerson); } / * 更新状态停用/启用 * @param dto * @return / @RequestMapping(value = "/updateStatus", method = {RequestMethod.POST}) public Result<?> updateStatus(@RequestBody CardDeliveryPersonStatusDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getStatus())){ return Result.error("状态不能为空"); } CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(dto.getId()); entry.setStatus(dto.getStatus()); cardDeliveryPersonService.updateById(entry); return Result.OK("更新成功!"); } /* * 导出excel * * @param request * @param cardDeliveryPerson / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardDeliveryPerson cardDeliveryPerson) { return super.exportXls(request, cardDeliveryPerson, CardDeliveryPerson.class, "办卡人员"); } /* * 通过excel导入数据 * * @param request * @param response * @return / @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CardDeliveryPerson.class); } } package org.jeecg.modules.system.controller; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonStatusDTO; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import org.springframework.web.servlet.ModelAndView; import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-22 15:35 / @Slf4j @RestController @RequestMapping("/card/cardDeliveryPerson") public class CardDeliveryPersonController extends JeecgController<CardDeliveryPerson, ICardDeliveryPersonService> { @Resource private ICardDeliveryPersonService cardDeliveryPersonService; @Resource private CardDeliveryPersonMapper cardDeliveryPersonMapper; @GetMapping(value = "/list") public Result<IPage<CardDeliveryPersonVO>> queryPageList(CardDeliveryPerson cardDeliveryPerson, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { // 参数校验 if (pageNo <= 0) { pageNo = 1; } if (pageSize <= 0 \|\| pageSize > 100) { pageSize = 10; } try { // 构建查询条件 QueryWrapper<CardDeliveryPerson> queryWrapper = QueryGenerator.initQueryWrapper(cardDeliveryPerson, req.getParameterMap()); // 分页查询 Page<CardDeliveryPerson> page = new Page<>(pageNo, pageSize); IPage<CardDeliveryPerson> pageList = cardDeliveryPersonService.page(page, queryWrapper); // 转换为VO对象 Page<CardDeliveryPersonVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardDeliveryPersonVO> voList = pageList.getRecords().stream().map(record -> { CardDeliveryPersonVO vo = new CardDeliveryPersonVO(); BeanUtils.copyProperties(record, vo); //TODO:已收送卡费 vo.setReceivableFee(new BigDecimal(100)); //TODO:总送卡费 vo.setAllFee(new BigDecimal(200)); //格式化创建时间 vo.setCreateTime(DateUtil.format(record.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); //处理状态 switch (record.getStatus()) { case "0": vo.setStatus("停用"); break; case "1": vo.setStatus("启用"); break; default: vo.setStatus(""); break; } return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询配送人员列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } @PostMapping(value = "/add") public Result<?> add(@RequestBody CardDeliveryPersonDTO dto) { dto.setId(null); CardDeliveryPerson entry = new CardDeliveryPerson(); BeanUtils.copyProperties(dto, entry); entry.setStatus("0"); //默认停用 cardDeliveryPersonService.save(entry); return Result.OK("添加成功！"); } @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result<?> edit(@RequestBody CardDeliveryPersonDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(dto.getId()); BeanUtils.copyProperties(dto, entry); entry.setStatus("0"); //默认停用 cardDeliveryPersonService.updateById(entry); return Result.OK("修改成功,请重新启用！"); } @DeleteMapping(value = "/delete") public Result<?> delete(@RequestParam(name = "id", required = true) String id) { cardDeliveryPersonService.removeById(id); return Result.OK("删除成功!"); } @DeleteMapping(value = "/deleteBatch") public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { this.cardDeliveryPersonService.removeByIds(java.util.Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(id); return Result.OK(cardDeliveryPerson); } / * 更新状态停用/启用 * @param dto * @return / @RequestMapping(value = "/updateStatus", method = {RequestMethod.POST}) public Result<?> updateStatus(@RequestBody CardDeliveryPersonStatusDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getStatus())){ return Result.error("状态不能为空"); } CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(dto.getId()); entry.setStatus(dto.getStatus()); cardDeliveryPersonService.updateById(entry); return Result.OK("更新成功!"); } /* * 导出excel * * @param request * @param cardDeliveryPerson / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardDeliveryPerson cardDeliveryPerson) { return super.exportXls(request, cardDeliveryPerson, CardDeliveryPerson.class, "办卡人员"); } /* * 通过excel导入数据 * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, CardDeliveryPerson.class); } }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java

package org.jeecg.modules.system.controller;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.system.dto.CardDeliveryPersonDTO;
import org.jeecg.modules.system.dto.CardDeliveryPersonStatusDTO;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.entity.CommissionRefund;
import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper;
import org.jeecg.modules.system.mapper.CommissionRefundMapper;
import org.jeecg.modules.system.service.ICardDeliveryPersonService;
import org.jeecg.modules.system.vo.CardDeliveryPersonVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @program: jeecg-boot
 * @description:
 * @author: Mr.Yang
 * @create: 2025-09-22 15:35
 **/
@Slf4j
@RestController
@RequestMapping("/card/cardDeliveryPerson")
public class CardDeliveryPersonController extends JeecgController<CardDeliveryPerson, ICardDeliveryPersonService> {

@Resource
	private ICardDeliveryPersonService cardDeliveryPersonService;

@Resource
	private CardDeliveryPersonMapper cardDeliveryPersonMapper;

@Resource
	private CommissionRefundMapper commissionRefundMapper;

@GetMapping(value = "/list")
	public Result<IPage<CardDeliveryPersonVO>> queryPageList(CardDeliveryPerson cardDeliveryPerson,
															 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
															 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
															 HttpServletRequest req) {
		// 参数校验
		if (pageNo <= 0) {
			pageNo = 1;
		}
		if (pageSize <= 0 || pageSize > 100) {
			pageSize = 10;
		}

try {
			// 构建查询条件
			QueryWrapper<CardDeliveryPerson> queryWrapper = QueryGenerator.initQueryWrapper(cardDeliveryPerson, req.getParameterMap());

// 分页查询
			Page<CardDeliveryPerson> page = new Page<>(pageNo, pageSize);
			IPage<CardDeliveryPerson> pageList = cardDeliveryPersonService.page(page, queryWrapper);

// 转换为VO对象
			Page<CardDeliveryPersonVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
			List<CardDeliveryPersonVO> voList = pageList.getRecords().stream().map(record -> {
				CardDeliveryPersonVO vo = new CardDeliveryPersonVO();
				BeanUtils.copyProperties(record, vo);
				//已收送卡费
				vo.setReceivableFee(getReceivableFee(record.getId()));
				//总送卡费
				vo.setAllFee(getReceivableFee(record.getId()));
				//格式化创建时间
				vo.setCreateTime(DateUtil.format(record.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
				//处理状态
				switch (record.getStatus()) {
					case "0":
						vo.setStatus("停用");
						break;
					case "1":
						vo.setStatus("启用");
						break;
					default:
						vo.setStatus("");
						break;
				}
				return vo;
			}).collect(Collectors.toList());

voPage.setRecords(voList);

return Result.OK(voPage);
		} catch (Exception e) {
			log.error("查询配送人员列表失败", e);
			return Result.error("查询失败：" + e.getMessage());
		}
	}

//获取应收送卡费
	private BigDecimal getReceivableFee(String id) {
		//查询送卡人id对应的佣金返还记录
		QueryWrapper<CommissionRefund> queryWrapper = new QueryWrapper<>();
		queryWrapper.eq("card_delivery_person_id", id);
		queryWrapper.isNotNull("refundable_card_amount");
		List<CommissionRefund> list = commissionRefundMapper.selectList(queryWrapper);
        return list.stream().map(CommissionRefund::getRefundableCardAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
	}

@PostMapping(value = "/add")
	public Result<?> add(@RequestBody CardDeliveryPersonDTO dto) {
		dto.setId(null);
		CardDeliveryPerson entry = new CardDeliveryPerson();
		BeanUtils.copyProperties(dto, entry);
		entry.setStatus("0"); //默认停用
		cardDeliveryPersonService.save(entry);
		return Result.OK("添加成功！");
	}

@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
	public Result<?> edit(@RequestBody CardDeliveryPersonDTO dto) {
		if (StringUtils.isBlank(dto.getId())){
			return Result.error("ID不能为空");
		}
		CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(dto.getId());
		BeanUtils.copyProperties(dto, entry);
		entry.setStatus("0"); //默认停用
		cardDeliveryPersonService.updateById(entry);
		return Result.OK("修改成功,请重新启用！");
	}

@DeleteMapping(value = "/delete")
	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
		cardDeliveryPersonService.removeById(id);
		return Result.OK("删除成功!");
	}

@DeleteMapping(value = "/deleteBatch")
	public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
		this.cardDeliveryPersonService.removeByIds(java.util.Arrays.asList(ids.split(",")));
		return Result.OK("批量删除成功!");
	}

@GetMapping(value = "/queryById")
	public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
		CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(id);
		return Result.OK(cardDeliveryPerson);
	}

/**
	 * 更新状态 停用/启用
	 * @param dto
	 * @return
	 */
	@RequestMapping(value = "/updateStatus", method = {RequestMethod.POST})
	public Result<?> updateStatus(@RequestBody CardDeliveryPersonStatusDTO dto) {
		if (StringUtils.isBlank(dto.getId())){
			return Result.error("ID不能为空");
		}
		if (StringUtils.isBlank(dto.getStatus())){
			return Result.error("状态不能为空");
		}
		CardDeliveryPerson entry  = cardDeliveryPersonMapper.selectById(dto.getId());
		entry.setStatus(dto.getStatus());
		cardDeliveryPersonService.updateById(entry);
		return Result.OK("更新成功!");
	}

/**
	 * 导出excel
	 *
	 * @param request
	 * @param cardDeliveryPerson
	 */
	@RequestMapping(value = "/exportXls")
	public ModelAndView exportXls(HttpServletRequest request, CardDeliveryPerson cardDeliveryPerson) {
		return super.exportXls(request, cardDeliveryPerson, CardDeliveryPerson.class, "办卡人员");
	}

/**
	 * 通过excel导入数据
	 *
	 * @param request
	 * @param response
	 * @return
	 */
	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
		return super.importExcel(request, response, CardDeliveryPerson.class);
	}
}

package org.jeecg.modules.system.controller;

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.system.dto.CardDeliveryPersonDTO;
import org.jeecg.modules.system.dto.CardDeliveryPersonStatusDTO;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper;
import org.jeecg.modules.system.service.ICardDeliveryPersonService;
import org.jeecg.modules.system.vo.CardDeliveryPersonVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;

@Resource
	private ICardDeliveryPersonService cardDeliveryPersonService;

@Resource
	private CardDeliveryPersonMapper cardDeliveryPersonMapper;

try {
			// 构建查询条件
			QueryWrapper<CardDeliveryPerson> queryWrapper = QueryGenerator.initQueryWrapper(cardDeliveryPerson, req.getParameterMap());

// 分页查询
			Page<CardDeliveryPerson> page = new Page<>(pageNo, pageSize);
			IPage<CardDeliveryPerson> pageList = cardDeliveryPersonService.page(page, queryWrapper);

// 转换为VO对象
			Page<CardDeliveryPersonVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
			List<CardDeliveryPersonVO> voList = pageList.getRecords().stream().map(record -> {
				CardDeliveryPersonVO vo = new CardDeliveryPersonVO();
				BeanUtils.copyProperties(record, vo);
				//TODO:已收送卡费
				vo.setReceivableFee(new BigDecimal(100));
				//TODO:总送卡费
				vo.setAllFee(new BigDecimal(200));
				//格式化创建时间
				vo.setCreateTime(DateUtil.format(record.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
				//处理状态
				switch (record.getStatus()) {
					case "0":
						vo.setStatus("停用");
						break;
					case "1":
						vo.setStatus("启用");
						break;
					default:
						vo.setStatus("");
						break;
				}
				return vo;
			}).collect(Collectors.toList());

voPage.setRecords(voList);

return Result.OK(voPage);
		} catch (Exception e) {
			log.error("查询配送人员列表失败", e);
			return Result.error("查询失败：" + e.getMessage());
		}
	}

@DeleteMapping(value = "/delete")
	public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
		cardDeliveryPersonService.removeById(id);
		return Result.OK("删除成功!");
	}

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java
package org.jeecg.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Data @TableName("card_application_customers") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="办卡客户") public class CardApplicationCustomers implements Serializable { private static final long serialVersionUID = 1L; /id/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "id") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*分销客户id/ @Excel(name = "分销客户id", width = 15) @Schema(description = "分销客户id") private java.lang.String distributionCustomersId; /*分销客户姓名/ @Excel(name = "分销客户姓名", width = 15) @Schema(description = "分销客户姓名") private java.lang.String distributionCustomersName; /*分销客户手机号/ @Excel(name = "分销客户手机号", width = 15) @Schema(description = "分销客户手机号") private java.lang.String distributionCustomersPhone; /*办卡客户id/ @Excel(name = "办卡客户id", width = 15) @Schema(description = "办卡客户id") private java.lang.String cardApplicationId; /*办卡姓名/ @Excel(name = "办卡姓名", width = 15) @Schema(description = "办卡姓名") private java.lang.String cardApplicationName; /*办卡手机号/ @Excel(name = "办卡手机号", width = 15) @Schema(description = "办卡手机号") private java.lang.String cardApplicationPhone; /*预约单号/ @Excel(name = "预约单号", width = 15) @Schema(description = "预约单号") private java.lang.String reservationNumber; /*省/ @Excel(name = "省", width = 15) @Schema(description = "省") private java.lang.String province; /*市/ @Excel(name = "市", width = 15) @Schema(description = "市") private java.lang.String city; /*区/ @Excel(name = "区", width = 15) @Schema(description = "区") private java.lang.String area; /*详细地址/ @Excel(name = "详细地址", width = 15) @Schema(description = "详细地址") private java.lang.String address; /*预约时间/ @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "预约时间") private java.util.Date reservationTime; /*办理手机号/ @Excel(name = "办理手机号", width = 15) @Schema(description = "办理手机号") private java.lang.String transactionPhone; /*应返还佣金/ @Excel(name = "应返还佣金", width = 15) @Schema(description = "应返还佣金") private java.math.BigDecimal refundableCommission; /*实际返还佣金/ @Excel(name = "实际返还佣金", width = 15) @Schema(description = "实际返还佣金") private java.math.BigDecimal actualCommission; /*返还时间/ @Excel(name = "返还时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "返还时间") private java.util.Date refundableTime; /*首充金额/ @Excel(name = "首充金额", width = 15) @Schema(description = "首充金额") private java.math.BigDecimal amount; /*状态/ @Excel(name = "状态", width = 15) @Schema(description = "状态") private java.lang.String status; /*指定送卡人/ @Excel(name = "指定送卡人", width = 15) @Schema(description = "指定送卡人") private java.lang.String cardDeliveryPerson; /*客户类型/ @Excel(name = "客户类型", width = 15) @Schema(description = "客户类型") private java.lang.String type; } package org.jeecg.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Data @TableName("card_application_customers") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="办卡客户") public class CardApplicationCustomers implements Serializable { private static final long serialVersionUID = 1L; /id/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "id") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*分销客户id/ @Excel(name = "分销客户id", width = 15) @Schema(description = "分销客户id") private java.lang.String distributionCustomersId; /*分销客户姓名/ @Excel(name = "分销客户姓名", width = 15) @Schema(description = "分销客户姓名") private java.lang.String distributionCustomersName; /*分销客户手机号/ @Excel(name = "分销客户手机号", width = 15) @Schema(description = "分销客户手机号") private java.lang.String distributionCustomersPhone; /*办卡客户id/ @Excel(name = "办卡客户id", width = 15) @Schema(description = "办卡客户id") private java.lang.String cardApplicationId; /*办卡姓名/ @Excel(name = "办卡姓名", width = 15) @Schema(description = "办卡姓名") private java.lang.String cardApplicationName; /*办卡手机号/ @Excel(name = "办卡手机号", width = 15) @Schema(description = "办卡手机号") private java.lang.String cardApplicationPhone; /*预约单号/ @Excel(name = "预约单号", width = 15) @Schema(description = "预约单号") private java.lang.String reservationNumber; /*省/ @Excel(name = "省", width = 15) @Schema(description = "省") private java.lang.String province; /*市/ @Excel(name = "市", width = 15) @Schema(description = "市") private java.lang.String city; /*区/ @Excel(name = "区", width = 15) @Schema(description = "区") private java.lang.String area; /*详细地址/ @Excel(name = "详细地址", width = 15) @Schema(description = "详细地址") private java.lang.String address; /*预约时间/ @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "预约时间") private java.util.Date reservationTime; /*办理手机号/ @Excel(name = "办理手机号", width = 15) @Schema(description = "办理手机号") private java.lang.String transactionPhone; /*应返还佣金/ @Excel(name = "应返还佣金", width = 15) @Schema(description = "应返还佣金") private java.math.BigDecimal refundableCommission; /*实际返还佣金/ @Excel(name = "实际返还佣金", width = 15) @Schema(description = "实际返还佣金") private java.math.BigDecimal actualCommission; /*返还时间/ @Excel(name = "返还时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "返还时间") private java.util.Date refundableTime; /*首充金额/ @Excel(name = "首充金额", width = 15) @Schema(description = "首充金额") private java.math.BigDecimal amount; /*状态/ @Excel(name = "状态", width = 15) @Schema(description = "状态") private java.lang.String status; /*指定送卡人/ @Excel(name = "指定送卡人", width = 15) @Schema(description = "指定送卡人") private java.lang.String cardDeliveryPerson; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java

package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: 办卡客户
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Data
@TableName("card_application_customers")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="办卡客户")
public class CardApplicationCustomers implements Serializable {
    private static final long serialVersionUID = 1L;

/**id*/
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description = "id")
    private java.lang.String id;
    /**创建人*/
    @Schema(description = "创建人")
    private java.lang.String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "创建日期")
    private java.util.Date createTime;
    /**更新人*/
    @Schema(description = "更新人")
    private java.lang.String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "更新日期")
    private java.util.Date updateTime;
    /**所属部门*/
    @Schema(description = "所属部门")
    private java.lang.String sysOrgCode;
    /**分销客户id*/
    @Excel(name = "分销客户id", width = 15)
    @Schema(description = "分销客户id")
    private java.lang.String distributionCustomersId;
    /**分销客户姓名*/
    @Excel(name = "分销客户姓名", width = 15)
    @Schema(description = "分销客户姓名")
    private java.lang.String distributionCustomersName;
    /**分销客户手机号*/
    @Excel(name = "分销客户手机号", width = 15)
    @Schema(description = "分销客户手机号")
    private java.lang.String distributionCustomersPhone;
    /**办卡客户id*/
    @Excel(name = "办卡客户id", width = 15)
    @Schema(description = "办卡客户id")
    private java.lang.String cardApplicationId;
    /**办卡姓名*/
    @Excel(name = "办卡姓名", width = 15)
    @Schema(description = "办卡姓名")
    private java.lang.String cardApplicationName;
    /**办卡手机号*/
    @Excel(name = "办卡手机号", width = 15)
    @Schema(description = "办卡手机号")
    private java.lang.String cardApplicationPhone;
    /**预约单号*/
    @Excel(name = "预约单号", width = 15)
    @Schema(description = "预约单号")
    private java.lang.String reservationNumber;
    /**省*/
    @Excel(name = "省", width = 15)
    @Schema(description = "省")
    private java.lang.String province;
    /**市*/
    @Excel(name = "市", width = 15)
    @Schema(description = "市")
    private java.lang.String city;
    /**区*/
    @Excel(name = "区", width = 15)
    @Schema(description = "区")
    private java.lang.String area;
    /**详细地址*/
    @Excel(name = "详细地址", width = 15)
    @Schema(description = "详细地址")
    private java.lang.String address;
    /**预约时间*/
    @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "预约时间")
    private java.util.Date reservationTime;
    /**办理手机号*/
    @Excel(name = "办理手机号", width = 15)
    @Schema(description = "办理手机号")
    private java.lang.String transactionPhone;
    /**应返还佣金*/
    @Excel(name = "应返还佣金", width = 15)
    @Schema(description = "应返还佣金")
    private java.math.BigDecimal refundableCommission;
    /**实际返还佣金*/
    @Excel(name = "实际返还佣金", width = 15)
    @Schema(description = "实际返还佣金")
    private java.math.BigDecimal actualCommission;
    /**返还时间*/
    @Excel(name = "返还时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "返还时间")
    private java.util.Date refundableTime;
    /**首充金额*/
    @Excel(name = "首充金额", width = 15)
    @Schema(description = "首充金额")
    private java.math.BigDecimal amount;
    /**状态*/
    @Excel(name = "状态", width = 15)
    @Schema(description = "状态")
    private java.lang.String status;
    /**指定送卡人*/
    @Excel(name = "指定送卡人", width = 15)
    @Schema(description = "指定送卡人")
    private java.lang.String cardDeliveryPerson;
    /**客户类型*/
    @Excel(name = "客户类型", width = 15)
    @Schema(description = "客户类型")
    private java.lang.String type;
}

package org.jeecg.modules.system.entity;

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/impl/CommissionRefundServiceImpl.java
package org.jeecg.modules.system.service.impl; import freemarker.template.utility.DateUtil; import jakarta.annotation.Resource; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.mapper.GroupMembersMapper; import org.jeecg.modules.service.mapper.GroupRecordMapper; import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO; import org.jeecg.modules.system.entity.BasicConfig; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; 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.CardDeliveryPersonMapper; import org.jeecg.modules.system.mapper.CommissionRefundMapper; import org.jeecg.modules.system.service.ICommissionRefundService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.math.BigDecimal; import java.util.Date; /** * @Description: 佣金返还 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Service public class CommissionRefundServiceImpl extends ServiceImpl<CommissionRefundMapper, CommissionRefund> implements ICommissionRefundService { @Resource private CardDeliveryPersonMapper cardDeliveryPersonMapper; @Resource private CardApplicationCustomersMapper cardApplicationCustomersMapper; @Override public void updateAmount(CommissionRefundUpdateDTO dto) { CommissionRefund entry = getById(dto.getId()); switch (dto.getOperationType()){ case "0": //返送卡费 entry.setRefundableCardAmount(dto.getAmount()); entry.setActualCardAmount(dto.getAmount()); this.updateCardAmount(entry.getCardDeliveryPersonId(),dto.getAmount()); entry.setCardAmountTime(new Date()); break; case "1": //返佣金 entry.setActualCommission(dto.getAmount()); this.updateCommission(entry.getReservationId(),dto.getAmount()); entry.setRefundableTime(new Date()); break; case "2": //返办卡费 entry.setActualAmount(dto.getAmount()); break; } this.updateById(entry); } /* * 更新返送卡费 * @param id * @param amount / private void updateCardAmount(String id, BigDecimal amount) { //查询送卡人 CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(id); if (entry == null){ throw new JeecgBootException("送卡人不存在"); } if (entry.getReceivableFee() != null){ entry.setReceivableFee(entry.getReceivableFee().add(amount)); }else { entry.setReceivableFee(amount); } if (entry.getAllFee() != null){ entry.setAllFee(entry.getAllFee().add(amount)); entry.setAllFee(entry.getAllFee().add(amount)); } cardDeliveryPersonMapper.updateById(entry); } /* * 更新返佣金 * @param id * @param amount / private void updateCommission(String id, BigDecimal amount) { //查询办卡客户 CardApplicationCustomers entry = cardApplicationCustomersMapper.selectById(id); if (entry == null){ throw new JeecgBootException("分销人不存在"); } entry.setActualCommission(amount); entry.setRefundableTime(new Date()); cardApplicationCustomersMapper.updateById(entry); } @Override public void create(CardApplicationCustomers cardApplicationCustomers) { CommissionRefund entry = new CommissionRefund(); entry.setReservationId(cardApplicationCustomers.getId()); entry.setReservationNumber(cardApplicationCustomers.getReservationNumber()); entry.setReservationTime(cardApplicationCustomers.getReservationTime()); entry.setCardApplicationId(cardApplicationCustomers.getCardApplicationId()); entry.setCardApplicationName(cardApplicationCustomers.getCardApplicationName()); entry.setCardApplicationPhone(cardApplicationCustomers.getCardApplicationPhone()); if(cardApplicationCustomers.getType() != null && cardApplicationCustomers.getType().equals("1")){ entry.setRefundableAmount(cardApplicationCustomers.getRefundableCommission()); }else if(cardApplicationCustomers.getType() != null && cardApplicationCustomers.getType().equals("0")){ entry.setRefundableCommission(cardApplicationCustomers.getRefundableCommission()); } entry.setRefundableCommission(BigDecimal.ZERO); entry.setRefundableAmount(BigDecimal.ZERO); entry.setCardDeliveryPersonId(cardApplicationCustomers.getCardDeliveryPerson()); //查询送卡人信息 CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonMapper.selectById(cardApplicationCustomers.getCardDeliveryPerson()); if(cardDeliveryPerson != null){ entry.setCardDeliveryPersonName(cardDeliveryPerson.getName()); entry.setCardDeliveryPersonPhone(cardDeliveryPerson.getPhone()); entry.setDxWorkNo(cardDeliveryPerson.getDxWorkNo()); } entry.setDistributionCustomersId(cardApplicationCustomers.getDistributionCustomersId()); entry.setDistributionCustomersName(cardApplicationCustomers.getDistributionCustomersName()); entry.setDistributionCustomersPhone(cardApplicationCustomers.getDistributionCustomersPhone()); this.save(entry); } } package org.jeecg.modules.system.service.impl; import freemarker.template.utility.DateUtil; import jakarta.annotation.Resource; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper; import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper; import org.jeecg.modules.system.mapper.CommissionRefundMapper; import org.jeecg.modules.system.service.ICommissionRefundService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.math.BigDecimal; import java.util.Date; /* * @Description: 佣金返还 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Service public class CommissionRefundServiceImpl extends ServiceImpl<CommissionRefundMapper, CommissionRefund> implements ICommissionRefundService { @Resource private CardDeliveryPersonMapper cardDeliveryPersonMapper; @Resource private CardApplicationCustomersMapper cardApplicationCustomersMapper; @Override public void updateAmount(CommissionRefundUpdateDTO dto) { CommissionRefund entry = getById(dto.getId()); switch (dto.getOperationType()){ case "0": //返送卡费 entry.setRefundableCardAmount(dto.getAmount()); entry.setActualCardAmount(dto.getAmount()); this.updateCardAmount(entry.getCardDeliveryPersonId(),dto.getAmount()); entry.setCardAmountTime(new Date()); break; case "1": //返佣金 entry.setActualCommission(dto.getAmount()); this.updateCommission(entry.getReservationId(),dto.getAmount()); entry.setRefundableTime(new Date()); break; case "2": //返办卡费 entry.setActualAmount(dto.getAmount()); break; } this.updateById(entry); } /* * 更新返送卡费 * @param id * @param amount / private void updateCardAmount(String id, BigDecimal amount) { //查询送卡人 CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(id); if (entry == null){ throw new JeecgBootException("送卡人不存在"); } if (entry.getReceivableFee() != null){ entry.setReceivableFee(entry.getReceivableFee().add(amount)); }else { entry.setReceivableFee(amount); } if (entry.getAllFee() != null){ entry.setAllFee(entry.getAllFee().add(amount)); entry.setAllFee(entry.getAllFee().add(amount)); } cardDeliveryPersonMapper.updateById(entry); } /* * 更新返佣金 * @param id * @param amount */ private void updateCommission(String id, BigDecimal amount) { //查询办卡客户 CardApplicationCustomers entry = cardApplicationCustomersMapper.selectById(id); if (entry == null){ throw new JeecgBootException("分销人不存在"); } entry.setActualCommission(amount); entry.setRefundableTime(new Date()); cardApplicationCustomersMapper.updateById(entry); } @Override public void create(CardApplicationCustomers cardApplicationCustomers) { CommissionRefund entry = new CommissionRefund(); entry.setReservationId(cardApplicationCustomers.getId()); entry.setReservationNumber(cardApplicationCustomers.getReservationNumber()); entry.setReservationTime(cardApplicationCustomers.getReservationTime()); entry.setCardApplicationId(cardApplicationCustomers.getCardApplicationId()); entry.setCardApplicationName(cardApplicationCustomers.getCardApplicationName()); entry.setCardApplicationPhone(cardApplicationCustomers.getCardApplicationPhone()); //TODO：应返利金额 entry.setRefundableAmount(BigDecimal.ZERO); entry.setCardDeliveryPersonId(cardApplicationCustomers.getCardDeliveryPerson()); //查询送卡人信息 CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonMapper.selectById(cardApplicationCustomers.getCardDeliveryPerson()); if(cardDeliveryPerson != null){ entry.setCardDeliveryPersonName(cardDeliveryPerson.getName()); entry.setCardDeliveryPersonPhone(cardDeliveryPerson.getPhone()); entry.setDxWorkNo(cardDeliveryPerson.getDxWorkNo()); } entry.setDistributionCustomersId(cardApplicationCustomers.getDistributionCustomersId()); entry.setDistributionCustomersName(cardApplicationCustomers.getDistributionCustomersName()); entry.setDistributionCustomersPhone(cardApplicationCustomers.getDistributionCustomersPhone()); //TODO：应返佣金 entry.setRefundableCommission(BigDecimal.ZERO); this.save(entry); } }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/service/impl/CommissionRefundServiceImpl.java

package org.jeecg.modules.system.service.impl;

import freemarker.template.utility.DateUtil;
import jakarta.annotation.Resource;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.service.entity.GroupRecord;
import org.jeecg.modules.service.mapper.GroupMembersMapper;
import org.jeecg.modules.service.mapper.GroupRecordMapper;
import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO;
import org.jeecg.modules.system.entity.BasicConfig;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
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.CardDeliveryPersonMapper;
import org.jeecg.modules.system.mapper.CommissionRefundMapper;
import org.jeecg.modules.system.service.ICommissionRefundService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @Description: 佣金返还
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Service
public class CommissionRefundServiceImpl extends ServiceImpl<CommissionRefundMapper, CommissionRefund> implements ICommissionRefundService {

@Resource
    private CardDeliveryPersonMapper cardDeliveryPersonMapper;

@Resource
    private CardApplicationCustomersMapper cardApplicationCustomersMapper;

@Override
    public void updateAmount(CommissionRefundUpdateDTO dto) {
        CommissionRefund entry = getById(dto.getId());
        switch (dto.getOperationType()){
            case "0": //返送卡费
                entry.setRefundableCardAmount(dto.getAmount());
                entry.setActualCardAmount(dto.getAmount());
                this.updateCardAmount(entry.getCardDeliveryPersonId(),dto.getAmount());
                entry.setCardAmountTime(new Date());
                break;
            case "1": //返佣金
                entry.setActualCommission(dto.getAmount());
                this.updateCommission(entry.getReservationId(),dto.getAmount());
                entry.setRefundableTime(new Date());
                break;
            case "2": //返办卡费
                entry.setActualAmount(dto.getAmount());
                break;
        }
        this.updateById(entry);
    }

/**
     * 更新返送卡费
     * @param id
     * @param amount
     */
    private void updateCardAmount(String id, BigDecimal amount) {
        //查询送卡人
        CardDeliveryPerson entry = cardDeliveryPersonMapper.selectById(id);
        if (entry ==  null){
            throw new JeecgBootException("送卡人不存在");
        }
        if (entry.getReceivableFee() != null){
            entry.setReceivableFee(entry.getReceivableFee().add(amount));
        }else {
            entry.setReceivableFee(amount);
        }
        if (entry.getAllFee() != null){
            entry.setAllFee(entry.getAllFee().add(amount));
            entry.setAllFee(entry.getAllFee().add(amount));
        }
        cardDeliveryPersonMapper.updateById(entry);
    }

/**
     * 更新返佣金
     * @param id
     * @param amount
     */
    private void updateCommission(String id, BigDecimal amount) {
        //查询办卡客户
        CardApplicationCustomers entry = cardApplicationCustomersMapper.selectById(id);
        if (entry ==  null){
            throw new JeecgBootException("分销人不存在");
        }
        entry.setActualCommission(amount);
        entry.setRefundableTime(new Date());
        cardApplicationCustomersMapper.updateById(entry);
    }

@Override
    public void create(CardApplicationCustomers cardApplicationCustomers) {
        CommissionRefund entry = new CommissionRefund();
        entry.setReservationId(cardApplicationCustomers.getId());
        entry.setReservationNumber(cardApplicationCustomers.getReservationNumber());
        entry.setReservationTime(cardApplicationCustomers.getReservationTime());
        entry.setCardApplicationId(cardApplicationCustomers.getCardApplicationId());
        entry.setCardApplicationName(cardApplicationCustomers.getCardApplicationName());
        entry.setCardApplicationPhone(cardApplicationCustomers.getCardApplicationPhone());
        if(cardApplicationCustomers.getType() != null && cardApplicationCustomers.getType().equals("1")){
            entry.setRefundableAmount(cardApplicationCustomers.getRefundableCommission());
        }else if(cardApplicationCustomers.getType() != null && cardApplicationCustomers.getType().equals("0")){
            entry.setRefundableCommission(cardApplicationCustomers.getRefundableCommission());
        }
        entry.setRefundableCommission(BigDecimal.ZERO);
        entry.setRefundableAmount(BigDecimal.ZERO);
        entry.setCardDeliveryPersonId(cardApplicationCustomers.getCardDeliveryPerson());
        //查询送卡人信息
        CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonMapper.selectById(cardApplicationCustomers.getCardDeliveryPerson());
        if(cardDeliveryPerson != null){
            entry.setCardDeliveryPersonName(cardDeliveryPerson.getName());
            entry.setCardDeliveryPersonPhone(cardDeliveryPerson.getPhone());
            entry.setDxWorkNo(cardDeliveryPerson.getDxWorkNo());
        }
        entry.setDistributionCustomersId(cardApplicationCustomers.getDistributionCustomersId());
        entry.setDistributionCustomersName(cardApplicationCustomers.getDistributionCustomersName());
        entry.setDistributionCustomersPhone(cardApplicationCustomers.getDistributionCustomersPhone());
        this.save(entry);
    }

}

package org.jeecg.modules.system.service.impl;

import freemarker.template.utility.DateUtil;
import jakarta.annotation.Resource;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.entity.CommissionRefund;
import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper;
import org.jeecg.modules.system.mapper.CardDeliveryPersonMapper;
import org.jeecg.modules.system.mapper.CommissionRefundMapper;
import org.jeecg.modules.system.service.ICommissionRefundService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.math.BigDecimal;
import java.util.Date;

@Resource
    private CardDeliveryPersonMapper cardDeliveryPersonMapper;

@Resource
    private CardApplicationCustomersMapper cardApplicationCustomersMapper;

@Override
    public void create(CardApplicationCustomers cardApplicationCustomers) {
        CommissionRefund entry = new CommissionRefund();
        entry.setReservationId(cardApplicationCustomers.getId());
        entry.setReservationNumber(cardApplicationCustomers.getReservationNumber());
        entry.setReservationTime(cardApplicationCustomers.getReservationTime());
        entry.setCardApplicationId(cardApplicationCustomers.getCardApplicationId());
        entry.setCardApplicationName(cardApplicationCustomers.getCardApplicationName());
        entry.setCardApplicationPhone(cardApplicationCustomers.getCardApplicationPhone());
        //TODO：应返利金额
        entry.setRefundableAmount(BigDecimal.ZERO);
        entry.setCardDeliveryPersonId(cardApplicationCustomers.getCardDeliveryPerson());
        //查询送卡人信息
        CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonMapper.selectById(cardApplicationCustomers.getCardDeliveryPerson());
        if(cardDeliveryPerson != null){
            entry.setCardDeliveryPersonName(cardDeliveryPerson.getName());
            entry.setCardDeliveryPersonPhone(cardDeliveryPerson.getPhone());
            entry.setDxWorkNo(cardDeliveryPerson.getDxWorkNo());
        }
        entry.setDistributionCustomersId(cardApplicationCustomers.getDistributionCustomersId());
        entry.setDistributionCustomersName(cardApplicationCustomers.getDistributionCustomersName());
        entry.setDistributionCustomersPhone(cardApplicationCustomers.getDistributionCustomersPhone());
        //TODO：应返佣金
        entry.setRefundableCommission(BigDecimal.ZERO);
        this.save(entry);
    }
}

Show line notes below