From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 98eec27..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
@@ -30,6 +30,14 @@
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;
@Column(name = "so_uid")
@@ -44,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;// 璁㈠崟鏀粯鏃堕棿
@@ -64,7 +72,6 @@
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")
--
Gitblit v1.8.0