Merge branch 'master' of http://git.yn-ce.com/git/fujun/dxCard-service

fujun / dxCard-service

Browse code Merge branch 'master' of http://git.yn-ce.com/git/fujun/dxCard-service # Conflicts: # jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/controller/GroupRecordController.java master
commit 91b148d56b2abad3b5b16c9759b6f47d20f7ee4d 2 parents 66e94b0 + 6077cb1 jiangqihao authored 29 days ago

Patch

Showing 6 changed files

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/controller/GroupRecordController.java
package org.jeecg.modules.service.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.service.dto.SubmitReservationDTO; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.service.IGroupRecordService; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; /* * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Tag(name="成团记录") @RestController @RequestMapping("/service/groupRecord") @Slf4j public class GroupRecordController extends JeecgController<GroupRecord, IGroupRecordService> { @Autowired private IGroupRecordService groupRecordService; /* * 获取当前操作人成团记录 * @param userId 操作人 * @return / @RequestMapping(value = "/getGroupRecordVO", method = RequestMethod.GET) public Result<GroupRecordVO> getGroupRecordVO(@RequestParam("userId") String userId){ if (StringUtils.isBlank(userId)){ throw new JeecgBootException("稍后重试"); } GroupRecordVO vo = groupRecordService.getGroupRecordVO(userId); return Result.OK(vo); } /* * 提交预约 * @return / @RequestMapping(value = "/submitReservation", method = RequestMethod.POST) public Result<ReservationSuccessVO> submitReservation(@RequestBody SubmitReservationDTO dto){ if (StringUtils.isBlank(dto.getType())){ return Result.error("预约类型不能为空"); } if (dto.getType().equals("0") && StringUtils.isBlank(dto.getDistributionCustomersId())){ return Result.error("分销客户id不能为空"); } if (dto.getType().equals("1") && StringUtils.isBlank(dto.getGroupId())){ return Result.error("成团id不能为空"); } if (StringUtils.isBlank(dto.getCardApplicationId())){ return Result.error("办卡客户id不能为空"); } ReservationSuccessVO vo = groupRecordService.submitReservation(dto); return Result.OK(vo); } } package org.jeecg.modules.service.controller; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.exception.JeecgBootException; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.service.IGroupRecordService; import org.jeecg.modules.service.vo.GroupRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Tag(name="成团记录") @RestController @RequestMapping("/service/groupRecord") @Slf4j public class GroupRecordController extends JeecgController<GroupRecord, IGroupRecordService> { @Autowired private IGroupRecordService groupRecordService; /* * 获取当前操作人成团记录 * @param userId 操作人 * @return */ @RequestMapping(value = "/getGroupRecordVO", method = RequestMethod.GET) public Result<GroupRecordVO> getGroupRecordVO(@RequestParam("userId") String userId){ if (StringUtils.isBlank(userId)){ throw new JeecgBootException("稍后重试"); } GroupRecordVO vo = groupRecordService.getGroupRecordVO(userId); return Result.OK(vo); } }

Ignore Space Show notes View

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

package org.jeecg.modules.service.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.service.dto.SubmitReservationDTO;
import org.jeecg.modules.service.entity.GroupRecord;
import org.jeecg.modules.service.service.IGroupRecordService;
import org.jeecg.modules.service.vo.GroupRecordVO;
import org.jeecg.modules.service.vo.ReservationSuccessVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import java.util.Arrays;
/**
 * @Description: 成团记录
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Tag(name="成团记录")
@RestController
@RequestMapping("/service/groupRecord")
@Slf4j
public class GroupRecordController extends JeecgController<GroupRecord, IGroupRecordService> {
    @Autowired
    private IGroupRecordService groupRecordService;

/**
     * 获取当前操作人成团记录
     * @param userId 操作人
     * @return
     */
    @RequestMapping(value = "/getGroupRecordVO", method = RequestMethod.GET)
    public Result<GroupRecordVO> getGroupRecordVO(@RequestParam("userId") String userId){
        if (StringUtils.isBlank(userId)){
            throw new JeecgBootException("稍后重试");
        }
        GroupRecordVO vo = groupRecordService.getGroupRecordVO(userId);
        return Result.OK(vo);
    }

