feat:新增订单查询接口(待完善)
This commit is contained in:
parent
82fddfe41f
commit
61a09173f6
@ -0,0 +1,47 @@
|
|||||||
|
package com.aircraft.modules.order.biz;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
|
import com.aircraft.modules.order.domain.OrderMain;
|
||||||
|
import com.aircraft.modules.order.domain.OrderOperator;
|
||||||
|
import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
|
||||||
|
import com.aircraft.modules.order.domain.vo.OrderMainPageQueryVO;
|
||||||
|
import com.aircraft.modules.order.service.IOrderMainService;
|
||||||
|
import com.aircraft.modules.order.service.IOrderOperatorService;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author chenxiky
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 2025/7/11
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class OrderBiz {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IOrderMainService orderMainService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private IOrderOperatorService orderOperatorService;
|
||||||
|
|
||||||
|
public List<OrderMainPageQueryVO> queryAll(OrderMainPageQueryDTO pageQueryDTO) {
|
||||||
|
|
||||||
|
// TODO 根据不同的用户角色获取不同的订单数据
|
||||||
|
List<OrderMain> list = orderMainService.queryAll(pageQueryDTO);
|
||||||
|
|
||||||
|
if (CollectionUtil.isEmpty(list)) {
|
||||||
|
return new ArrayList<>();
|
||||||
|
}
|
||||||
|
// TODO 多表操作转成单表操作,归并数据集
|
||||||
|
List<Long> orderIds = list.stream().map(OrderMain::getId).toList();
|
||||||
|
List<OrderOperator> orderOperatorList = orderOperatorService.queryAllByOrderIds(orderIds);
|
||||||
|
|
||||||
|
// TODO 数据转移处理
|
||||||
|
List<OrderMainPageQueryVO> orderMainList = new ArrayList<>();
|
||||||
|
return orderMainList;
|
||||||
|
}
|
||||||
|
}
|
@ -1,10 +1,23 @@
|
|||||||
package com.aircraft.modules.order.controller;
|
package com.aircraft.modules.order.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import com.aircraft.modules.order.biz.OrderBiz;
|
||||||
|
import com.aircraft.modules.order.domain.OrderMain;
|
||||||
|
import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
|
||||||
|
import com.aircraft.modules.order.domain.vo.OrderMainPageQueryVO;
|
||||||
|
import com.aircraft.utils.PageResult;
|
||||||
|
import com.aircraft.utils.PageUtil;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 订单主表 前端控制器
|
* 订单主表 前端控制器
|
||||||
@ -14,8 +27,19 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/fmsOdOrderMain")
|
@RequestMapping("/api/order")
|
||||||
|
@Api(tags = "订单:订单管理")
|
||||||
public class OrderMainController {
|
public class OrderMainController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private OrderBiz orderBiz;
|
||||||
|
|
||||||
|
@ApiOperation("查询订单列表")
|
||||||
|
@GetMapping
|
||||||
|
public ResponseEntity<PageResult<OrderMainPageQueryVO>> queryDept(OrderMainPageQueryDTO pageQueryDTO) {
|
||||||
|
|
||||||
|
List<OrderMainPageQueryVO> orderList = orderBiz.queryAll(pageQueryDTO);
|
||||||
|
return new ResponseEntity<>(PageUtil.toPage(orderList),HttpStatus.OK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.aircraft.modules.order.domain.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* 订单主单分页查询 DTO
|
||||||
|
*
|
||||||
|
* @author chenxiky
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 2025/7/11
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class OrderMainPageQueryDTO {
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.aircraft.modules.order.domain.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* 订单主单分页查询 VO
|
||||||
|
*
|
||||||
|
* @author chenxiky
|
||||||
|
* @version 1.0.0
|
||||||
|
* @since 2025/7/11
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class OrderMainPageQueryVO {
|
||||||
|
|
||||||
|
}
|
@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
* @author cli
|
* @author cli
|
||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
public interface OrderDetailService extends IService<OrderDetail> {
|
public interface IOrderDetailService extends IService<OrderDetail> {
|
||||||
|
|
||||||
}
|
}
|
@ -0,0 +1,27 @@
|
|||||||
|
package com.aircraft.modules.order.service;
|
||||||
|
|
||||||
|
import com.aircraft.modules.order.domain.OrderMain;
|
||||||
|
import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 订单主表 服务类
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author cli
|
||||||
|
* @since 2025-07-10
|
||||||
|
*/
|
||||||
|
public interface IOrderMainService extends IService<OrderMain> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询订单数据
|
||||||
|
*
|
||||||
|
* @param pageQueryDTO {@link OrderMainPageQueryDTO}
|
||||||
|
* @return {@link List<OrderMain>}
|
||||||
|
*/
|
||||||
|
List<OrderMain> queryAll(OrderMainPageQueryDTO pageQueryDTO);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,25 @@
|
|||||||
|
package com.aircraft.modules.order.service;
|
||||||
|
|
||||||
|
import com.aircraft.modules.order.domain.OrderOperator;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 订单主单操作人关系表 服务类
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author cli
|
||||||
|
* @since 2025-07-10
|
||||||
|
*/
|
||||||
|
public interface IOrderOperatorService extends IService<OrderOperator> {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据订单ID获取操作人集合
|
||||||
|
*
|
||||||
|
* @param orderIds 订单ID集合
|
||||||
|
* @return {@link List<OrderOperator>}
|
||||||
|
*/
|
||||||
|
List<OrderOperator> queryAllByOrderIds(List<Long> orderIds);
|
||||||
|
}
|
@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
* @author cli
|
* @author cli
|
||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
public interface SettlementDetailService extends IService<SettlementDetail> {
|
public interface ISettlementDetailService extends IService<SettlementDetail> {
|
||||||
|
|
||||||
}
|
}
|
@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
* @author cli
|
* @author cli
|
||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
public interface SettlementMainService extends IService<SettlementMain> {
|
|
||||||
|
public interface ISettlementMainService extends IService<SettlementMain> {
|
||||||
|
|
||||||
}
|
}
|
@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl;
|
|||||||
|
|
||||||
import com.aircraft.modules.order.domain.OrderDetail;
|
import com.aircraft.modules.order.domain.OrderDetail;
|
||||||
import com.aircraft.modules.order.mapper.OrderDetailMapper;
|
import com.aircraft.modules.order.mapper.OrderDetailMapper;
|
||||||
import com.aircraft.modules.order.service.OrderDetailService;
|
import com.aircraft.modules.order.service.IOrderDetailService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
|
|||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements OrderDetailService {
|
public class IOrderDetailServiceImpl extends ServiceImpl<OrderDetailMapper, OrderDetail> implements IOrderDetailService {
|
||||||
|
|
||||||
}
|
}
|
@ -0,0 +1,30 @@
|
|||||||
|
package com.aircraft.modules.order.service.impl;
|
||||||
|
|
||||||
|
import com.aircraft.modules.order.domain.OrderOperator;
|
||||||
|
import com.aircraft.modules.order.mapper.OrderOperatorMapper;
|
||||||
|
import com.aircraft.modules.order.service.IOrderOperatorService;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <p>
|
||||||
|
* 订单主单操作人关系表 服务实现类
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
* @author cli
|
||||||
|
* @since 2025-07-10
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class IOrderOperatorServiceImpl extends ServiceImpl<OrderOperatorMapper, OrderOperator> implements IOrderOperatorService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OrderOperator> queryAllByOrderIds(List<Long> orderIds) {
|
||||||
|
|
||||||
|
LambdaQueryWrapper<OrderOperator> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.in(OrderOperator::getOrderId, orderIds);
|
||||||
|
return list(queryWrapper);
|
||||||
|
}
|
||||||
|
}
|
@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl;
|
|||||||
|
|
||||||
import com.aircraft.modules.order.domain.SettlementDetail;
|
import com.aircraft.modules.order.domain.SettlementDetail;
|
||||||
import com.aircraft.modules.order.mapper.SettlementDetailMapper;
|
import com.aircraft.modules.order.mapper.SettlementDetailMapper;
|
||||||
import com.aircraft.modules.order.service.SettlementDetailService;
|
import com.aircraft.modules.order.service.ISettlementDetailService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
|
|||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class SettlementDetailServiceImpl extends ServiceImpl<SettlementDetailMapper, SettlementDetail> implements SettlementDetailService {
|
public class ISettlementDetailServiceImpl extends ServiceImpl<SettlementDetailMapper, SettlementDetail> implements ISettlementDetailService {
|
||||||
|
|
||||||
}
|
}
|
@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl;
|
|||||||
|
|
||||||
import com.aircraft.modules.order.domain.SettlementMain;
|
import com.aircraft.modules.order.domain.SettlementMain;
|
||||||
import com.aircraft.modules.system.mapper.SettlementMainMapper;
|
import com.aircraft.modules.system.mapper.SettlementMainMapper;
|
||||||
import com.aircraft.modules.order.service.SettlementMainService;
|
import com.aircraft.modules.order.service.ISettlementMainService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
|
|||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class SettlementMainServiceImpl extends ServiceImpl<SettlementMainMapper, SettlementMain> implements SettlementMainService {
|
public class ISettlementMainServiceImpl extends ServiceImpl<SettlementMainMapper, SettlementMain> implements ISettlementMainService {
|
||||||
|
|
||||||
}
|
}
|
@ -1,11 +1,15 @@
|
|||||||
package com.aircraft.modules.order.service.impl;
|
package com.aircraft.modules.order.service.impl;
|
||||||
|
|
||||||
import com.aircraft.modules.order.domain.OrderMain;
|
import com.aircraft.modules.order.domain.OrderMain;
|
||||||
|
import com.aircraft.modules.order.domain.dto.OrderMainPageQueryDTO;
|
||||||
import com.aircraft.modules.order.mapper.OrderMainMapper;
|
import com.aircraft.modules.order.mapper.OrderMainMapper;
|
||||||
import com.aircraft.modules.order.service.OrderMainService;
|
import com.aircraft.modules.order.service.IOrderMainService;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 订单主表 服务实现类
|
* 订单主表 服务实现类
|
||||||
@ -15,6 +19,13 @@ import org.springframework.stereotype.Service;
|
|||||||
* @since 2025-07-10
|
* @since 2025-07-10
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> implements OrderMainService {
|
public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain> implements IOrderMainService {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<OrderMain> queryAll(OrderMainPageQueryDTO pageQueryDTO) {
|
||||||
|
|
||||||
|
// TODO 构建查询条件
|
||||||
|
LambdaQueryWrapper<OrderMain> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
return list(queryWrapper);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user