From 09c716a16d02ddb06df2bc2af5e588128bc7fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 11:30:41 +0800
Subject: [PATCH] 品牌接口恢复
---
fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
index 5220749..98eec27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java
@@ -17,11 +17,17 @@
public final static int PAY_STATE_NOPAY = 0;// 鏈敮浠�
public final static int PAY_STATE_PAID = 1;// 宸叉敮浠�
+ public final static int PAY_STATE_REFUNDING = 2;// 閫�娆句腑
+ public final static int PAY_STATE_REFUND = 3;// 宸查��娆�
public final static int STATE_INVALID = -1;// 澶辨晥
public final static int STATE_NO_PAY = 0;// 鏈敮浠�
- public final static int STATE_PAID = 1;// 宸叉敮浠�,寰呭鏍�
- public final static int STATE_REJECT = 10;// 瀹℃牳鎷掔粷
+ public final static int STATE_PART_PAY = 1;// 閮ㄥ垎鏀粯
+ public final static int STATE_PAID = 5;// 宸叉敮浠�,寰呭鏍�
+ public final static int STATE_REJECT = 10;// 瀹℃牳鎷掔粷锛岄��娆句腑
+ public final static int STATE_REJECT_REFUND_SUCCESS = 11;// 瀹℃牳鎷掔粷-閫�娆炬垚鍔�
+ public final static int STATE_REJECT_REFUND_PART_SUCCESS = 12;// 瀹℃牳鎷掔粷-閮ㄥ垎閫�娆炬垚鍔�
+ public final static int STATE_REJECT_REFUND_FAIL = 15;// 瀹℃牳鎷掔粷-閫�娆惧け璐�
public final static int STATE_SUCCESS = 20;// 浜ゆ槗鎴愬姛
@Column(name = "so_id")
@@ -56,6 +62,9 @@
private Integer state;// 鐘舵��
@Column(name = "so_state_desc")
private String stateDesc;// 鐘舵�佺畝浠�
+ @Column(name = "so_charge_account_type")
+ private ChargeTypeEnum chargeAccountType;// 鍏呭�艰处鍙风被鍨�
+
@Column(name = "so_charge_account")
private String chargeAccount;// 鍏呭�艰处鍙�
@Column(name = "so_charge_account2")
@@ -66,6 +75,16 @@
private Date createTime;// 鍒涘缓鏃堕棿
@Column(name = "so_update_time")
private Date updateTime;// 鏇存柊鏃堕棿
+ @Column(name = "so_order_goods_id")
+ private BanLiShopOrderGoods orderGoods;
+
+ public BanLiShopOrderGoods getOrderGoods() {
+ return orderGoods;
+ }
+
+ public void setOrderGoods(BanLiShopOrderGoods orderGoods) {
+ this.orderGoods = orderGoods;
+ }
public Long getId() {
return id;
@@ -234,4 +253,12 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public ChargeTypeEnum getChargeAccountType() {
+ return chargeAccountType;
+ }
+
+ public void setChargeAccountType(ChargeTypeEnum chargeAccountType) {
+ this.chargeAccountType = chargeAccountType;
+ }
}
--
Gitblit v1.8.0