/**
     * 提交预约
     * @return
     */
    @RequestMapping(value = "/submitReservation", method = RequestMethod.POST)
    public Result<ReservationSuccessVO> submitReservation(@RequestBody SubmitReservationDTO dto){
        if (StringUtils.isBlank(dto.getType())){
            return Result.error("预约类型不能为空");
        }
        if (dto.getType().equals("0") && StringUtils.isBlank(dto.getDistributionCustomersId())){
            return Result.error("分销客户id不能为空");
        }
        if (dto.getType().equals("1") && StringUtils.isBlank(dto.getGroupId())){
            return Result.error("成团id不能为空");
        }
        if (StringUtils.isBlank(dto.getCardApplicationId())){
            return Result.error("办卡客户id不能为空");
        }
        ReservationSuccessVO vo = groupRecordService.submitReservation(dto);
        return Result.OK(vo);
    }
}

package org.jeecg.modules.service.controller;

import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.service.entity.GroupRecord;
import org.jeecg.modules.service.service.IGroupRecordService;
import org.jeecg.modules.service.vo.GroupRecordVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * @Description: 成团记录
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Tag(name="成团记录")
@RestController
@RequestMapping("/service/groupRecord")
@Slf4j
public class GroupRecordController extends JeecgController<GroupRecord, IGroupRecordService> {
    @Autowired
    private IGroupRecordService groupRecordService;

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/dto/SubmitReservationDTO.java 0 → 100644
package org.jeecg.modules.service.dto; import lombok.Data; import java.io.Serializable; /** * @program: jeecg-boot * @description: 提交预约DTO * @author: Mr.Yang * @create: 2025-09-28 09:39 / @Data public class SubmitReservationDTO implements Serializable { / * 预约类型（必填）：0：分销、1：拼团 / private String type; /* * 分销人id 分销时必传上级userId / private String distributionCustomersId; /* * 团id 拼团时必传团详情id / private String groupId; /* * 办卡客户id / private String cardApplicationId; /* * 办卡客户姓名 / private String cardApplicationName; /* * 办卡客户手机号 / private String cardApplicationPhone; /* * 预约时间 / private Long reservationTime; /* * 省 / private String province; /* * 市 / private String city; /* * 区 / private String area; /* * 详细地址 */ private String address; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/dto/SubmitReservationDTO.java 0 → 100644

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/service/IGroupRecordService.java
package org.jeecg.modules.service.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.service.dto.SubmitReservationDTO; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; /** * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / public interface IGroupRecordService extends IService<GroupRecord> { GroupRecordVO getGroupRecordVO(String userId); ReservationSuccessVO submitReservation(SubmitReservationDTO dto); } package org.jeecg.modules.service.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.service.entity.GroupRecord; import org.jeecg.modules.service.vo.GroupRecordVO; import org.springframework.web.bind.annotation.RequestParam; /* * @Description: 成团记录 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 */ public interface IGroupRecordService extends IService<GroupRecord> { GroupRecordVO getGroupRecordVO(String userId); }

Ignore Space Show notes View

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

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

Ignore Space Show notes View

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

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

import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
import org.jeecg.modules.service.dto.SubmitReservationDTO;
import org.jeecg.modules.service.entity.AuthUser;
import org.jeecg.modules.service.entity.GroupMembers;
import org.jeecg.modules.service.entity.GroupRecord;
import org.jeecg.modules.service.mapper.AuthUserMapper;
import org.jeecg.modules.service.mapper.GroupMembersMapper;
import org.jeecg.modules.service.mapper.GroupRecordMapper;
import org.jeecg.modules.service.service.IGroupRecordService;
import org.jeecg.modules.service.vo.GroupMemberVO;
import org.jeecg.modules.service.vo.GroupRecordVO;
import org.jeecg.modules.service.vo.ReservationSuccessVO;
import org.jeecg.modules.system.entity.BasicConfig;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.entity.CommissionRefund;
import org.jeecg.modules.system.mapper.BasicConfigMapper;
import org.jeecg.modules.system.mapper.CardApplicationCustomersMapper;
import org.jeecg.modules.system.mapper.CommissionRefundMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

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

/**
 * @Description: 成团记录
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Service
public class GroupRecordServiceImpl extends ServiceImpl<GroupRecordMapper, GroupRecord> implements IGroupRecordService {

@Resource
    private GroupRecordMapper groupRecordMapper;
    @Resource
    private GroupMembersMapper groupMembersMapper;
    @Resource
    private BasicConfigMapper basicConfigMapper;
    @Resource
    private AuthUserMapper authUserMapper;
    @Resource
    private CommissionRefundMapper commissionRefundMapper;
    @Resource
    private CardApplicationCustomersMapper cardApplicationCustomersMapper;

@Override
    public GroupRecordVO getGroupRecordVO(String userId) {
        //查询当前操作人是否有进行中团
        QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("group_leader_id", userId);
        queryWrapper.eq("status", "0"); //进行中
        GroupRecord groupRecord = groupRecordMapper.selectOne(queryWrapper);
        if (groupRecord == null){
            //创建新的团
            //查询基础配置
            List<BasicConfig> basicConfigs = basicConfigMapper.selectList(null);
            BasicConfig basicConfig = basicConfigs.get(0);
            if (basicConfig == null){
                //获取不到配置时默认配置
                basicConfig = new BasicConfig();
                basicConfig.setDistributionCommission(new BigDecimal("20.00"));
                basicConfig.setMinPeopleNumber(2);
                basicConfig.setMaxPeopleNumber(3);
                basicConfig.setMinAmount(new BigDecimal("30.00"));
                basicConfig.setMaxAmount(new BigDecimal("50.00"));
                basicConfig.setGroundTime(24);//24小时
            }
            groupRecord = new GroupRecord();
            groupRecord.setGroupLeaderId(userId);
            groupRecord.setStatus("0"); //默认进行中
            groupRecord.setStartTime(new Date());
            //结束时间
            groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000));
            this.baseMapper.insert(groupRecord);
        }
        GroupRecordVO groupRecordVO = new GroupRecordVO();
        groupRecordVO.setId(groupRecord.getId());
        groupRecordVO.setUserId(groupRecord.getGroupLeaderId());
        groupRecordVO.setStartTime(groupRecord.getStartTime().getTime());
        groupRecordVO.setEndTime(groupRecord.getEndTime().getTime());
        groupRecordVO.setGroupMembers(new ArrayList<>());
        //查询当前团团成员
        QueryWrapper<GroupMembers> queryWrapper1 = new QueryWrapper<>();
        queryWrapper1.eq("group_id", groupRecord.getId());
        List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper1);
        for (GroupMembers groupMember : groupMembers) {
            GroupMemberVO memberVO = new GroupMemberVO();
            memberVO.setId(groupMember.getId());
            memberVO.setUserId(groupMember.getClientId());
            //查询用户信息
            AuthUser authUser = authUserMapper.selectById(groupMember.getClientId());
            if (authUser != null){
                memberVO.setName(authUser.getWxName());
                //查询该团是否已返钱
                memberVO.setIsMoney(false);
                CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId());
                if (commissionRefund != null && commissionRefund.getActualAmount() != null){
                    memberVO.setIsMoney(true);
                    memberVO.setAmount(commissionRefund.getActualAmount());
                    memberVO.setReservationId(groupMember.getReservationId());
                }
            }
            groupRecordVO.getGroupMembers().add(memberVO);
        }
        return groupRecordVO;
    }

@Override
    public ReservationSuccessVO submitReservation(SubmitReservationDTO dto) {
        //校验是否已存在对应预约单
        if (dto.getType().equals("0")){
            QueryWrapper<CardApplicationCustomers> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("card_application_id", dto.getCardApplicationId());
            queryWrapper.eq("distribution_customers_id", dto.getDistributionCustomersId());
            CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersMapper.selectOne(queryWrapper);
            if (cardApplicationCustomers != null){
                throw new RuntimeException("当前用户已参加过该分销");
            }
        }else if (dto.getType().equals("1")){
            QueryWrapper<GroupMembers> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("client_id", dto.getCardApplicationId());
            queryWrapper.eq("group_id", dto.getGroupId());
            GroupMembers groupMembers = groupMembersMapper.selectOne(queryWrapper);
            if (groupMembers != null){
                throw new RuntimeException("当前用户已加入了该团");
            }
        }
        CardApplicationCustomers cardApplicationCustomers = createCardApplicationCustomers(dto);
        ReservationSuccessVO vo = new ReservationSuccessVO();
        vo.setId(cardApplicationCustomers.getId());
        vo.setReservationTime(DateUtil.format(cardApplicationCustomers.getReservationTime(), "yyyy-MM-dd HH:mm:ss"));
        vo.setAddress(cardApplicationCustomers.getProvince() + cardApplicationCustomers.getCity() + cardApplicationCustomers.getArea() + cardApplicationCustomers.getAddress());
        return vo;
    }

/**
     * 创建预约单
     * @param dto
     * @return
     */
    private CardApplicationCustomers createCardApplicationCustomers(SubmitReservationDTO dto) {
        CardApplicationCustomers cardApplicationCustomers = new CardApplicationCustomers();
        BeanUtils.copyProperties(dto, cardApplicationCustomers);
        if (dto.getType().equals("0")){
            AuthUser authUser = authUserMapper.selectById(dto.getDistributionCustomersId());
            cardApplicationCustomers.setDistributionCustomersName(authUser.getWxName());
            cardApplicationCustomers.setDistributionCustomersPhone(authUser.getWxPhone());
            cardApplicationCustomers.setDistributionCustomersId(authUser.getId());
        }
        cardApplicationCustomers.setRefundableTime(new Date(dto.getReservationTime()));
        cardApplicationCustomers.setStatus("0"); //待处理
        cardApplicationCustomersMapper.insert(cardApplicationCustomers);
        //创建团成员
        if (dto.getType().equals("1")){
            GroupMembers groupMembers = new GroupMembers();
            groupMembers.setClientId(dto.getCardApplicationId());
            groupMembers.setGroupId(dto.getGroupId());
            groupMembers.setStatus("0");
            groupMembers.setReservationId(cardApplicationCustomers.getId());
            groupMembersMapper.insert(groupMembers);
        }
        return cardApplicationCustomers;
    }
}

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

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import jakarta.annotation.Resource;
import org.jeecg.modules.service.entity.AuthUser;
import org.jeecg.modules.service.entity.GroupMembers;
import org.jeecg.modules.service.entity.GroupRecord;
import org.jeecg.modules.service.mapper.AuthUserMapper;
import org.jeecg.modules.service.mapper.GroupMembersMapper;
import org.jeecg.modules.service.mapper.GroupRecordMapper;
import org.jeecg.modules.service.service.IGroupRecordService;
import org.jeecg.modules.service.vo.GroupMemberVO;
import org.jeecg.modules.service.vo.GroupRecordVO;
import org.jeecg.modules.system.entity.BasicConfig;
import org.jeecg.modules.system.entity.CommissionRefund;
import org.jeecg.modules.system.mapper.BasicConfigMapper;
import org.jeecg.modules.system.mapper.CommissionRefundMapper;
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;

