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 | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 111 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 5eb555e..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;
/**
* 璁㈠崟-绠�鐗�
@@ -37,7 +38,10 @@
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
- // 1 娣樺疂 2 澶╃尗
+ // 鍒哥孩鍖呴噾棰�
+ @Expose
+ private BigDecimal couponMoney;
+ // 1 娣樺疂 2 澶╃尗
@Expose
private Integer orderType;
// 绾㈠寘鐘舵��
@@ -49,7 +53,7 @@
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
- // 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
@Expose
private String orderOrigin;
// 璁㈠崟鐘舵��
@@ -74,6 +78,24 @@
@Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
+ // 璁㈠崟鐘舵�佸垪琛�
+ @Expose
+ private List<String> signList;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private Map<String, Object> rewardDetail;
+
+ // 缁存潈淇℃伅
+ @Expose
+ private WeiQuanInfo weiQuanInfo;
+
+ // 琛ヨ创淇℃伅
+ @Expose
+ private ClientTextStyleVO subsidy;
+ // 琛ヨ创瑙ｉ噴淇℃伅
+ @Expose
+ private List<String> subsidyList;
+
// 鐩存帴鏀剁泭浜�-ID
private String userId;
@@ -82,6 +104,9 @@
// 鐩存帴鏀剁泭浜�-澶村儚
private String userPortrait; // 澶村儚
+ // 绾㈠寘ID
+ private Long hongbaoId;
+
// 涓�绾ф敹鐩婁汉-ID
private String levelOneId;
// 涓�绾ф敹鐩婁汉-閲戦
@@ -92,8 +117,28 @@
// 浜岀骇鏀剁泭浜�-閲戦
private String levelTwoMoney;
+ private String weiQuanState;//缁存潈鐘舵��
+ private String weiQuanBackMoney;//缁存潈璧勯噾
+
+ private Integer otherState; // 1鍏嶅崟
+ public String getWeiQuanState() {
+ return weiQuanState;
+ }
+
+ public void setWeiQuanState(String weiQuanState) {
+ this.weiQuanState = weiQuanState;
+ }
+
+ public String getWeiQuanBackMoney() {
+ return weiQuanBackMoney;
+ }
+
+ public void setWeiQuanBackMoney(String weiQuanBackMoney) {
+ this.weiQuanBackMoney = weiQuanBackMoney;
+ }
+
public Date getAccountTime() {
return accountTime;
}
@@ -304,4 +349,68 @@
this.userPortrait = userPortrait;
}
+
+ public Map<String, Object> getRewardDetail() {
+ return rewardDetail;
+ }
+
+ public void setRewardDetail(Map<String, Object> rewardDetail) {
+ this.rewardDetail = rewardDetail;
+ }
+
+ public List<String> getSignList() {
+ return signList;
+ }
+
+ public void setSignList(List<String> signList) {
+ this.signList = signList;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Long getHongbaoId() {
+ return hongbaoId;
+ }
+
+ public void setHongbaoId(Long hongbaoId) {
+ 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