From 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:53:34 +0800
Subject: [PATCH] RocketMQ的消息整改
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 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 9a62235..23e9a39 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
@@ -9,6 +9,7 @@
import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
/**
* 璁㈠崟-绠�鐗�
@@ -40,7 +41,7 @@
// 鍒哥孩鍖呴噾棰�
@Expose
private BigDecimal couponMoney;
- // 1 娣樺疂 2 澶╃尗
+ // 1 娣樺疂 2 澶╃尗
@Expose
private Integer orderType;
// 绾㈠寘鐘舵��
@@ -52,7 +53,7 @@
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
- // 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
@Expose
private String orderOrigin;
// 璁㈠崟鐘舵��
@@ -84,6 +85,16 @@
@Expose
private Map<String, Object> rewardDetail;
+ // 缁存潈淇℃伅
+ @Expose
+ private WeiQuanInfo weiQuanInfo;
+
+ // 琛ヨ创淇℃伅
+ @Expose
+ private ClientTextStyleVO subsidy;
+ // 琛ヨ创瑙ｉ噴淇℃伅
+ @Expose
+ private List<String> subsidyList;
// 鐩存帴鏀剁泭浜�-ID
@@ -109,6 +120,8 @@
private String weiQuanState;//缁存潈鐘舵��
private String weiQuanBackMoney;//缁存潈璧勯噾
+
+ private Integer otherState; // 1鍏嶅崟
public String getWeiQuanState() {
return weiQuanState;
@@ -369,4 +382,35 @@
this.hongbaoId = hongbaoId;
}
+ public Integer getOtherState() {
+ return otherState;
+ }
+
+ public void setOtherState(Integer otherState) {
+ this.otherState = otherState;
+ }
+
+ public WeiQuanInfo getWeiQuanInfo() {
+ return weiQuanInfo;
+ }
+
+ public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
+ this.weiQuanInfo = weiQuanInfo;
+ }
+
+ public ClientTextStyleVO getSubsidy() {
+ return subsidy;
+ }
+
+ public void setSubsidy(ClientTextStyleVO subsidy) {
+ this.subsidy = subsidy;
+ }
+
+ public List<String> getSubsidyList() {
+ return subsidyList;
+ }
+
+ public void setSubsidyList(List<String> subsidyList) {
+ this.subsidyList = subsidyList;
+ }
}
--
Gitblit v1.8.0