From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
index 89fe68d..f8a9df7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
@@ -13,23 +13,20 @@
private String fanLi; // 棰勪及鎬昏繑鍒�
private String fanLiDesc; // 杩斿埄璇存槑
-
+
private String upperFanLi; // 鍗囩骇杩斿埄
private String userLevel; // 鐢ㄦ埛绛夌骇
private String jumpLink; // 璺宠浆閾炬帴
-
- private String subsidyDesc; // 鍥㈤槦璇存槑
- private String subsidy; // 鍥㈤槦琛ヨ创
- private String originSubsidy; // 灏忎竴绛夌骇琛ヨ创
-
-
+
+ private Integer couponType; // 鍒稿浘鏍囷細1-濂栧姳鍒� 2-鍏嶅崟鍒�
private boolean coupon; // 浣跨敤濂栧姳鍒�
- private boolean couponSuccess; // 浣跨敤鍒告垚鍔�
+ private boolean couponUse; // 宸蹭娇鐢ㄥ埜
+ private String couponText; // 鐘舵�佽鏄�
+ private String couponDesc; // 浣跨敤璇存槑
private String couponParams;
private JumpDetailV2 couponJumpDetail;
private List<GoodsRebateVO> listGoods;
-
public String getFanLi() {
return fanLi;
@@ -126,39 +123,7 @@
public void setFanLiDesc(String fanLiDesc) {
this.fanLiDesc = fanLiDesc;
}
-
- public String getSubsidy() {
- return subsidy;
- }
-
- public void setSubsidy(String subsidy) {
- this.subsidy = subsidy;
- }
-
- public String getOriginSubsidy() {
- return originSubsidy;
- }
-
- public void setOriginSubsidy(String originSubsidy) {
- this.originSubsidy = originSubsidy;
- }
-
- public String getSubsidyDesc() {
- return subsidyDesc;
- }
-
- public void setSubsidyDesc(String subsidyDesc) {
- this.subsidyDesc = subsidyDesc;
- }
-
- public boolean isCouponSuccess() {
- return couponSuccess;
- }
-
- public void setCouponSuccess(boolean couponSuccess) {
- this.couponSuccess = couponSuccess;
- }
-
+
public String getCouponParams() {
return couponParams;
}
@@ -174,4 +139,37 @@
public void setCouponJumpDetail(JumpDetailV2 couponJumpDetail) {
this.couponJumpDetail = couponJumpDetail;
}
+
+ public boolean isCouponUse() {
+ return couponUse;
+ }
+
+ public void setCouponUse(boolean couponUse) {
+ this.couponUse = couponUse;
+ }
+
+ public String getCouponText() {
+ return couponText;
+ }
+
+ public void setCouponText(String couponText) {
+ this.couponText = couponText;
+ }
+
+ public String getCouponDesc() {
+ return couponDesc;
+ }
+
+ public void setCouponDesc(String couponDesc) {
+ this.couponDesc = couponDesc;
+ }
+
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
}
--
Gitblit v1.8.0