问题调整

fujun / dxCard-service

Browse code 问题调整 master
1 parent 3d82f18 commit 78b46e476e30be7a8a2533a1ea98684f54d1797d YFJ authored 6 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/AuthUserController.java
package org.jeecg.modules.service.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.system.base.controller.JeecgController; import org.jeecg.modules.service.dto.AuthUserUpdateDTO; import org.jeecg.modules.service.dto.CardApplicationDTO; import org.jeecg.modules.service.entity.AuthUser; import org.jeecg.modules.service.service.IAuthUserService; import org.jeecg.modules.service.vo.; 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.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.service.ICommissionRefundService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import java.util.Date; import java.util.List; /** * @Description: 微信用户档案 * @Author: jeecg-boot * @Date: 2025-09-28 * @Version: V1.0 / @Tag(name="微信用户档案") @RestController @RequestMapping("/service/authUser") @Slf4j public class AuthUserController extends JeecgController<AuthUser, IAuthUserService> { @Autowired private IAuthUserService authUserService; @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; @Autowired private ICommissionRefundService commissionRefundService; /* 我的-推荐用户列表 / @RequestMapping(value = "/recommendUser", method = RequestMethod.GET) public Result<RecommendUserVO> recommendUser(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } RecommendUserVO vo = authUserService.recommendUser(userId); return Result.OK(vo); } /** 我的-参团信息 / @RequestMapping(value = "/myGroupMemberList", method = RequestMethod.GET) public Result<List<MyGroupMemberVO>> myGroupMemberList(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } List<MyGroupMemberVO> list = authUserService.myGroupMemberList(userId); return Result.OK(list); } /** * 我的资料 / @RequestMapping(value = "/detail", method = RequestMethod.GET) public Result<AuthUserVO> detail(@RequestParam (name = "id",required=false) String id) { AuthUserVO vo = new AuthUserVO(); AuthUser authUser = authUserService.getById(id); if (authUser == null){ return Result.error("用户不存在"); } BeanUtils.copyProperties(authUser,vo); vo.setIsCardMan(false); if (authUser.getWxPhone() != null){ QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("phone", authUser.getWxPhone()); CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getOne(queryWrapper); if (cardDeliveryPerson != null){ vo.setIsCardMan(true); } } return Result.OK(vo); } @RequestMapping(value = "/update", method = RequestMethod.POST) public Result<?> update(@RequestBody AuthUserUpdateDTO authUserUpdateDTO) { AuthUser authUser = authUserService.getById(authUserUpdateDTO.getId()); authUser.setAvatar(authUserUpdateDTO.getAvatar()); authUser.setWxName(authUserUpdateDTO.getName()); authUser.setProvince(authUserUpdateDTO.getProvince()); authUser.setCity(authUserUpdateDTO.getCity()); authUser.setArea(authUserUpdateDTO.getArea()); authUser.setAddress(authUserUpdateDTO.getAddress()); authUserService.updateById(authUser); return Result.OK("修改成功"); } /* * 开卡任务 / @RequestMapping(value = "/dispatchUser", method = RequestMethod.GET) public Result<List<DispatchUserVO>> dispatchUser(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } List<DispatchUserVO> list = authUserService.dispatchUser(userId); return Result.OK(list); } /* * 开卡任务详情 / @RequestMapping(value = "/dispatchUserDetail", method = RequestMethod.GET) public Result<DispatchDetailVO> dispatchUserDetail(@RequestParam (name = "id") String id) { if (StringUtils.isBlank(id)){ return Result.error("预约单id不能为空"); } DispatchDetailVO vo = authUserService.dispatchUserDetail(id); return Result.OK(vo); } /* * 办卡 / @RequestMapping(value = "/cardApplication", method = RequestMethod.POST) public Result<?> cardApplication(@RequestBody CardApplicationDTO cardApplicationDTO) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(cardApplicationDTO.getId()); if (cardApplicationCustomers == null){ return Result.error("预约单不存在"); } if (cardApplicationCustomers.getStatus().equals("2")){ return Result.error("该预约单已处理"); } cardApplicationCustomers.setStatus("2"); cardApplicationCustomers.setTransactionPhone(cardApplicationDTO.getTransactionPhone()); cardApplicationCustomers.setAmount(cardApplicationDTO.getAmount()); cardApplicationCustomersService.updateById(cardApplicationCustomers); //更新佣金返还 QueryWrapper<CommissionRefund> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("reservation_id", cardApplicationDTO.getId()); CommissionRefund refund = commissionRefundService.getOne(queryWrapper); refund.setCardApplicationTime(new Date()); refund.setAmount(cardApplicationDTO.getAmount()); return Result.OK("提交办卡成功"); } } package org.jeecg.modules.service.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.system.base.controller.JeecgController; import org.jeecg.modules.service.dto.AuthUserUpdateDTO; import org.jeecg.modules.service.dto.CardApplicationDTO; import org.jeecg.modules.service.entity.AuthUser; import org.jeecg.modules.service.service.IAuthUserService; import org.jeecg.modules.service.vo.; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.; import java.util.List; /* * @Description: 微信用户档案 * @Author: jeecg-boot * @Date: 2025-09-28 * @Version: V1.0 / @Tag(name="微信用户档案") @RestController @RequestMapping("/service/authUser") @Slf4j public class AuthUserController extends JeecgController<AuthUser, IAuthUserService> { @Autowired private IAuthUserService authUserService; @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; /* 我的-推荐用户列表 / @RequestMapping(value = "/recommendUser", method = RequestMethod.GET) public Result<RecommendUserVO> recommendUser(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } RecommendUserVO vo = authUserService.recommendUser(userId); return Result.OK(vo); } /** 我的-参团信息 / @RequestMapping(value = "/myGroupMemberList", method = RequestMethod.GET) public Result<List<MyGroupMemberVO>> myGroupMemberList(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } List<MyGroupMemberVO> list = authUserService.myGroupMemberList(userId); return Result.OK(list); } /** * 我的资料 / @RequestMapping(value = "/detail", method = RequestMethod.GET) public Result<AuthUserVO> detail(@RequestParam (name = "id",required=false) String id) { AuthUserVO vo = new AuthUserVO(); AuthUser authUser = authUserService.getById(id); if (authUser == null){ return Result.error("用户不存在"); } BeanUtils.copyProperties(authUser,vo); vo.setIsCardMan(false); if (authUser.getWxPhone() != null){ QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("phone", authUser.getWxPhone()); CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getOne(queryWrapper); if (cardDeliveryPerson != null){ vo.setIsCardMan(true); } } return Result.OK(vo); } @RequestMapping(value = "/update", method = RequestMethod.POST) public Result<?> update(@RequestBody AuthUserUpdateDTO authUserUpdateDTO) { AuthUser authUser = authUserService.getById(authUserUpdateDTO.getId()); authUser.setAvatar(authUserUpdateDTO.getAvatar()); authUser.setWxName(authUserUpdateDTO.getName()); authUser.setProvince(authUserUpdateDTO.getProvince()); authUser.setCity(authUserUpdateDTO.getCity()); authUser.setArea(authUserUpdateDTO.getArea()); authUser.setAddress(authUserUpdateDTO.getAddress()); authUserService.updateById(authUser); return Result.OK("修改成功"); } /* * 开卡任务 / @RequestMapping(value = "/dispatchUser", method = RequestMethod.GET) public Result<List<DispatchUserVO>> dispatchUser(@RequestParam (name = "userId") String userId) { if (StringUtils.isBlank(userId)){ return Result.error("用户id不能为空"); } List<DispatchUserVO> list = authUserService.dispatchUser(userId); return Result.OK(list); } /* * 开卡任务详情 / @RequestMapping(value = "/dispatchUserDetail", method = RequestMethod.GET) public Result<DispatchDetailVO> dispatchUserDetail(@RequestParam (name = "id") String id) { if (StringUtils.isBlank(id)){ return Result.error("预约单id不能为空"); } DispatchDetailVO vo = authUserService.dispatchUserDetail(id); return Result.OK(vo); } /* * 办卡 */ @RequestMapping(value = "/cardApplication", method = RequestMethod.POST) public Result<?> cardApplication(@RequestBody CardApplicationDTO cardApplicationDTO) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(cardApplicationDTO.getId()); if (cardApplicationCustomers == null){ return Result.error("预约单不存在"); } if (cardApplicationCustomers.getStatus().equals("2")){ return Result.error("该预约单已处理"); } cardApplicationCustomers.setStatus("2"); cardApplicationCustomers.setTransactionPhone(cardApplicationDTO.getTransactionPhone()); cardApplicationCustomers.setAmount(cardApplicationDTO.getAmount()); cardApplicationCustomersService.updateById(cardApplicationCustomers); return Result.OK("提交办卡成功"); } }

