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 8de2515..fadc3e8 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 @@ -737,8 +737,7 @@ public class OrderBiz { * @return List */ public List querySettlementOrderDetail(Long settlementOrderId) { - List settlementDetailList = settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId); - return settlementDetailList; + return settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId); } /** diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java index df605db..a17c582 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; import com.aircraft.base.BaseEntity; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,80 +34,93 @@ public class SettlementDetail extends BaseEntity { /** * 结算订单ID */ + @ApiModelProperty(value = "结算订单ID") private Long settlementMainId; /** * 订单ID */ + @ApiModelProperty(value = "订单ID") private Long orderId; /** * 订单编号 */ + @ApiModelProperty(value = "订单编号") private String orderNo; /** * 订单类型 */ + @ApiModelProperty(value = "订单类型") private Integer orderType; /** * 订单发起人ID */ + @ApiModelProperty(value = "订单发起人ID") private Long orderInitiatorId; /** * 客户电话 */ + @ApiModelProperty(value = "客户电话") private String phone; /** * 景区ID */ + @ApiModelProperty(value = "景区ID") private Long attractionId; /** * 路线ID */ - private Long routeId; + @ApiModelProperty(value = "路线ID,多个逗号拼接") + private String routeIds; /** * 下单总金额 */ + @ApiModelProperty(value = "下单总金额") private BigDecimal totalAmount; + /** * 订单金额 */ + @ApiModelProperty(value = "订单金额") private BigDecimal amount; /** * 额外费用 */ + @ApiModelProperty(value = "额外费用") private BigDecimal surchargeAmount; - /** - * 微信用户唯一标识 - */ - private String openId; - /** * 结算状态 */ + @ApiModelProperty(value = "结算状态") private Integer settlementStatus; /** * 订单主单状态 */ + @ApiModelProperty(value = "订单主单状态") private Integer mainOrderStatus; /** * 下单时间 */ + @ApiModelProperty(value = "下单时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date orderCreateTime; /** * 订单完成时间 */ + @ApiModelProperty(value = "订单完成时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Date orderFinishTime; 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/SettlementDetailServiceImpl.java index 21b7068..0c4a24a 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/SettlementDetailServiceImpl.java @@ -27,6 +27,8 @@ public class SettlementDetailServiceImpl extends ServiceImpl 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)); } }