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 | 132 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 127 insertions(+), 5 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 29b9028..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 @@ -2,20 +2,38 @@ import java.util.List; +import com.yeshi.fanli.entity.common.JumpDetailV2; + public class OrderRebateVO { - private String totalFanLi; // 棰勪及鎬昏繑鍒� + private int type; // 璁㈠崟绫诲瀷 : 1杩斿埄 2鍒嗕韩 3閭�璇峰洟闃� + private String stateDesc; // 鍒拌处鐘舵�� + private boolean wq; // 鏄惁缁存潈 + private String wqDesc; // 缁存潈鏂囧瓧 + private String wqMoney; // 缁存潈閲戦 + + private String fanLi; // 棰勪及鎬昏繑鍒� + private String fanLiDesc; // 杩斿埄璇存槑 + private String upperFanLi; // 鍗囩骇杩斿埄 private String userLevel; // 鐢ㄦ埛绛夌骇 private String jumpLink; // 璺宠浆閾炬帴 + private Integer couponType; // 鍒稿浘鏍囷細1-濂栧姳鍒� 2-鍏嶅崟鍒� + private boolean coupon; // 浣跨敤濂栧姳鍒� + private boolean couponUse; // 宸蹭娇鐢ㄥ埜 + private String couponText; // 鐘舵�佽鏄� + private String couponDesc; // 浣跨敤璇存槑 + private String couponParams; + private JumpDetailV2 couponJumpDetail; + private List<GoodsRebateVO> listGoods; - public String getTotalFanLi() { - return totalFanLi; + public String getFanLi() { + return fanLi; } - public void setTotalFanLi(String totalFanLi) { - this.totalFanLi = totalFanLi; + public void setFanLi(String fanLi) { + this.fanLi = fanLi; } public String getUpperFanLi() { @@ -50,4 +68,108 @@ this.jumpLink = jumpLink; } + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getStateDesc() { + return stateDesc; + } + + public void setStateDesc(String stateDesc) { + this.stateDesc = stateDesc; + } + + public boolean isWq() { + return wq; + } + + public void setWq(boolean wq) { + this.wq = wq; + } + + public String getWqDesc() { + return wqDesc; + } + + public void setWqDesc(String wqDesc) { + this.wqDesc = wqDesc; + } + + public String getWqMoney() { + return wqMoney; + } + + public void setWqMoney(String wqMoney) { + this.wqMoney = wqMoney; + } + + public boolean isCoupon() { + return coupon; + } + + public void setCoupon(boolean coupon) { + this.coupon = coupon; + } + + public String getFanLiDesc() { + return fanLiDesc; + } + + public void setFanLiDesc(String fanLiDesc) { + this.fanLiDesc = fanLiDesc; + } + + public String getCouponParams() { + return couponParams; + } + + public void setCouponParams(String couponParams) { + this.couponParams = couponParams; + } + + public JumpDetailV2 getCouponJumpDetail() { + return couponJumpDetail; + } + + 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