Ignore Space Show notes View

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

package org.jeecg.modules.service.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.system.base.controller.JeecgController;
import org.jeecg.modules.service.dto.AuthUserUpdateDTO;
import org.jeecg.modules.service.dto.CardApplicationDTO;
import org.jeecg.modules.service.entity.AuthUser;
import org.jeecg.modules.service.service.IAuthUserService;
import org.jeecg.modules.service.vo.*;
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.service.ICardApplicationCustomersService;
import org.jeecg.modules.system.service.ICardDeliveryPersonService;
import org.jeecg.modules.system.service.ICommissionRefundService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
/**
 * @Description: 微信用户档案
 * @Author: jeecg-boot
 * @Date:   2025-09-28
 * @Version: V1.0
 */
@Tag(name="微信用户档案")
@RestController
@RequestMapping("/service/authUser")
@Slf4j
public class AuthUserController extends JeecgController<AuthUser, IAuthUserService> {
    @Autowired
    private IAuthUserService authUserService;

@Autowired
    private ICardApplicationCustomersService cardApplicationCustomersService;

@Autowired
    private ICardDeliveryPersonService cardDeliveryPersonService;

@Autowired
    private ICommissionRefundService commissionRefundService;

/**
     *我的-推荐用户列表
     */
    @RequestMapping(value = "/recommendUser", method = RequestMethod.GET)
    public Result<RecommendUserVO> recommendUser(@RequestParam (name = "userId") String userId) {
        if (StringUtils.isBlank(userId)){
            return Result.error("用户id不能为空");
        }
        RecommendUserVO vo = authUserService.recommendUser(userId);
        return Result.OK(vo);
    }

/**
     *我的-参团信息
     */
    @RequestMapping(value = "/myGroupMemberList", method = RequestMethod.GET)
    public Result<List<MyGroupMemberVO>> myGroupMemberList(@RequestParam (name = "userId") String userId) {
        if (StringUtils.isBlank(userId)){
            return Result.error("用户id不能为空");
        }
        List<MyGroupMemberVO> list = authUserService.myGroupMemberList(userId);
        return Result.OK(list);
    }

/**
     * 我的资料
     */
    @RequestMapping(value = "/detail", method = RequestMethod.GET)
    public Result<AuthUserVO> detail(@RequestParam (name = "id",required=false) String id) {
        AuthUserVO vo = new AuthUserVO();
        AuthUser authUser = authUserService.getById(id);
        if (authUser == null){
            return Result.error("用户不存在");
        }
        BeanUtils.copyProperties(authUser,vo);
        vo.setIsCardMan(false);
        if (authUser.getWxPhone() != null){
            QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("phone", authUser.getWxPhone());
            CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getOne(queryWrapper);
            if (cardDeliveryPerson != null){
                vo.setIsCardMan(true);
            }
        }
        return Result.OK(vo);
    }

@RequestMapping(value = "/update", method = RequestMethod.POST)
    public Result<?> update(@RequestBody AuthUserUpdateDTO authUserUpdateDTO) {
        AuthUser authUser = authUserService.getById(authUserUpdateDTO.getId());
        authUser.setAvatar(authUserUpdateDTO.getAvatar());
        authUser.setWxName(authUserUpdateDTO.getName());
        authUser.setProvince(authUserUpdateDTO.getProvince());
        authUser.setCity(authUserUpdateDTO.getCity());
        authUser.setArea(authUserUpdateDTO.getArea());
        authUser.setAddress(authUserUpdateDTO.getAddress());
        authUserService.updateById(authUser);
        return Result.OK("修改成功");
    }

/**
     * 开卡任务
     */
    @RequestMapping(value = "/dispatchUser", method = RequestMethod.GET)
    public Result<List<DispatchUserVO>> dispatchUser(@RequestParam (name = "userId") String userId) {
        if (StringUtils.isBlank(userId)){
            return Result.error("用户id不能为空");
        }
        List<DispatchUserVO> list = authUserService.dispatchUser(userId);
        return Result.OK(list);
    }

/**
     * 开卡任务详情
     */
    @RequestMapping(value = "/dispatchUserDetail", method = RequestMethod.GET)
    public Result<DispatchDetailVO> dispatchUserDetail(@RequestParam (name = "id") String id) {
        if (StringUtils.isBlank(id)){
            return Result.error("预约单id不能为空");
        }
        DispatchDetailVO vo = authUserService.dispatchUserDetail(id);
        return Result.OK(vo);
    }

/**
     * 办卡
     */
    @RequestMapping(value = "/cardApplication", method = RequestMethod.POST)
    public Result<?> cardApplication(@RequestBody CardApplicationDTO cardApplicationDTO) {
        CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(cardApplicationDTO.getId());
        if (cardApplicationCustomers == null){
            return Result.error("预约单不存在");
        }
        if (cardApplicationCustomers.getStatus().equals("2")){
            return Result.error("该预约单已处理");
        }
        cardApplicationCustomers.setStatus("2");
        cardApplicationCustomers.setTransactionPhone(cardApplicationDTO.getTransactionPhone());
        cardApplicationCustomers.setAmount(cardApplicationDTO.getAmount());
        cardApplicationCustomersService.updateById(cardApplicationCustomers);
        //更新佣金返还
        QueryWrapper<CommissionRefund> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("reservation_id", cardApplicationDTO.getId());
        CommissionRefund refund = commissionRefundService.getOne(queryWrapper);
        refund.setCardApplicationTime(new Date());
        refund.setAmount(cardApplicationDTO.getAmount());
        return Result.OK("提交办卡成功");
    }
}