@Override
    public GroupRecordVO getGroupRecordVO(String userId) {
        //查询当前操作人是否有进行中团
        QueryWrapper<GroupRecord> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("group_leader_id", userId);
        queryWrapper.eq("status", "0"); //进行中
        GroupRecord groupRecord = this.baseMapper.selectOne(queryWrapper);
        if (groupRecord == null){
            //创建新的团
            //查询基础配置
            List<BasicConfig> basicConfigs = basicConfigMapper.selectList(null);
            BasicConfig basicConfig = basicConfigs.get(0);
            if (basicConfig == null){
                //获取不到配置时默认配置
                basicConfig = new BasicConfig();
                basicConfig.setDistributionCommission(new BigDecimal("20.00"));
                basicConfig.setMinPeopleNumber(2);
                basicConfig.setMaxPeopleNumber(3);
                basicConfig.setMinAmount(new BigDecimal("30.00"));
                basicConfig.setMaxAmount(new BigDecimal("50.00"));
                basicConfig.setGroundTime(24);//24小时
            }
            groupRecord = new GroupRecord();
            groupRecord.setGroupLeaderId(userId);
            groupRecord.setStatus("0"); //默认进行中
            groupRecord.setStartTime(new Date());
            //结束时间
            groupRecord.setEndTime(new Date(groupRecord.getStartTime().getTime() + basicConfig.getGroundTime() * 60 * 60 * 1000));
            this.baseMapper.insert(groupRecord);
        }
        GroupRecordVO groupRecordVO = new GroupRecordVO();
        groupRecordVO.setId(groupRecord.getId());
        groupRecordVO.setUserId(groupRecord.getGroupLeaderId());
        groupRecordVO.setStartTime(groupRecord.getStartTime().getTime());
        groupRecordVO.setEndTime(groupRecord.getEndTime().getTime());
        groupRecordVO.setGroupMembers(new ArrayList<>());
        //查询当前团团成员
        QueryWrapper<GroupMembers> queryWrapper1 = new QueryWrapper<>();
        queryWrapper1.eq("group_id", groupRecord.getId());
        List<GroupMembers> groupMembers = groupMembersMapper.selectList(queryWrapper1);
        for (GroupMembers groupMember : groupMembers) {
            GroupMemberVO memberVO = new GroupMemberVO();
            memberVO.setId(groupMember.getId());
            memberVO.setUserId(groupMember.getClientId());
            //查询用户信息
            AuthUser authUser = authUserMapper.selectById(groupMember.getClientId());
            if (authUser != null){
                memberVO.setName(authUser.getWxName());
                //查询该团是否已返钱
                memberVO.setIsMoney(false);
                CommissionRefund commissionRefund = commissionRefundMapper.findByReservationId(groupMember.getReservationId());
                if (commissionRefund != null && commissionRefund.getActualAmount() != null){
                    memberVO.setIsMoney(true);
                    memberVO.setAmount(commissionRefund.getActualAmount());
                }
            }
            groupRecordVO.getGroupMembers().add(memberVO);
        }
        return groupRecordVO;
    }
}

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/vo/GroupMemberVO.java
package org.jeecg.modules.service.vo; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * @program: jeecg-boot * @description: 团成员VO * @author: Mr.Yang * @create: 2025-09-26 17:33 / @Data public class GroupMemberVO implements Serializable { / * 成员 id / private String id; /* * 成员userId / private String userId; /* * 关联预约单id,用于修改预约时间 / private String reservationId; /* * 团成员名称 / private String name; /* * 团成员头像 / private String headImg; /* * 是否已赚钱 / private Boolean isMoney; /* * 已赚金额 / private BigDecimal amount; } package org.jeecg.modules.service.vo; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /* * @program: jeecg-boot * @description: 团成员VO * @author: Mr.Yang * @create: 2025-09-26 17:33 / @Data public class GroupMemberVO implements Serializable { / * 成员 id / private String id; /* * 成员userId / private String userId; /* * 团成员名称 / private String name; /* * 团成员头像 / private String headImg; /* * 是否已赚钱 / private Boolean isMoney; /* * 已赚金额 */ private BigDecimal amount; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/vo/GroupMemberVO.java

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/vo/ReservationSuccessVO.java 0 → 100644
package org.jeecg.modules.service.vo; import lombok.Data; import java.io.Serializable; /** * @program: jeecg-boot * @description: 预约成功VO * @author: Mr.Yang * @create: 2025-09-28 09:32 / @Data public class ReservationSuccessVO implements Serializable { / * 预约单id / private String id; /* * 预约时间 / private String reservationTime; /* * 省+市+区+详细地址 */ private String address; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/vo/ReservationSuccessVO.java 0 → 100644

Show line notes below