From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
index 10e1f16..77520d4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
@@ -123,16 +123,23 @@
private Integer otherState; // 1鍏嶅崟
@Expose
- private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�
+ private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�(2.1涔嬪悗搴熷純)
@Expose
- private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪
+ private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
@Expose
- private String fanliDesc;// 杩斿埄璇存槑
+ private String rebateLink;// 杩斿埄璇存槑閾炬帴
+
@Expose
- private String fanliDescLink;// 杩斿埄璇存槑閾炬帴
+ private String orderDesc;// 璁㈠崟鎻忚堪
+
+ // 搴楅摵绫诲瀷 2.1.2鏂板
+ @Expose
+ private ClientTextStyleVO shopType;
+
+
public String getVipOrderDesc() {
return vipOrderDesc;
@@ -438,20 +445,28 @@
this.subsidyList = subsidyList;
}
- public String getFanliDesc() {
- return fanliDesc;
+ public String getOrderDesc() {
+ return orderDesc;
}
- public void setFanliDesc(String fanliDesc) {
- this.fanliDesc = fanliDesc;
+ public void setOrderDesc(String orderDesc) {
+ this.orderDesc = orderDesc;
}
- public String getFanliDescLink() {
- return fanliDescLink;
+ public String getRebateLink() {
+ return rebateLink;
}
- public void setFanliDescLink(String fanliDescLink) {
- this.fanliDescLink = fanliDescLink;
+ public void setRebateLink(String rebateLink) {
+ this.rebateLink = rebateLink;
+ }
+
+ public ClientTextStyleVO getShopType() {
+ return shopType;
+ }
+
+ public void setShopType(ClientTextStyleVO shopType) {
+ this.shopType = shopType;
}
}
--
Gitblit v1.8.0