package org.jeecg.modules.service.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.system.base.controller.JeecgController;
import org.jeecg.modules.service.dto.AuthUserUpdateDTO;
import org.jeecg.modules.service.dto.CardApplicationDTO;
import org.jeecg.modules.service.entity.AuthUser;
import org.jeecg.modules.service.service.IAuthUserService;
import org.jeecg.modules.service.vo.*;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.service.ICardApplicationCustomersService;
import org.jeecg.modules.system.service.ICardDeliveryPersonService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
/**
 * @Description: 微信用户档案
 * @Author: jeecg-boot
 * @Date:   2025-09-28
 * @Version: V1.0
 */
@Tag(name="微信用户档案")
@RestController
@RequestMapping("/service/authUser")
@Slf4j
public class AuthUserController extends JeecgController<AuthUser, IAuthUserService> {
    @Autowired
    private IAuthUserService authUserService;

@Autowired
    private ICardApplicationCustomersService cardApplicationCustomersService;

@Autowired
    private ICardDeliveryPersonService cardDeliveryPersonService;

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardApplicationCustomersController.java
package org.jeecg.modules.system.controller; import java.math.BigDecimal; import java.util.; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import cn.hutool.core.date.DateUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.service.ICommissionRefundService; import org.jeecg.modules.system.vo.AreaCardDeliveryPersonVO; import org.jeecg.modules.system.vo.CardApplicationCustomersVO; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.web.bind.annotation.; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 / @Tag(name="办卡客户") @RestController @RequestMapping("/customers/cardApplicationCustomers") @Slf4j public class CardApplicationCustomersController extends JeecgController<CardApplicationCustomers, ICardApplicationCustomersService> { @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; @Autowired private ICommissionRefundService commissionRefundService; /* * 分页列表查询 * * @param cardApplicationCustomers * @param pageNo * @param pageSize * @param req * @return / //@AutoLog(value = "办卡客户-分页列表查询") @Operation(summary="办卡客户-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CardApplicationCustomersVO>> queryPageList(CardApplicationCustomers cardApplicationCustomers, @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<CardApplicationCustomers> queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); // 分页查询 Page<CardApplicationCustomers> page = new Page<>(pageNo, pageSize); IPage<CardApplicationCustomers> pageList = cardApplicationCustomersService.page(page, queryWrapper); // 转换为VO对象 Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> { CardApplicationCustomersVO vo = new CardApplicationCustomersVO(); BeanUtils.copyProperties(record, vo); //处理预约时间 vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); //处理返还时间 vo.setRefundableCommission(record.getRefundableCommission()); vo.setActualCommission(record.getActualCommission()); if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } //处理办卡人 if (record.getCardDeliveryPerson() != null){ CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(record.getCardDeliveryPerson()); if (cardDeliveryPerson != null){ vo.setCardDeliveryPerson(cardDeliveryPerson.getName()); } } 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删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { cardApplicationCustomersService.removeById(id); return Result.OK("删除成功!"); } /* * 批量删除 * * @param ids * @return / @AutoLog(value = "办卡客户-批量删除") @Operation(summary="办卡客户-批量删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.cardApplicationCustomersService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } /* * 通过id查询 * * @param id * @return / //@AutoLog(value = "办卡客户-通过id查询") @Operation(summary="办卡客户-通过id查询") @GetMapping(value = "/queryById") public Result<CardApplicationCustomers> queryById(@RequestParam(name="id",required=true) String id) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(id); if(cardApplicationCustomers==null) { return Result.error("未找到对应数据"); } return Result.OK(cardApplicationCustomers); } /* * 导出excel * * @param request * @param cardApplicationCustomers / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) { return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.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, CardApplicationCustomers.class); } /* * 派单 / @PostMapping(value = "/dispatch") public Result<String> dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getCardDeliveryPerson())){ return Result.error("指定送卡人不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); entry.setCardDeliveryPerson(dto.getCardDeliveryPerson()); entry.setStatus("1"); //已派单 cardApplicationCustomersService.updateById(entry); //创建佣金返还 commissionRefundService.create(entry); return Result.OK("派单成功！"); } /* * 获取指定区域的送卡人列表 / @GetMapping(value = "/getAreaCardDeliveryPersonList") public Result<List<AreaCardDeliveryPersonVO>> getAreaCardDeliveryPersonList(@RequestParam(value = "province") String province, @RequestParam(value = "city") String city, @RequestParam(value = "area") String area, @RequestParam(value = "address") String address) { QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(province)){ queryWrapper.eq("province", province); } if (StringUtils.isNotBlank(city)){ queryWrapper.eq("city", city); } if (StringUtils.isNotBlank(area)){ queryWrapper.eq("area", area); } if (StringUtils.isNotBlank(address)){ queryWrapper.like("address",address); } List<CardDeliveryPerson> list = cardDeliveryPersonService.list(queryWrapper); List<AreaCardDeliveryPersonVO> voList = new ArrayList<>(); if (CollectionUtils.isNotEmpty( list)){ voList = list.stream().map(record -> { AreaCardDeliveryPersonVO vo = new AreaCardDeliveryPersonVO(); vo.setId(record.getId()); vo.setName(record.getName()); return vo; }).collect(Collectors.toList()); } return Result.OK(voList); } } package org.jeecg.modules.system.controller; import java.math.BigDecimal; import java.util.; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import cn.hutool.core.date.DateUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.util.oConvertUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO; import org.jeecg.modules.system.dto.CardDeliveryPersonDTO; import org.jeecg.modules.system.entity.CardApplicationCustomers; import org.jeecg.modules.system.entity.CardDeliveryPerson; import org.jeecg.modules.system.service.ICardApplicationCustomersService; import org.jeecg.modules.system.service.ICardDeliveryPersonService; import org.jeecg.modules.system.service.ICommissionRefundService; import org.jeecg.modules.system.vo.AreaCardDeliveryPersonVO; import org.jeecg.modules.system.vo.CardApplicationCustomersVO; import org.jeecg.modules.system.vo.CardDeliveryPersonVO; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.web.bind.annotation.; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /* * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 / @Tag(name="办卡客户") @RestController @RequestMapping("/customers/cardApplicationCustomers") @Slf4j public class CardApplicationCustomersController extends JeecgController<CardApplicationCustomers, ICardApplicationCustomersService> { @Autowired private ICardApplicationCustomersService cardApplicationCustomersService; @Autowired private ICardDeliveryPersonService cardDeliveryPersonService; @Autowired private ICommissionRefundService commissionRefundService; /* * 分页列表查询 * * @param cardApplicationCustomers * @param pageNo * @param pageSize * @param req * @return / //@AutoLog(value = "办卡客户-分页列表查询") @Operation(summary="办卡客户-分页列表查询") @GetMapping(value = "/list") public Result<IPage<CardApplicationCustomersVO>> queryPageList(CardApplicationCustomers cardApplicationCustomers, @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<CardApplicationCustomers> queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap()); // 分页查询 Page<CardApplicationCustomers> page = new Page<>(pageNo, pageSize); IPage<CardApplicationCustomers> pageList = cardApplicationCustomersService.page(page, queryWrapper); // 转换为VO对象 Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal()); List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> { CardApplicationCustomersVO vo = new CardApplicationCustomersVO(); BeanUtils.copyProperties(record, vo); //处理预约时间 vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss")); //处理返还时间 if (record.getRefundableTime() != null){ vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss")); } //处理办卡人 if (record.getCardDeliveryPerson() != null){ CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(record.getCardDeliveryPerson()); if (cardDeliveryPerson != null){ vo.setCardDeliveryPerson(cardDeliveryPerson.getName()); } } 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删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:delete") @DeleteMapping(value = "/delete") public Result<String> delete(@RequestParam(name="id",required=true) String id) { cardApplicationCustomersService.removeById(id); return Result.OK("删除成功!"); } /* * 批量删除 * * @param ids * @return / @AutoLog(value = "办卡客户-批量删除") @Operation(summary="办卡客户-批量删除") @RequiresPermissions("org.jeecg.modules.system:card_application_customers:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.cardApplicationCustomersService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } /* * 通过id查询 * * @param id * @return / //@AutoLog(value = "办卡客户-通过id查询") @Operation(summary="办卡客户-通过id查询") @GetMapping(value = "/queryById") public Result<CardApplicationCustomers> queryById(@RequestParam(name="id",required=true) String id) { CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(id); if(cardApplicationCustomers==null) { return Result.error("未找到对应数据"); } return Result.OK(cardApplicationCustomers); } /* * 导出excel * * @param request * @param cardApplicationCustomers / @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) { return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.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, CardApplicationCustomers.class); } /* * 派单 / @PostMapping(value = "/dispatch") public Result<String> dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) { if (StringUtils.isBlank(dto.getId())){ return Result.error("ID不能为空"); } if (StringUtils.isBlank(dto.getCardDeliveryPerson())){ return Result.error("指定送卡人不能为空"); } CardApplicationCustomers entry = cardApplicationCustomersService.getById(dto.getId()); entry.setCardDeliveryPerson(dto.getCardDeliveryPerson()); entry.setStatus("1"); //已派单 cardApplicationCustomersService.updateById(entry); //创建佣金返还 commissionRefundService.create(entry); return Result.OK("派单成功！"); } /* * 获取指定区域的送卡人列表 */ @GetMapping(value = "/getAreaCardDeliveryPersonList") public Result<List<AreaCardDeliveryPersonVO>> getAreaCardDeliveryPersonList(@RequestParam(value = "province") String province, @RequestParam(value = "city") String city, @RequestParam(value = "area") String area, @RequestParam(value = "address") String address) { QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>(); if (StringUtils.isNotBlank(province)){ queryWrapper.eq("province", province); } if (StringUtils.isNotBlank(city)){ queryWrapper.eq("city", city); } if (StringUtils.isNotBlank(area)){ queryWrapper.eq("area", area); } if (StringUtils.isNotBlank(address)){ queryWrapper.like("address",address); } List<CardDeliveryPerson> list = cardDeliveryPersonService.list(queryWrapper); List<AreaCardDeliveryPersonVO> voList = new ArrayList<>(); if (CollectionUtils.isNotEmpty( list)){ voList = list.stream().map(record -> { AreaCardDeliveryPersonVO vo = new AreaCardDeliveryPersonVO(); vo.setId(record.getId()); vo.setName(record.getName()); return vo; }).collect(Collectors.toList()); } return Result.OK(voList); } }

Ignore Space Show notes View

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

package org.jeecg.modules.system.controller;

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;

import cn.hutool.core.date.DateUtil;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecg.modules.system.dto.CardApplicationCustomersUpdateDTO;
import org.jeecg.modules.system.dto.CardDeliveryPersonDTO;
import org.jeecg.modules.system.entity.CardApplicationCustomers;
import org.jeecg.modules.system.entity.CardDeliveryPerson;
import org.jeecg.modules.system.service.ICardApplicationCustomersService;
import org.jeecg.modules.system.service.ICardDeliveryPersonService;
import org.jeecg.modules.system.service.ICommissionRefundService;
import org.jeecg.modules.system.vo.AreaCardDeliveryPersonVO;
import org.jeecg.modules.system.vo.CardApplicationCustomersVO;
import org.jeecg.modules.system.vo.CardDeliveryPersonVO;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.query.Param;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
 * @Description: 办卡客户
 * @Author: jeecg-boot
 * @Date:   2025-09-24
 * @Version: V1.0
 */
@Tag(name="办卡客户")
@RestController
@RequestMapping("/customers/cardApplicationCustomers")
@Slf4j
public class CardApplicationCustomersController extends JeecgController<CardApplicationCustomers, ICardApplicationCustomersService> {
    @Autowired
    private ICardApplicationCustomersService cardApplicationCustomersService;

@Autowired
    private ICardDeliveryPersonService cardDeliveryPersonService;

@Autowired
    private ICommissionRefundService commissionRefundService;

/**
     * 分页列表查询
     *
     * @param cardApplicationCustomers
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "办卡客户-分页列表查询")
    @Operation(summary="办卡客户-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<CardApplicationCustomersVO>> queryPageList(CardApplicationCustomers cardApplicationCustomers,
                                                                   @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<CardApplicationCustomers> queryWrapper = QueryGenerator.initQueryWrapper(cardApplicationCustomers, req.getParameterMap());

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

// 转换为VO对象
            Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
            List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> {
                CardApplicationCustomersVO vo = new CardApplicationCustomersVO();
                BeanUtils.copyProperties(record, vo);
                //处理预约时间
                vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss"));
                //处理返还时间
                vo.setRefundableCommission(record.getRefundableCommission());
                vo.setActualCommission(record.getActualCommission());
                if (record.getRefundableTime() != null){
                      vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                //处理办卡人
                if (record.getCardDeliveryPerson() != null){
                    CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(record.getCardDeliveryPerson());
                    if (cardDeliveryPerson != null){
                        vo.setCardDeliveryPerson(cardDeliveryPerson.getName());
                    }
                }
                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删除")
    @RequiresPermissions("org.jeecg.modules.system:card_application_customers:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        cardApplicationCustomersService.removeById(id);
        return Result.OK("删除成功!");
    }

/**
     *  批量删除
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "办卡客户-批量删除")
    @Operation(summary="办卡客户-批量删除")
    @RequiresPermissions("org.jeecg.modules.system:card_application_customers:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.cardApplicationCustomersService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

/**
     * 通过id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "办卡客户-通过id查询")
    @Operation(summary="办卡客户-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<CardApplicationCustomers> queryById(@RequestParam(name="id",required=true) String id) {
        CardApplicationCustomers cardApplicationCustomers = cardApplicationCustomersService.getById(id);
        if(cardApplicationCustomers==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(cardApplicationCustomers);
    }

/**
     * 导出excel
     *
     * @param request
     * @param cardApplicationCustomers
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, CardApplicationCustomers cardApplicationCustomers) {
        return super.exportXls(request, cardApplicationCustomers, CardApplicationCustomers.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, CardApplicationCustomers.class);
    }

/**
     * 派单
     */
    @PostMapping(value = "/dispatch")
    public Result<String> dispatch(@RequestBody CardApplicationCustomersUpdateDTO dto) {
        if (StringUtils.isBlank(dto.getId())){
            return Result.error("ID不能为空");
        }
        if (StringUtils.isBlank(dto.getCardDeliveryPerson())){
            return Result.error("指定送卡人不能为空");
        }
        CardApplicationCustomers entry  = cardApplicationCustomersService.getById(dto.getId());
        entry.setCardDeliveryPerson(dto.getCardDeliveryPerson());
        entry.setStatus("1"); //已派单
        cardApplicationCustomersService.updateById(entry);
        //创建佣金返还
        commissionRefundService.create(entry);
        return Result.OK("派单成功！");
    }

/**
     * 获取指定区域的送卡人列表
     */
    @GetMapping(value = "/getAreaCardDeliveryPersonList")
    public Result<List<AreaCardDeliveryPersonVO>> getAreaCardDeliveryPersonList(@RequestParam(value = "province") String province,
                                                                                @RequestParam(value = "city") String city,
                                                                                @RequestParam(value = "area") String area,
                                                                                @RequestParam(value = "address") String address) {
        QueryWrapper<CardDeliveryPerson> queryWrapper = new QueryWrapper<>();
        if (StringUtils.isNotBlank(province)){
            queryWrapper.eq("province", province);
        }
        if (StringUtils.isNotBlank(city)){
            queryWrapper.eq("city", city);
        }
        if (StringUtils.isNotBlank(area)){
            queryWrapper.eq("area", area);
        }
        if (StringUtils.isNotBlank(address)){
            queryWrapper.like("address",address);
        }
        List<CardDeliveryPerson> list = cardDeliveryPersonService.list(queryWrapper);
        List<AreaCardDeliveryPersonVO> voList = new ArrayList<>();
        if (CollectionUtils.isNotEmpty( list)){
            voList = list.stream().map(record -> {
                AreaCardDeliveryPersonVO vo = new AreaCardDeliveryPersonVO();
                vo.setId(record.getId());
                vo.setName(record.getName());
                return vo;
            }).collect(Collectors.toList());
        }
        return Result.OK(voList);
    }
}

package org.jeecg.modules.system.controller;

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;

@Autowired
    private ICardDeliveryPersonService cardDeliveryPersonService;

@Autowired
    private ICommissionRefundService commissionRefundService;

// 转换为VO对象
            Page<CardApplicationCustomersVO> voPage = new Page<>(pageList.getCurrent(), pageList.getSize(), pageList.getTotal());
            List<CardApplicationCustomersVO> voList = pageList.getRecords().stream().map(record -> {
                CardApplicationCustomersVO vo = new CardApplicationCustomersVO();
                BeanUtils.copyProperties(record, vo);
                //处理预约时间
                vo.setReservationTime(DateUtil.format(record.getReservationTime(), "yyyy-MM-dd HH:mm:ss"));
                //处理返还时间
                if (record.getRefundableTime() != null){
                    vo.setRefundableTime(DateUtil.format(record.getRefundableTime(), "yyyy-MM-dd HH:mm:ss"));
                }
                //处理办卡人
                if (record.getCardDeliveryPerson() != null){
                    CardDeliveryPerson cardDeliveryPerson = cardDeliveryPersonService.getById(record.getCardDeliveryPerson());
                    if (cardDeliveryPerson != null){
                        vo.setCardDeliveryPerson(cardDeliveryPerson.getName());
                    }
                }
                return vo;
            }).collect(Collectors.toList());

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/vo/CardApplicationCustomersVO.java
package org.jeecg.modules.system.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.math.BigDecimal; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-26 13:45 / @Data public class CardApplicationCustomersVO implements Serializable { / * 办卡客户id / private String id; /* * 分销客户姓名 / private String distributionCustomersName; /* * 分销人手机号 / private String distributionCustomersPhone; /* * 办卡客户预约单号 / private String reservationNumber; /* * 办卡客户id / private String cardApplicationId; /* * 办卡客户姓名 / private String cardApplicationName; /* * 办卡客户手机号 / private String cardApplicationPhone; /省/ private String province; /*市/ private String city; /*区/ private String area; /*详细地址/ private String address; /*预约时间/ private String reservationTime; /*办理手机号/ private String transactionPhone; /*应返还佣金/ private BigDecimal refundableCommission; /*实际返还佣金/ private BigDecimal actualCommission; /*返还时间/ private String refundableTime; /** * 首充金额 / private BigDecimal amount; /* * 点击次数 / private Integer clickCount; /* * 状态待派单、已派单、已办卡 / private String status; /* * 办卡人 / private String cardDeliveryPerson; } package org.jeecg.modules.system.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.math.BigDecimal; /* * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-26 13:45 / @Data public class CardApplicationCustomersVO implements Serializable { / * 办卡客户id / private String id; /* * 分销客户姓名 / private String distributionCustomersName; /* * 分销人手机号 / private String distributionCustomersPhone; /* * 办卡客户预约单号 / private String reservationNumber; /* * 办卡客户id / private String cardApplicationId; /* * 办卡客户姓名 / private String cardApplicationName; /* * 办卡客户手机号 / private String cardApplicationPhone; /省/ private String province; /*市/ private String city; /*区/ private String area; /*详细地址/ private String address; /*预约时间/ private String reservationTime; /*办理手机号/ private String transactionPhone; /*应返还佣金/ private String refundableCommission; /*实际返还佣金/ private String actualCommission; /*返还时间/ private String refundableTime; /** * 首充金额 / private String amount; /* * 点击次数 / private Integer clickCount; /* * 状态待派单、已派单、已办卡 / private String status; /* * 办卡人 */ private String cardDeliveryPerson; }

Ignore Space Show notes View

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

package org.jeecg.modules.system.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @program: jeecg-boot
 * @description:
 * @author: Mr.Yang
 * @create: 2025-09-26 13:45
 **/
@Data
public class CardApplicationCustomersVO implements Serializable {

/**
     * 办卡客户id
     */
    private String id;

/**
     * 分销客户姓名
     */
    private String distributionCustomersName;

/**
     * 分销人手机号
     */
    private String distributionCustomersPhone;

/**
     * 办卡客户预约单号
     */
    private String reservationNumber;

/**
     * 办卡客户id
     */
    private String cardApplicationId;

/**
     * 办卡客户姓名
     */
    private String cardApplicationName;

/**
     * 办卡客户手机号
     */
    private String cardApplicationPhone;

/**省*/
    private String province;

/**市*/
    private String city;

/**区*/
    private String area;

/**详细地址*/
    private String address;

/**预约时间*/
    private String reservationTime;

/**办理手机号*/
    private String transactionPhone;

/**应返还佣金*/
    private BigDecimal refundableCommission;

/**实际返还佣金*/
    private BigDecimal actualCommission;

/**返还时间*/
    private String refundableTime;

/**
     * 首充金额
     */
    private BigDecimal amount;

/**
     * 点击次数
     */
    private Integer clickCount;

/**
     * 状态 待派单、已派单、已办卡
     */
    private String status;

/**
     * 办卡人
     */
    private String cardDeliveryPerson;
}

package org.jeecg.modules.system.vo;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @program: jeecg-boot
 * @description:
 * @author: Mr.Yang
 * @create: 2025-09-26 13:45
 **/
@Data
public class CardApplicationCustomersVO implements Serializable {

/**
     * 办卡客户id
     */
    private String id;

/**
     * 分销客户姓名
     */
    private String distributionCustomersName;

/**
     * 分销人手机号
     */
    private String distributionCustomersPhone;

/**
     * 办卡客户预约单号
     */
    private String reservationNumber;

/**
     * 办卡客户id
     */
    private String cardApplicationId;

/**
     * 办卡客户姓名
     */
    private String cardApplicationName;

/**
     * 办卡客户手机号
     */
    private String cardApplicationPhone;

/**省*/
    private String province;

/**市*/
    private String city;

/**区*/
    private String area;

/**详细地址*/
    private String address;

/**预约时间*/
    private String reservationTime;

/**办理手机号*/
    private String transactionPhone;

/**应返还佣金*/
    private String refundableCommission;

/**实际返还佣金*/
    private String actualCommission;

/**返还时间*/
    private String refundableTime;

/**
     * 首充金额
     */
    private String amount;

/**
     * 点击次数
     */
    private Integer clickCount;

/**
     * 状态 待派单、已派单、已办卡
     */
    private String status;

/**
     * 办卡人
     */
    private String cardDeliveryPerson;
}

Show line notes below