From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 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 270b65e..5437953 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
@@ -40,7 +40,7 @@
// 鍒哥孩鍖呴噾棰�
@Expose
private BigDecimal couponMoney;
- // 1 娣樺疂 2 澶╃尗
+ // 1 娣樺疂 2 澶╃尗
@Expose
private Integer orderType;
// 绾㈠寘鐘舵��
@@ -52,7 +52,7 @@
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
- // 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ // 璁㈠崟浜х敓鐨勬柟寮�: 鑷喘 鍒嗕韩 閭�璇�
@Expose
private String orderOrigin;
// 璁㈠崟鐘舵��
@@ -106,8 +106,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;
}
@@ -351,4 +371,12 @@
this.hongbaoId = hongbaoId;
}
+ public Integer getOtherState() {
+ return otherState;
+ }
+
+ public void setOtherState(Integer otherState) {
+ this.otherState = otherState;
+ }
+
}
--
Gitblit v1.8.0