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

fix：完成结算订单详情接口

Browse Source
This commit is contained in:
chenxiky 2025-07-26 16:07:46 +08:00
parent 8cb37d0e8a
commit a14579941b
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,8 +737,7 @@ public class OrderBiz {
* @return List<SettlementDetail> * @return List<SettlementDetail>
*/ */
public List<SettlementDetail> querySettlementOrderDetail(Long settlementOrderId) { public List<SettlementDetail> querySettlementOrderDetail(Long settlementOrderId) {
List<SettlementDetail> settlementDetailList = settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId); return settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId);
return settlementDetailList;
} }
/** /**

27
aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java
View File

@ -4,6 +4,8 @@ import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.aircraft.base.BaseEntity; import com.aircraft.base.BaseEntity;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -32,80 +34,93 @@ public class SettlementDetail extends BaseEntity {
/** /**
* 结算订单ID * 结算订单ID
*/ */
@ApiModelProperty(value = "结算订单ID")
private Long settlementMainId; private Long settlementMainId;
/** /**
* 订单ID * 订单ID
*/ */
@ApiModelProperty(value = "订单ID")
private Long orderId; private Long orderId;
/** /**
* 订单编号 * 订单编号
*/ */
@ApiModelProperty(value = "订单编号")
private String orderNo; private String orderNo;
/** /**
* 订单类型 * 订单类型
*/ */
@ApiModelProperty(value = "订单类型")
private Integer orderType; private Integer orderType;
/** /**
* 订单发起人ID * 订单发起人ID
*/ */
@ApiModelProperty(value = "订单发起人ID")
private Long orderInitiatorId; private Long orderInitiatorId;
/** /**
* 客户电话 * 客户电话
*/ */
@ApiModelProperty(value = "客户电话")
private String phone; private String phone;
/** /**
* 景区ID * 景区ID
*/ */
@ApiModelProperty(value = "景区ID")
private Long attractionId; private Long attractionId;
/** /**
* 路线ID * 路线ID
*/ */
private Long routeId; @ApiModelProperty(value = "路线ID,多个逗号拼接")
private String routeIds;
/** /**
* 下单总金额 * 下单总金额
*/ */
@ApiModelProperty(value = "下单总金额")
private BigDecimal totalAmount; private BigDecimal totalAmount;
/** /**
* 订单金额 * 订单金额
*/ */
@ApiModelProperty(value = "订单金额")
private BigDecimal amount; private BigDecimal amount;
/** /**
* 额外费用 * 额外费用
*/ */
@ApiModelProperty(value = "额外费用")
private BigDecimal surchargeAmount; private BigDecimal surchargeAmount;
/**
* 微信用户唯一标识
*/
private String openId;
/** /**
* 结算状态 * 结算状态
*/ */
@ApiModelProperty(value = "结算状态")
private Integer settlementStatus; private Integer settlementStatus;
/** /**
* 订单主单状态 * 订单主单状态
*/ */
@ApiModelProperty(value = "订单主单状态")
private Integer mainOrderStatus; private Integer mainOrderStatus;
/** /**
* 下单时间 * 下单时间
*/ */
@ApiModelProperty(value = "下单时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderCreateTime; private Date orderCreateTime;
/** /**
* 订单完成时间 * 订单完成时间
*/ */
@ApiModelProperty(value = "订单完成时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderFinishTime; private Date orderFinishTime;

4
aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/SettlementDetailServiceImpl.java
View File

@ -27,6 +27,8 @@ public class SettlementDetailServiceImpl extends ServiceImpl<SettlementDetailMap
@Override @Override
public List<SettlementDetail> obtainDetailBySettlementOrderId(Long settlementOrderId) { public List<SettlementDetail> obtainDetailBySettlementOrderId(Long settlementOrderId) {
return this.list(Wrappers.lambdaQuery(SettlementDetail.class).eq(SettlementDetail::getSettlementMainId, settlementOrderId)); return this.list(Wrappers.lambdaQuery(SettlementDetail.class)
.eq(SettlementDetail::getSettlementMainId, settlementOrderId)
.orderByDesc(SettlementDetail::getId));
} }
} }