From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 716 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 363 insertions(+), 353 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 c4d225e..1fa4599 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
@@ -13,460 +13,470 @@
/**
* 璁㈠崟-绠�鐗�
- *
- * @author yj
*
+ * @author yj
* @date 2018骞�12鏈�23鏃�
*/
public class CommonOrderVO extends CommonOrder implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- // 鍒拌处鏃堕棿
- private Date accountTime;
- // 棰勮鍒拌处鏃堕棿
- private Date preAccountTime;
- // 瀹為檯鎬绘暟閲�
- private Integer totalCount;
- // 瀹為檯鎬讳粯娆�
- private BigDecimal totalPayment;
- // 瀹為檯鎬荤粨绠�
- private BigDecimal totalSettlement;
- // 绾㈠寘绫诲瀷锛�
- private Integer hongBaoType;
- // 璁㈠崟鎬婚浼板閲�
- private BigDecimal hongBao;
+ // 鍒拌处鏃堕棿
+ private Date accountTime;
+ // 棰勮鍒拌处鏃堕棿
+ private Date preAccountTime;
+ // 瀹為檯鎬绘暟閲�
+ private Integer totalCount;
+ // 瀹為檯鎬讳粯娆�
+ private BigDecimal totalPayment;
+ // 瀹為檯鎬荤粨绠�
+ private BigDecimal totalSettlement;
+ // 绾㈠寘绫诲瀷锛�
+ private Integer hongBaoType;
+ // 璁㈠崟鎬婚浼板閲�
+ private BigDecimal hongBao;
- // 鍒哥孩鍖呴噾棰�
- @Expose
- private BigDecimal couponMoney;
- // 1 娣樺疂 2 澶╃尗
- @Expose
- private Integer orderType;
- // 绾㈠寘鐘舵��
- @Expose
- private Integer hongBaoState;
- // 鍒拌处鏃堕棿
- @Expose
- private String hongBaoDate;
- // 绾㈠寘绫诲瀷鍥剧墖閾炬帴
- @Expose
- private String hongBaoTypePic;
- // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
- @Expose
- private String orderOrigin;
- // 璁㈠崟鐘舵��
- @Expose
- private Map<String, String> orderState;
- // 绾㈠寘閲戦
- @Expose
- private Map<String, String> hongBaoInfo;
- // 鍒拌处鐘舵��
- @Expose
- private Map<String, String> accountState;
- // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
- @Expose
- private Long obtainTime;
- // 涓嬪崟鏃堕棿
- @Expose
- private String downTime;
- // 鏀惰揣鏃堕棿
- @Expose
- private String receiveTime;
- // 璁㈠崟涓嬬殑鍟嗗搧
- @Expose
- private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
+ //璁㈠崟鐘舵�佹弿杩�
+ private String orderStateDesc;
- // 璁㈠崟鐘舵�佸垪琛�
- @Expose
- private List<String> signList;
- // 鏀惰揣鏃堕棿
- @Expose
- private Map<String, Object> rewardDetail;
- // 缁存潈淇℃伅
- @Expose
- private WeiQuanInfo weiQuanInfo;
+ // 鍒哥孩鍖呴噾棰�
+ @Expose
+ private BigDecimal couponMoney;
+ // 1 娣樺疂 2 澶╃尗
+ @Expose
+ private Integer orderType;
+ // 绾㈠寘鐘舵��
+ @Expose
+ private Integer hongBaoState;
+ // 鍒拌处鏃堕棿
+ @Expose
+ private String hongBaoDate;
+ // 绾㈠寘绫诲瀷鍥剧墖閾炬帴
+ @Expose
+ private String hongBaoTypePic;
+ // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
+ @Expose
+ private String orderOrigin;
+ // 璁㈠崟鐘舵��
+ @Expose
+ private Map<String, String> orderState;
+ // 绾㈠寘閲戦
+ @Expose
+ private Map<String, String> hongBaoInfo;
+ // 鍒拌处鐘舵��
+ @Expose
+ private Map<String, String> accountState;
+ // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
+ @Expose
+ private Long obtainTime;
+ // 涓嬪崟鏃堕棿
+ @Expose
+ private String downTime;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private String receiveTime;
+ // 璁㈠崟涓嬬殑鍟嗗搧
+ @Expose
+ private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
- // 琛ヨ创淇℃伅
- @Expose
- private ClientTextStyleVO subsidy;
- // 琛ヨ创瑙ｉ噴淇℃伅
- @Expose
- private List<String> subsidyList;
+ // 璁㈠崟鐘舵�佸垪琛�
+ @Expose
+ private List<String> signList;
+ // 鏀惰揣鏃堕棿
+ @Expose
+ private Map<String, Object> rewardDetail;
- // 鐩存帴鏀剁泭浜�-ID
- private String userId;
- // 鐩存帴鏀剁泭浜�-鏄电О
- private String userName;
- // 鐩存帴鏀剁泭浜�-澶村儚
- private String userPortrait; // 澶村儚
+ // 缁存潈淇℃伅
+ @Expose
+ private WeiQuanInfo weiQuanInfo;
- // 绾㈠寘ID
- private Long hongbaoId;
+ // 琛ヨ创淇℃伅
+ @Expose
+ private ClientTextStyleVO subsidy;
+ // 琛ヨ创瑙ｉ噴淇℃伅
+ @Expose
+ private List<String> subsidyList;
- // 涓�绾ф敹鐩婁汉-ID
- private String levelOneId;
- // 涓�绾ф敹鐩婁汉-閲戦
- private String levelOneMoney;
+ // 鐩存帴鏀剁泭浜�-ID
+ private String userId;
+ // 鐩存帴鏀剁泭浜�-鏄电О
+ private String userName;
+ // 鐩存帴鏀剁泭浜�-澶村儚
+ private String userPortrait; // 澶村儚
- // 浜岀骇鏀剁泭浜�-ID
- private String levelTwoId;
- // 浜岀骇鏀剁泭浜�-閲戦
- private String levelTwoMoney;
+ // 绾㈠寘ID
+ private Long hongbaoId;
- private String weiQuanState;// 缁存潈鐘舵��
+ // 涓�绾ф敹鐩婁汉-ID
+ private String levelOneId;
+ // 涓�绾ф敹鐩婁汉-閲戦
+ private String levelOneMoney;
- private String weiQuanBackMoney;// 缁存潈璧勯噾
+ // 浜岀骇鏀剁泭浜�-ID
+ private String levelTwoId;
+ // 浜岀骇鏀剁泭浜�-閲戦
+ private String levelTwoMoney;
- private Integer otherState; // 1鍏嶅崟
+ private String weiQuanState;// 缁存潈鐘舵��
- @Expose
- private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�(2.1涔嬪悗搴熷純)
-
- @Expose
- private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
-
- @Expose
- private String rebateLink;// 杩斿埄璇存槑閾炬帴
-
- @Expose
- private String orderDesc;// 璁㈠崟鎻忚堪
+ private String weiQuanBackMoney;// 缁存潈璧勯噾
-
- // 搴楅摵绫诲瀷 2.1.2鏂板
- @Expose
- private ClientTextStyleVO shopType;
+ private Integer otherState; // 1鍏嶅崟
-
+ @Expose
+ private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�(2.1涔嬪悗搴熷純)
- public String getVipOrderDesc() {
- return vipOrderDesc;
- }
+ @Expose
+ private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
- public void setVipOrderDesc(String vipOrderDesc) {
- this.vipOrderDesc = vipOrderDesc;
- }
+ @Expose
+ private String rebateLink;// 杩斿埄璇存槑閾炬帴
- public boolean isVipOrder() {
- return vipOrder;
- }
+ @Expose
+ private String orderDesc;// 璁㈠崟鎻忚堪
- public void setVipOrder(boolean vipOrder) {
- this.vipOrder = vipOrder;
- }
- public String getWeiQuanState() {
- return weiQuanState;
- }
+ // 搴楅摵绫诲瀷 2.1.2鏂板
+ @Expose
+ private ClientTextStyleVO shopType;
- public void setWeiQuanState(String weiQuanState) {
- this.weiQuanState = weiQuanState;
- }
- public String getWeiQuanBackMoney() {
- return weiQuanBackMoney;
- }
+ public String getVipOrderDesc() {
+ return vipOrderDesc;
+ }
- public void setWeiQuanBackMoney(String weiQuanBackMoney) {
- this.weiQuanBackMoney = weiQuanBackMoney;
- }
+ public void setVipOrderDesc(String vipOrderDesc) {
+ this.vipOrderDesc = vipOrderDesc;
+ }
- public Date getAccountTime() {
- return accountTime;
- }
+ public boolean isVipOrder() {
+ return vipOrder;
+ }
- public void setAccountTime(Date accountTime) {
- this.accountTime = accountTime;
- }
+ public void setVipOrder(boolean vipOrder) {
+ this.vipOrder = vipOrder;
+ }
- public Date getPreAccountTime() {
- return preAccountTime;
- }
+ public String getWeiQuanState() {
+ return weiQuanState;
+ }
- public void setPreAccountTime(Date preAccountTime) {
- this.preAccountTime = preAccountTime;
- }
+ public void setWeiQuanState(String weiQuanState) {
+ this.weiQuanState = weiQuanState;
+ }
- public BigDecimal getHongBao() {
- return hongBao;
- }
+ public String getWeiQuanBackMoney() {
+ return weiQuanBackMoney;
+ }
- public void setHongBao(BigDecimal hongBao) {
- this.hongBao = hongBao;
- }
+ public void setWeiQuanBackMoney(String weiQuanBackMoney) {
+ this.weiQuanBackMoney = weiQuanBackMoney;
+ }
- public Integer getHongBaoState() {
- return hongBaoState;
- }
+ public Date getAccountTime() {
+ return accountTime;
+ }
- public void setHongBaoState(Integer hongBaoState) {
- this.hongBaoState = hongBaoState;
- }
+ public void setAccountTime(Date accountTime) {
+ this.accountTime = accountTime;
+ }
- public Long getObtainTime() {
- return obtainTime;
- }
+ public Date getPreAccountTime() {
+ return preAccountTime;
+ }
- public void setObtainTime(Long obtainTime) {
- this.obtainTime = obtainTime;
- }
+ public void setPreAccountTime(Date preAccountTime) {
+ this.preAccountTime = preAccountTime;
+ }
- public String getDownTime() {
- return downTime;
- }
+ public BigDecimal getHongBao() {
+ return hongBao;
+ }
- public void setDownTime(String downTime) {
- this.downTime = downTime;
- }
+ public void setHongBao(BigDecimal hongBao) {
+ this.hongBao = hongBao;
+ }
- public String getReceiveTime() {
- return receiveTime;
- }
+ public Integer getHongBaoState() {
+ return hongBaoState;
+ }
- public void setReceiveTime(String receiveTime) {
- this.receiveTime = receiveTime;
- }
+ public void setHongBaoState(Integer hongBaoState) {
+ this.hongBaoState = hongBaoState;
+ }
- public List<CommonOrderGoodsVO> getListOrderGoods() {
- return listOrderGoods;
- }
+ public Long getObtainTime() {
+ return obtainTime;
+ }
+
+ public void setObtainTime(Long obtainTime) {
+ this.obtainTime = obtainTime;
+ }
+
+ public String getDownTime() {
+ return downTime;
+ }
+
+ public void setDownTime(String downTime) {
+ this.downTime = downTime;
+ }
+
+ public String getReceiveTime() {
+ return receiveTime;
+ }
+
+ public void setReceiveTime(String receiveTime) {
+ this.receiveTime = receiveTime;
+ }
+
+ public List<CommonOrderGoodsVO> getListOrderGoods() {
+ return listOrderGoods;
+ }
+
+ public void setListOrderGoods(List<CommonOrderGoodsVO> listOrderGoods) {
+ this.listOrderGoods = listOrderGoods;
+ }
+
+ public Integer getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(Integer totalCount) {
+ this.totalCount = totalCount;
+ }
- public void setListOrderGoods(List<CommonOrderGoodsVO> listOrderGoods) {
- this.listOrderGoods = listOrderGoods;
- }
+ public BigDecimal getTotalSettlement() {
+ return totalSettlement;
+ }
- public Integer getTotalCount() {
- return totalCount;
- }
+ public void setTotalSettlement(BigDecimal totalSettlement) {
+ this.totalSettlement = totalSettlement;
+ }
- public void setTotalCount(Integer totalCount) {
- this.totalCount = totalCount;
- }
+ public Integer getHongBaoType() {
+ return hongBaoType;
+ }
- public BigDecimal getTotalSettlement() {
- return totalSettlement;
- }
+ public void setHongBaoType(Integer hongBaoType) {
+ this.hongBaoType = hongBaoType;
+ }
- public void setTotalSettlement(BigDecimal totalSettlement) {
- this.totalSettlement = totalSettlement;
- }
+ public String getHongBaoTypePic() {
+ return hongBaoTypePic;
+ }
- public Integer getHongBaoType() {
- return hongBaoType;
- }
+ public void setHongBaoTypePic(String hongBaoTypePic) {
+ this.hongBaoTypePic = hongBaoTypePic;
+ }
- public void setHongBaoType(Integer hongBaoType) {
- this.hongBaoType = hongBaoType;
- }
+ public Map<String, String> getHongBaoInfo() {
+ return hongBaoInfo;
+ }
- public String getHongBaoTypePic() {
- return hongBaoTypePic;
- }
+ public void setHongBaoInfo(Map<String, String> hongBaoInfo) {
+ this.hongBaoInfo = hongBaoInfo;
+ }
- public void setHongBaoTypePic(String hongBaoTypePic) {
- this.hongBaoTypePic = hongBaoTypePic;
- }
+ public Map<String, String> getOrderState() {
+ return orderState;
+ }
- public Map<String, String> getHongBaoInfo() {
- return hongBaoInfo;
- }
+ public void setOrderState(Map<String, String> orderState) {
+ this.orderState = orderState;
+ }
- public void setHongBaoInfo(Map<String, String> hongBaoInfo) {
- this.hongBaoInfo = hongBaoInfo;
- }
+ public String getHongBaoDate() {
+ return hongBaoDate;
+ }
- public Map<String, String> getOrderState() {
- return orderState;
- }
+ public void setHongBaoDate(String hongBaoDate) {
+ this.hongBaoDate = hongBaoDate;
+ }
- public void setOrderState(Map<String, String> orderState) {
- this.orderState = orderState;
- }
+ public Integer getOrderType() {
+ return orderType;
+ }
- public String getHongBaoDate() {
- return hongBaoDate;
- }
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
- public void setHongBaoDate(String hongBaoDate) {
- this.hongBaoDate = hongBaoDate;
- }
+ public Map<String, String> getAccountState() {
+ return accountState;
+ }
- public Integer getOrderType() {
- return orderType;
- }
+ public void setAccountState(Map<String, String> accountState) {
+ this.accountState = accountState;
+ }
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
+ public String getOrderOrigin() {
+ return orderOrigin;
+ }
- public Map<String, String> getAccountState() {
- return accountState;
- }
+ public void setOrderOrigin(String orderOrigin) {
+ this.orderOrigin = orderOrigin;
+ }
- public void setAccountState(Map<String, String> accountState) {
- this.accountState = accountState;
- }
+ public BigDecimal getTotalPayment() {
+ return totalPayment;
+ }
- public String getOrderOrigin() {
- return orderOrigin;
- }
+ public void setTotalPayment(BigDecimal totalPayment) {
+ this.totalPayment = totalPayment;
+ }
- public void setOrderOrigin(String orderOrigin) {
- this.orderOrigin = orderOrigin;
- }
+ public String getLevelOneId() {
+ return levelOneId;
+ }
- public BigDecimal getTotalPayment() {
- return totalPayment;
- }
+ public void setLevelOneId(String levelOneId) {
+ this.levelOneId = levelOneId;
+ }
- public void setTotalPayment(BigDecimal totalPayment) {
- this.totalPayment = totalPayment;
- }
+ public String getLevelOneMoney() {
+ return levelOneMoney;
+ }
- public String getLevelOneId() {
- return levelOneId;
- }
+ public void setLevelOneMoney(String levelOneMoney) {
+ this.levelOneMoney = levelOneMoney;
+ }
- public void setLevelOneId(String levelOneId) {
- this.levelOneId = levelOneId;
- }
+ public String getLevelTwoId() {
+ return levelTwoId;
+ }
- public String getLevelOneMoney() {
- return levelOneMoney;
- }
+ public void setLevelTwoId(String levelTwoId) {
+ this.levelTwoId = levelTwoId;
+ }
- public void setLevelOneMoney(String levelOneMoney) {
- this.levelOneMoney = levelOneMoney;
- }
+ public String getLevelTwoMoney() {
+ return levelTwoMoney;
+ }
- public String getLevelTwoId() {
- return levelTwoId;
- }
+ public void setLevelTwoMoney(String levelTwoMoney) {
+ this.levelTwoMoney = levelTwoMoney;
+ }
- public void setLevelTwoId(String levelTwoId) {
- this.levelTwoId = levelTwoId;
- }
+ public String getUserId() {
+ return userId;
+ }
- public String getLevelTwoMoney() {
- return levelTwoMoney;
- }
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
- public void setLevelTwoMoney(String levelTwoMoney) {
- this.levelTwoMoney = levelTwoMoney;
- }
+ public String getUserName() {
+ return userName;
+ }
- public String getUserId() {
- return userId;
- }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
- public void setUserId(String userId) {
- this.userId = userId;
- }
+ public String getUserPortrait() {
+ return userPortrait;
+ }
- public String getUserName() {
- return userName;
- }
+ public void setUserPortrait(String userPortrait) {
+ this.userPortrait = userPortrait;
+ }
- public void setUserName(String userName) {
- this.userName = userName;
- }
+ public Map<String, Object> getRewardDetail() {
+ return rewardDetail;
+ }
- public String getUserPortrait() {
- return userPortrait;
- }
+ public void setRewardDetail(Map<String, Object> rewardDetail) {
+ this.rewardDetail = rewardDetail;
+ }
- public void setUserPortrait(String userPortrait) {
- this.userPortrait = userPortrait;
- }
+ public List<String> getSignList() {
+ return signList;
+ }
- public Map<String, Object> getRewardDetail() {
- return rewardDetail;
- }
+ public void setSignList(List<String> signList) {
+ this.signList = signList;
+ }
- public void setRewardDetail(Map<String, Object> rewardDetail) {
- this.rewardDetail = rewardDetail;
- }
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
- public List<String> getSignList() {
- return signList;
- }
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
- public void setSignList(List<String> signList) {
- this.signList = signList;
- }
+ public Long getHongbaoId() {
+ return hongbaoId;
+ }
- public BigDecimal getCouponMoney() {
- return couponMoney;
- }
+ public void setHongbaoId(Long hongbaoId) {
+ this.hongbaoId = hongbaoId;
+ }
- public void setCouponMoney(BigDecimal couponMoney) {
- this.couponMoney = couponMoney;
- }
+ public Integer getOtherState() {
+ return otherState;
+ }
- public Long getHongbaoId() {
- return hongbaoId;
- }
+ public void setOtherState(Integer otherState) {
+ this.otherState = otherState;
+ }
- public void setHongbaoId(Long hongbaoId) {
- this.hongbaoId = hongbaoId;
- }
+ public WeiQuanInfo getWeiQuanInfo() {
+ return weiQuanInfo;
+ }
- public Integer getOtherState() {
- return otherState;
- }
+ public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
+ this.weiQuanInfo = weiQuanInfo;
+ }
- public void setOtherState(Integer otherState) {
- this.otherState = otherState;
- }
+ public ClientTextStyleVO getSubsidy() {
+ return subsidy;
+ }
- public WeiQuanInfo getWeiQuanInfo() {
- return weiQuanInfo;
- }
+ public void setSubsidy(ClientTextStyleVO subsidy) {
+ this.subsidy = subsidy;
+ }
- public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
- this.weiQuanInfo = weiQuanInfo;
- }
+ public List<String> getSubsidyList() {
+ return subsidyList;
+ }
- public ClientTextStyleVO getSubsidy() {
- return subsidy;
- }
+ public void setSubsidyList(List<String> subsidyList) {
+ this.subsidyList = subsidyList;
+ }
- public void setSubsidy(ClientTextStyleVO subsidy) {
- this.subsidy = subsidy;
- }
+ public String getOrderDesc() {
+ return orderDesc;
+ }
- public List<String> getSubsidyList() {
- return subsidyList;
- }
+ public void setOrderDesc(String orderDesc) {
+ this.orderDesc = orderDesc;
+ }
- public void setSubsidyList(List<String> subsidyList) {
- this.subsidyList = subsidyList;
- }
+ public String getRebateLink() {
+ return rebateLink;
+ }
- public String getOrderDesc() {
- return orderDesc;
- }
+ public void setRebateLink(String rebateLink) {
+ this.rebateLink = rebateLink;
+ }
- public void setOrderDesc(String orderDesc) {
- this.orderDesc = orderDesc;
- }
+ public ClientTextStyleVO getShopType() {
+ return shopType;
+ }
- public String getRebateLink() {
- return rebateLink;
- }
+ public void setShopType(ClientTextStyleVO shopType) {
+ this.shopType = shopType;
+ }
- public void setRebateLink(String rebateLink) {
- this.rebateLink = rebateLink;
- }
+ public String getOrderStateDesc() {
+ return orderStateDesc;
+ }
- public ClientTextStyleVO getShopType() {
- return shopType;
- }
+ public void setOrderStateDesc(String orderStateDesc) {
+ this.orderStateDesc = orderStateDesc;
+ }
- public void setShopType(ClientTextStyleVO shopType) {
- this.shopType = shopType;
- }
-
}
--
Gitblit v1.8.0