修改预约时间调整

fujun / dxCard-service

Browse code 修改预约时间调整 master
1 parent 12a205d commit 20042d39f92022144719de1adc932bc4eff17d59 YFJ authored 29 days ago

Patch

Showing 3 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.ReservationTimeDTO; 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.CardApplicationVO; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; import java.util.Date; import java.util.List; /* * @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; @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; /* * 获取当前操作人成团记录 * @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); } /* * 修改预约时间 * @return / @RequestMapping(value = "/updateTime", method = RequestMethod.POST) public Result<String> updateTime(@RequestBody ReservationTimeDTO dto){ if (StringUtils.isBlank(dto.getId())){ return Result.error("预约id不能为空"); } if (dto.getReservationTime() == null){ return Result.error("预约时间不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); if (entry == null){ return Result.error("预约单不存在"); } if (entry.getStatus().equals("2")){ return Result.error("该预约单已办卡"); } entry.setCardApplicationName(dto.getCardApplicationName()); entry.setCardApplicationPhone(dto.getCardApplicationPhone()); entry.setProvince(dto.getProvince()); entry.setCity(dto.getCity()); entry.setArea(dto.getArea()); entry.setAddress(dto.getAddress()); entry.setReservationTime(new Date(dto.getReservationTime())); cardApplicationCustomersService.updateById(entry); return Result.OK("预约时间修改成功！"); } /* * 获取成团预约列表 * 办卡晒单 * @return / @RequestMapping(value = "/cardApplicationList", method = RequestMethod.GET) public Result<List<CardApplicationVO>> cardApplicationList(@RequestParam("groupId") String groupId){ if (StringUtils.isBlank(groupId)){ return Result.error("团id不能为空"); } List<CardApplicationVO> list = groupRecordService.cardApplicationList(groupId); return Result.OK(list); } } 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.ReservationTimeDTO; 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.CardApplicationVO; import org.jeecg.modules.service.vo.GroupRecordVO; import org.jeecg.modules.service.vo.ReservationSuccessVO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import org.springframework.web.servlet.ModelAndView; import java.util.Arrays; import java.util.Date; import java.util.List; /** * @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; @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; /* * 获取当前操作人成团记录 * @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); } /* * 修改预约时间 * @return / @RequestMapping(value = "/updateTime", method = RequestMethod.POST) public Result<String> updateTime(@RequestBody ReservationTimeDTO dto){ if (StringUtils.isBlank(dto.getId())){ return Result.error("预约id不能为空"); } if (dto.getReservationTime() == null){ return Result.error("预约时间不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); if (entry == null){ return Result.error("预约单不存在"); } entry.setReservationTime(new Date(dto.getReservationTime())); cardApplicationCustomersService.updateById(entry); return Result.OK("预约时间修改成功！"); } /* * 获取成团预约列表 * 办卡晒单 * @return */ @RequestMapping(value = "/cardApplicationList", method = RequestMethod.GET) public Result<List<CardApplicationVO>> cardApplicationList(@RequestParam("groupId") String groupId){ if (StringUtils.isBlank(groupId)){ return Result.error("团id不能为空"); } List<CardApplicationVO> list = groupRecordService.cardApplicationList(groupId); return Result.OK(list); } }

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.ReservationTimeDTO;
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.CardApplicationVO;
import org.jeecg.modules.service.vo.GroupRecordVO;
import org.jeecg.modules.service.vo.ReservationSuccessVO;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.service.ICardApplicationCustomersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

/**
 * @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;
    @Autowired
    private ICardApplicationCustomersService cardApplicationCustomersService;

/**
     * 获取当前操作人成团记录
     * @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);
    }

/**
     * 修改预约时间
     * @return
     */
    @RequestMapping(value = "/updateTime", method = RequestMethod.POST)
    public Result<String> updateTime(@RequestBody ReservationTimeDTO dto){
        if (StringUtils.isBlank(dto.getId())){
            return Result.error("预约id不能为空");
        }
        if (dto.getReservationTime() == null){
            return Result.error("预约时间不能为空");
        }
        CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId());
        if (entry == null){
            return Result.error("预约单不存在");
        }
        if (entry.getStatus().equals("2")){
            return Result.error("该预约单已办卡");
        }
        entry.setCardApplicationName(dto.getCardApplicationName());
        entry.setCardApplicationPhone(dto.getCardApplicationPhone());
        entry.setProvince(dto.getProvince());
        entry.setCity(dto.getCity());
        entry.setArea(dto.getArea());
        entry.setAddress(dto.getAddress());
        entry.setReservationTime(new Date(dto.getReservationTime()));
        cardApplicationCustomersService.updateById(entry);
        return Result.OK("预约时间修改成功！");
    }

/**
     * 获取成团预约列表
     * 办卡晒单
     * @return
     */
    @RequestMapping(value = "/cardApplicationList", method = RequestMethod.GET)
    public Result<List<CardApplicationVO>> cardApplicationList(@RequestParam("groupId") String groupId){
        if (StringUtils.isBlank(groupId)){
            return Result.error("团id不能为空");
        }
        List<CardApplicationVO> list = groupRecordService.cardApplicationList(groupId);
        return Result.OK(list);
    }
}

