From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java
index b9c801a..6fb4768 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java
@@ -13,6 +13,9 @@
@ApiModel(value = "OrderDetailItemVo", description = "订单详情明细表")
public class OrderDetailItemVo {
+ @ApiModelProperty(value = "id")
+ private Long id;
+
@ApiModelProperty(value = "商品名称")
private String goodsName;
@@ -25,14 +28,28 @@
@ApiModelProperty(value = "储值卡支付")
private BigDecimal cardPay;
+ @ApiModelProperty(value = "欠款")
+ private BigDecimal arrears;
+
@ApiModelProperty(value = "原价")
private BigDecimal price;
@ApiModelProperty(value = "折扣价格")
private BigDecimal zkPrice;
+ @ApiModelProperty(value = "支付状态")
+ private String status;
+
@ApiModelProperty(value = "订单业绩")
private List<OrderDetailAchieveItemVo> achieves;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
public List<OrderDetailAchieveItemVo> getAchieves() {
return achieves;
@@ -89,4 +106,20 @@
public void setZkPrice(BigDecimal zkPrice) {
this.zkPrice = zkPrice;
}
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public BigDecimal getArrears() {
+ return arrears;
+ }
+
+ public void setArrears(BigDecimal arrears) {
+ this.arrears = arrears;
+ }
}
--
Gitblit v1.9.1