From c7ade06d752debc764f4f63bc07f4f377c4152df Mon Sep 17 00:00:00 2001 From: chenxiky <2868613334@qq.com> Date: Sat, 26 Jul 2025 15:09:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aircraft/modules/order/biz/OrderBiz.java | 16 ---------------- .../controller/SettlementMainController.java | 16 ++++++++-------- .../modules/order/domain/SettlementMain.java | 5 +++++ .../order/service/ISettlementMainService.java | 5 ++++- .../service/impl/SettlementMainServiceImpl.java | 9 +++++---- 5 files changed, 22 insertions(+), 29 deletions(-) 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 index 5db404a..1f37c2a 100644 --- 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 @@ -32,15 +32,10 @@ import com.aircraft.modules.system.service.CnCustomerService; import com.aircraft.modules.system.service.EmEmployeesService; import com.aircraft.modules.system.service.EmScenicService; import com.aircraft.modules.system.service.IAttachmentMaterialService; -import com.aircraft.utils.PageResult; import com.aircraft.utils.RedisUtils; import com.aircraft.utils.SecurityUtils; import com.aircraft.utils.enums.UserTypeEnum; -import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -617,17 +612,6 @@ public class OrderBiz { orderDetailService.deleteOrderDetailByOrderId(orderTaskId); } - /** - * 获取所有的结算订单 - * - * @param batchNo 结算批次号 - * @return List - */ - public List allSettlementOrderList(String batchNo) { - List settlementMainList = settlementMainService.allSettlementOrderList(batchNo); - return settlementMainList; - } - /** * 生成结算订单 * diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java index 727ebe5..00adaf2 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java @@ -4,10 +4,9 @@ package com.aircraft.modules.order.controller; import com.aircraft.modules.order.biz.OrderBiz; import com.aircraft.modules.order.domain.SettlementDetail; import com.aircraft.modules.order.domain.SettlementMain; -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 com.aircraft.modules.order.service.ISettlementMainService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -33,14 +32,15 @@ public class SettlementMainController { @Resource private OrderBiz orderBiz; + @Resource + ISettlementMainService settlementMainService; @ApiOperation("查询结算订单列表") @GetMapping("/allSettlementOrder") - public ResponseEntity> allSettlementOrderList( + public ResponseEntity> allSettlementOrderList( @ApiParam(value = "结算批次号", required = false, example = "JS_2025072500001") - @RequestParam (value = "结算批次号") String batchNo) { - List orderList = orderBiz.allSettlementOrderList(batchNo); - return new ResponseEntity<>(PageUtil.toPage(orderList),HttpStatus.OK); + @RequestParam (value = "结算批次号", required = false) String batchNo, Page page) { + return ResponseEntity.ok(settlementMainService.allSettlementOrderList(batchNo, page)); } @ApiOperation("生成结算订单") diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java index ba9ed40..9cc8ce0 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java @@ -31,26 +31,31 @@ public class SettlementMain extends BaseEntity { /** * 结算批次号 */ + @ApiModelProperty(value = "结算批次号") private String batchNo; /** * 景区ID */ + @ApiModelProperty(value = "景区ID") private Long attractionId; /** * 结算状态 */ + @ApiModelProperty(value = "结算状态: 0=结算中, 1=已确认, 2=结算完成, 3=已取消") private Integer settlementStatus; /** * 结算时间 */ + @ApiModelProperty(value = "结算时间") private String settlementTimeScope; /** * 结算操作人 */ + @ApiModelProperty(value = "结算操作人") private Long operatorId; diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java index b4e0f37..1abd2a1 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java @@ -1,6 +1,8 @@ package com.aircraft.modules.order.service; import com.aircraft.modules.order.domain.SettlementMain; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -20,9 +22,10 @@ public interface ISettlementMainService extends IService { * 根据批次号获取数据 * * @param batchNo 结算批次号 + * @param page {@link IPage } * @return {@link List} */ - List allSettlementOrderList(String batchNo); + IPage allSettlementOrderList(String batchNo, Page page); /** * 批量新增结算订单 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/SettlementMainServiceImpl.java index 4ab2b05..f21756f 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/SettlementMainServiceImpl.java @@ -4,7 +4,8 @@ import cn.hutool.core.util.StrUtil; import com.aircraft.modules.order.domain.SettlementMain; import com.aircraft.modules.order.mapper.SettlementMainMapper; import com.aircraft.modules.order.service.ISettlementMainService; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -22,9 +23,9 @@ import java.util.List; public class SettlementMainServiceImpl extends ServiceImpl implements ISettlementMainService { @Override - public List allSettlementOrderList(String batchNo) { - return list(Wrappers.lambdaQuery(SettlementMain.class) - .eq(StrUtil.isNotBlank(batchNo), SettlementMain::getBatchNo, batchNo)); + public IPage allSettlementOrderList(String batchNo, Page page) { + return lambdaQuery().eq(StrUtil.isNotBlank(batchNo), SettlementMain::getBatchNo, batchNo) + .orderByDesc(SettlementMain::getId).page(page); } @Override