package org.jeecg.modules.service.controller;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/service/dto/ReservationTimeDTO.java
package org.jeecg.modules.service.dto; import lombok.Data; import java.io.Serializable; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-28 10:56 / @Data public class ReservationTimeDTO implements Serializable { / * 预约单id / private String id; /* * 预约时间 / private Long reservationTime; /* * 办卡客户姓名 / private String cardApplicationName; /* * 办卡客户手机号 / private String cardApplicationPhone; /* * 省 / private String province; /* * 市 / private String city; /* * 区 / private String area; /* * 详细地址 / private String address; } package org.jeecg.modules.service.dto; import lombok.Data; import java.io.Serializable; /* * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-28 10:56 / @Data public class ReservationTimeDTO implements Serializable { / * 预约单id / private String id; /* * 预约时间 */ private Long reservationTime; }

Ignore Space Show notes View

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

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CommissionRefundController.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 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.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.service.ICommissionRefundService; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.jeecg.modules.system.vo.CommissionRefundVO; 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.Arrays; import java.util.List; import java.util.stream.Collectors; /* * @Description: 佣金返还 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Tag(name="佣金返还") @RestController @RequestMapping("/system/commissionRefund") @Slf4j public class CommissionRefundController extends JeecgController<CommissionRefund, ICommissionRefundService> { @Autowired private ICommissionRefundService commissionRefundService; /* * 分页列表查询 * * @param commissionRefund * @param pageNo * @param pageSize * @param req * @return / // @Operation(summary="佣金返还-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CommissionRefundVO>> queryPageList(CommissionRefund commissionRefund, @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<CommissionRefund> queryWrapper = QueryGenerator.initQueryWrapper(commissionRefund, req.getParameterMap()); // 分页查询 Page<CommissionRefund> page = new Page<>(pageNo, pageSize); IPage<CommissionRefund> pageList = commissionRefundService.page(page, queryWrapper); // 转换为VO对象 Page<CommissionRefundVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CommissionRefundVO> voList = pageList.getRecords().stream().map(record -> { CommissionRefundVO vo = new CommissionRefundVO(); BeanUtils.copyProperties(record, vo); //处理时间 if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getCardAmountTime() != null){ vo.setCardAmountTime(DateUtil.format(record.getCardAmountTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getCardApplicationTime() != null){ vo.setCardApplicationTime(DateUtil.format(record.getCardApplicationTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getReservationTime() != null){ vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); } return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询佣金返还列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } /* * 通过id查询 * * @param id * @return / //@AutoLog(value = "佣金返还-通过id查询") @Operation(summary="佣金返还-通过id查询") @GetMapping(value = "/queryById") public Result<CommissionRefund> queryById(@RequestParam(name="id",required=true) String id) { CommissionRefund commissionRefund = commissionRefundService.getById(id); if(commissionRefund==null) { return Result.error("未找到对应数据"); } return Result.OK(commissionRefund); } /* * 导出excel * * @param request * @param commissionRefund / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CommissionRefund commissionRefund) { return super.exportXls(request, commissionRefund, CommissionRefund.class, "佣金返还"); } /* * 更新各操作返利 * * @param dto * @return / @RequestMapping(value = "/updateAmount", method = RequestMethod.POST) public Result<String> updateAmount(@RequestBody CommissionRefundUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (dto.getAmount() == null){ return Result.error("金额不能为空"); } if (StringUtils.isBlank(dto.getOperationType())){ return Result.error("操作类型不能为空"); } commissionRefundService.updateAmount(dto); return Result.OK("操作成功"); } } 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 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.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.entity.CommissionRefund; import org.jeecg.modules.system.service.ICommissionRefundService; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.jeecg.modules.system.vo.CommissionRefundVO; 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.Arrays; import java.util.List; import java.util.stream.Collectors; /** * @Description: 佣金返还 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Tag(name="佣金返还") @RestController @RequestMapping("/system/commissionRefund") @Slf4j public class CommissionRefundController extends JeecgController<CommissionRefund, ICommissionRefundService> { @Autowired private ICommissionRefundService commissionRefundService; /* * 分页列表查询 * * @param commissionRefund * @param pageNo * @param pageSize * @param req * @return / //@AutoLog(value = "佣金返还-分页列表查询") @Operation(summary="佣金返还-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CommissionRefundVO>> queryPageList(CommissionRefund commissionRefund, @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<CommissionRefund> queryWrapper = QueryGenerator.initQueryWrapper(commissionRefund, req.getParameterMap()); // 分页查询 Page<CommissionRefund> page = new Page<>(pageNo, pageSize); IPage<CommissionRefund> pageList = commissionRefundService.page(page, queryWrapper); // 转换为VO对象 Page<CommissionRefundVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CommissionRefundVO> voList = pageList.getRecords().stream().map(record -> { CommissionRefundVO vo = new CommissionRefundVO(); BeanUtils.copyProperties(record, vo); //处理时间 if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getCardAmountTime() != null){ vo.setCardAmountTime(DateUtil.format(record.getCardAmountTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getCardApplicationTime() != null){ vo.setCardApplicationTime(DateUtil.format(record.getCardApplicationTime(), "yyyy-MM-dd HH:mm:ss")); } if (record.getReservationTime() != null){ vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); } return vo; }).collect(Collectors.toList()); voPage.setRecords(voList); return Result.OK(voPage); } catch (Exception e) { log.error("查询佣金返还列表失败", e); return Result.error("查询失败：" + e.getMessage()); } } /* * 通过id查询 * * @param id * @return / //@AutoLog(value = "佣金返还-通过id查询") @Operation(summary="佣金返还-通过id查询") @GetMapping(value = "/queryById") public Result<CommissionRefund> queryById(@RequestParam(name="id",required=true) String id) { CommissionRefund commissionRefund = commissionRefundService.getById(id); if(commissionRefund==null) { return Result.error("未找到对应数据"); } return Result.OK(commissionRefund); } /* * 导出excel * * @param request * @param commissionRefund / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CommissionRefund commissionRefund) { return super.exportXls(request, commissionRefund, CommissionRefund.class, "佣金返还"); } /* * 更新各操作返利 * * @param dto * @return */ @RequestMapping(value = "/updateAmount", method = RequestMethod.POST) public Result<String> updateAmount(@RequestBody CommissionRefundUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (dto.getAmount() == null){ return Result.error("金额不能为空"); } if (StringUtils.isBlank(dto.getOperationType())){ return Result.error("操作类型不能为空"); } commissionRefundService.updateAmount(dto); return Result.OK("操作成功"); } }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CommissionRefundController.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 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.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.system.dto.CommissionRefundUpdateDTO;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.entity.CommissionRefund;
import org.jeecg.modules.system.service.ICommissionRefundService;
import org.jeecg.modules.system.vo.CardDeliveryPersonVO;
import org.jeecg.modules.system.vo.CommissionRefundVO;
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.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @Description: 佣金返还
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Tag(name="佣金返还")
@RestController
@RequestMapping("/system/commissionRefund")
@Slf4j
public class CommissionRefundController extends JeecgController<CommissionRefund, ICommissionRefundService> {
    @Autowired
    private ICommissionRefundService commissionRefundService;

/**
     * 分页列表查询
     *
     * @param commissionRefund
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //
    @Operation(summary="佣金返还-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CommissionRefundVO>> queryPageList(CommissionRefund commissionRefund,
                                                           @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<CommissionRefund> queryWrapper = QueryGenerator.initQueryWrapper(commissionRefund, req.getParameterMap());

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

// 转换为VO对象
            Page<CommissionRefundVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
            List<CommissionRefundVO> voList = pageList.getRecords().stream().map(record -> {
                CommissionRefundVO vo = new CommissionRefundVO();
                BeanUtils.copyProperties(record, vo);
                //处理时间
                if (record.getRefundableTime() != null){
                    vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                if (record.getCardAmountTime() != null){
                    vo.setCardAmountTime(DateUtil.format(record.getCardAmountTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                if (record.getCardApplicationTime() != null){
                    vo.setCardApplicationTime(DateUtil.format(record.getCardApplicationTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                if (record.getReservationTime() != null){
                    vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                return vo;
            }).collect(Collectors.toList());

voPage.setRecords(voList);

return Result.OK(voPage);
        } catch (Exception e) {
            log.error("查询佣金返还列表失败", e);
            return Result.error("查询失败：" + e.getMessage());
        }
    }

/**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "佣金返还-通过id查询")
    @Operation(summary="佣金返还-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CommissionRefund> queryById(@RequestParam(name="id",required=true) String id) {
        CommissionRefund commissionRefund = commissionRefundService.getById(id);
        if(commissionRefund==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(commissionRefund);
    }

/**
     * 导出excel
     *
     * @param request
     * @param commissionRefund
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CommissionRefund commissionRefund) {
        return super.exportXls(request, commissionRefund, CommissionRefund.class, "佣金返还");
    }

/**
     * 更新各操作返利
     *
     * @param dto
     * @return
     */
    @RequestMapping(value = "/updateAmount", method = RequestMethod.POST)
    public Result<String> updateAmount(@RequestBody CommissionRefundUpdateDTO dto) {
        if (StringUtils.isBlank(dto.getId())){
            return Result.error("ID不能为空");
        }
        if (dto.getAmount() == null){
            return Result.error("金额不能为空");
        }
        if (StringUtils.isBlank(dto.getOperationType())){
            return Result.error("操作类型不能为空");
        }
        commissionRefundService.updateAmount(dto);
        return Result.OK("操作成功");
    }
}

package org.jeecg.modules.system.controller;

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

/**
     * 分页列表查询
     *
     * @param commissionRefund
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "佣金返还-分页列表查询")
    @Operation(summary="佣金返还-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CommissionRefundVO>> queryPageList(CommissionRefund commissionRefund,
                                                           @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<CommissionRefund> queryWrapper = QueryGenerator.initQueryWrapper(commissionRefund, req.getParameterMap());

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

voPage.setRecords(voList);

Show line notes below