From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 f32a44f..d5d0398 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,7 +17,8 @@
public final static int PAY_STATE_NOPAY = 0;// 鏈敮浠�
public final static int PAY_STATE_PAID = 1;// 宸叉敮浠�
- public final static int PAY_STATE_REFUND = 2;// 浠ラ��娆�
+ 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;// 鏈敮浠�
@@ -25,8 +26,17 @@
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_FAIL = 12;// 瀹℃牳鎷掔粷-閫�娆惧け璐�
+ 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;// 浜ゆ槗鎴愬姛
+
+ public BanLiShopOrder(Long id) {
+ super();
+ this.id = id;
+ }
+
+ public BanLiShopOrder() {
+ }
@Column(name = "so_id")
private Long id;
@@ -42,13 +52,13 @@
private BigDecimal hongBaoPayment;// 绾㈠寘鏀粯閲戦
@Column(name = "so_payment_hongbao_state")
private Integer hongBaoPaymentState;// 鏀粯閲戦鐘舵��
- @Column(name = "so_payment_money")
- private BigDecimal balancePayment;// 浣欓鏀粯閲戦
- @Column(name = "so_payment_money_state")
- private Integer balancePaymentState;// 浣欓閲戦鐘舵��
@Column(name = "so_payment_balance")
- private BigDecimal moneyPayment;// 鐜伴噾鏀粯閲戦
+ private BigDecimal balancePayment;// 浣欓鏀粯閲戦
@Column(name = "so_payment_balance_state")
+ private Integer balancePaymentState;// 浣欓閲戦鐘舵��
+ @Column(name = "so_payment_money")
+ private BigDecimal moneyPayment;// 鐜伴噾鏀粯閲戦
+ @Column(name = "so_payment_money_state")
private Integer moneyPaymentState;// 鐜伴噾閲戦鐘舵��
@Column(name = "so_pay_time")
private Date payTime;// 璁㈠崟鏀粯鏃堕棿
@@ -60,6 +70,8 @@
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")
@@ -70,6 +82,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;
@@ -238,4 +260,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