sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成结算订单列表接口

Browse Source
This commit is contained in:
chenxiky 2025-07-26 15:09:08 +08:00
parent e9d1f98e65
commit c7ade06d75
5 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
View File

@ -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<SettlementMain>
*/
public List<SettlementMain> allSettlementOrderList(String batchNo) {
List<SettlementMain> settlementMainList = settlementMainService.allSettlementOrderList(batchNo);
return settlementMainList;
}
/**
* 生成结算订单
*

16
aircraft-system/src/main/java/com/aircraft/modules/order/controller/SettlementMainController.java
View File

@ -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<PageResult<SettlementMain>> allSettlementOrderList(
public ResponseEntity<IPage<SettlementMain>> allSettlementOrderList(
@ApiParam(value = "结算批次号", required = false, example = "JS_2025072500001")
@RequestParam (value = "结算批次号") String batchNo) {
List<SettlementMain> 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("生成结算订单")

5
aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementMain.java
View File

@ -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;

5
aircraft-system/src/main/java/com/aircraft/modules/order/service/ISettlementMainService.java
View File

@ -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<SettlementMain> {
* 根据批次号获取数据
*
* @param batchNo 结算批次号
* @param page {@link IPage<SettlementMain> }
* @return {@link List<SettlementMain>}
*/
List<SettlementMain> allSettlementOrderList(String batchNo);
IPage<SettlementMain> allSettlementOrderList(String batchNo, Page<SettlementMain> page);
/**
* 批量新增结算订单

9
aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementMainServiceImpl.java
View File

@ -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<SettlementMainMapper, SettlementMain> implements ISettlementMainService {
@Override
public List<SettlementMain> allSettlementOrderList(String batchNo) {
return list(Wrappers.lambdaQuery(SettlementMain.class)
.eq(StrUtil.isNotBlank(batchNo), SettlementMain::getBatchNo, batchNo));
public IPage<SettlementMain> allSettlementOrderList(String batchNo, Page<SettlementMain> page) {
return lambdaQuery().eq(StrUtil.isNotBlank(batchNo), SettlementMain::getBatchNo, batchNo)
.orderByDesc(SettlementMain::getId).page(page);
}
@Override