diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java new file mode 100644 index 0000000..41ecc81 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java @@ -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 queryAll(OrderMainPageQueryDTO pageQueryDTO) { + + // TODO 根据不同的用户角色获取不同的订单数据 + List list = orderMainService.queryAll(pageQueryDTO); + + if (CollectionUtil.isEmpty(list)) { + return new ArrayList<>(); + } + // TODO 多表操作转成单表操作,归并数据集 + List orderIds = list.stream().map(OrderMain::getId).toList(); + List orderOperatorList = orderOperatorService.queryAllByOrderIds(orderIds); + + // TODO 数据转移处理 + List orderMainList = new ArrayList<>(); + return orderMainList; + } +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java index 0deb31e..88e4a8e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/OrderMainController.java @@ -1,10 +1,23 @@ 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.RestController; +import javax.annotation.Resource; +import java.util.List; + /** *

* 订单主表 前端控制器 @@ -14,8 +27,19 @@ import org.springframework.web.bind.annotation.RestController; * @since 2025-07-10 */ @RestController -@RequestMapping("/fmsOdOrderMain") +@RequestMapping("/api/order") +@Api(tags = "订单:订单管理") public class OrderMainController { + @Resource + private OrderBiz orderBiz; + + @ApiOperation("查询订单列表") + @GetMapping + public ResponseEntity> queryDept(OrderMainPageQueryDTO pageQueryDTO) { + + List orderList = orderBiz.queryAll(pageQueryDTO); + return new ResponseEntity<>(PageUtil.toPage(orderList),HttpStatus.OK); + } } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java new file mode 100644 index 0000000..0fbbf1d --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/dto/OrderMainPageQueryDTO.java @@ -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 { + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java new file mode 100644 index 0000000..b5b8fcb --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/vo/OrderMainPageQueryVO.java @@ -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 { + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/OrderDetailService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderDetailService.java similarity index 78% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/OrderDetailService.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderDetailService.java index dd7bc8e..e2549f9 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/OrderDetailService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderDetailService.java @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author cli * @since 2025-07-10 */ -public interface OrderDetailService extends IService { +public interface IOrderDetailService extends IService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderMainService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderMainService.java new file mode 100644 index 0000000..659d606 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderMainService.java @@ -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; + +/** + *

+ * 订单主表 服务类 + *

+ * + * @author cli + * @since 2025-07-10 + */ +public interface IOrderMainService extends IService { + + /** + * 查询订单数据 + * + * @param pageQueryDTO {@link OrderMainPageQueryDTO} + * @return {@link List} + */ + List queryAll(OrderMainPageQueryDTO pageQueryDTO); + +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderOperatorService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderOperatorService.java new file mode 100644 index 0000000..a26acad --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/IOrderOperatorService.java @@ -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; + +/** + *

+ * 订单主单操作人关系表 服务类 + *

+ * + * @author cli + * @since 2025-07-10 + */ +public interface IOrderOperatorService extends IService { + + /** + * 根据订单ID获取操作人集合 + * + * @param orderIds 订单ID集合 + * @return {@link List} + */ + List queryAllByOrderIds(List orderIds); +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementDetailService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementDetailService.java similarity index 77% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementDetailService.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementDetailService.java index cc245c8..69ff0c8 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementDetailService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementDetailService.java @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author cli * @since 2025-07-10 */ -public interface SettlementDetailService extends IService { +public interface ISettlementDetailService extends IService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementMainService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java similarity index 77% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementMainService.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java index 6ceab61..70076e8 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/SettlementMainService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author cli * @since 2025-07-10 */ -public interface SettlementMainService extends IService { + +public interface ISettlementMainService extends IService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderDetailServiceImpl.java similarity index 67% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailServiceImpl.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderDetailServiceImpl.java index a0a360c..d31389a 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderDetailServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderDetailServiceImpl.java @@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl; import com.aircraft.modules.order.domain.OrderDetail; 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 org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2025-07-10 */ @Service -public class OrderDetailServiceImpl extends ServiceImpl implements OrderDetailService { +public class IOrderDetailServiceImpl extends ServiceImpl implements IOrderDetailService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderOperatorServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderOperatorServiceImpl.java new file mode 100644 index 0000000..2afbf72 --- /dev/null +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/IOrderOperatorServiceImpl.java @@ -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; + +/** + *

+ * 订单主单操作人关系表 服务实现类 + *

+ * + * @author cli + * @since 2025-07-10 + */ +@Service +public class IOrderOperatorServiceImpl extends ServiceImpl implements IOrderOperatorService { + + @Override + public List queryAllByOrderIds(List orderIds) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(OrderOperator::getOrderId, orderIds); + return list(queryWrapper); + } +} diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementDetailServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementDetailServiceImpl.java similarity index 66% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementDetailServiceImpl.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementDetailServiceImpl.java index 67234e6..5dad402 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementDetailServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementDetailServiceImpl.java @@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl; import com.aircraft.modules.order.domain.SettlementDetail; 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 org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2025-07-10 */ @Service -public class SettlementDetailServiceImpl extends ServiceImpl implements SettlementDetailService { +public class ISettlementDetailServiceImpl extends ServiceImpl implements ISettlementDetailService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementMainServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementMainServiceImpl.java similarity index 66% rename from aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementMainServiceImpl.java rename to aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementMainServiceImpl.java index 8a4f797..25116e6 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementMainServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/ISettlementMainServiceImpl.java @@ -2,7 +2,7 @@ package com.aircraft.modules.order.service.impl; import com.aircraft.modules.order.domain.SettlementMain; 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 org.springframework.stereotype.Service; @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2025-07-10 */ @Service -public class SettlementMainServiceImpl extends ServiceImpl implements SettlementMainService { +public class ISettlementMainServiceImpl extends ServiceImpl implements ISettlementMainService { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java index 1cb2adb..c90c681 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderMainServiceImpl.java @@ -1,11 +1,15 @@ package com.aircraft.modules.order.service.impl; 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.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 org.springframework.stereotype.Service; +import java.util.List; + /** *

* 订单主表 服务实现类 @@ -15,6 +19,13 @@ import org.springframework.stereotype.Service; * @since 2025-07-10 */ @Service -public class OrderMainServiceImpl extends ServiceImpl implements OrderMainService { +public class OrderMainServiceImpl extends ServiceImpl implements IOrderMainService { + @Override + public List queryAll(OrderMainPageQueryDTO pageQueryDTO) { + + // TODO 构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return list(queryWrapper); + } }