From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/entity/shop/BanLiShopOrder.java |  512 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 271 insertions(+), 241 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..00d2f0f 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
@@ -1,241 +1,271 @@
-package com.yeshi.fanli.entity.shop;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-/**
- * 璁㈠崟
- * 
- * @author Administrator
- *
- */
-@Table("yeshi_ec_shop_order")
-public class BanLiShopOrder {
-
-	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 STATE_INVALID = -1;// 澶辨晥
-	public final static int STATE_NO_PAY = 0;// 鏈敮浠�
-	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_FAIL = 12;// 瀹℃牳鎷掔粷-閫�娆惧け璐�
-	public final static int STATE_SUCCESS = 20;// 浜ゆ槗鎴愬姛
-
-	@Column(name = "so_id")
-	private Long id;
-	@Column(name = "so_uid")
-	private Long uid;
-	@Column(name = "so_order_no")
-	private String orderNo;
-	@Column(name = "so_goods_id")
-	private BanLiShopGoods goods;
-	@Column(name = "so_goods_set_id")
-	private BanLiShopGoodsSets goodsSet;
-	@Column(name = "so_payment_hongbao")
-	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;// 鐜伴噾鏀粯閲戦
-	@Column(name = "so_payment_balance_state")
-	private Integer moneyPaymentState;// 鐜伴噾閲戦鐘舵��
-	@Column(name = "so_pay_time")
-	private Date payTime;// 璁㈠崟鏀粯鏃堕棿
-	@Column(name = "so_reject_time")
-	private Date rejectTime;// 鎷掔粷鏃堕棿
-	@Column(name = "so_success_time")
-	private Date successTime;// 浜ゆ槗鎴愬姛鏃堕棿
-	@Column(name = "so_state") // -1-宸插け鏁� 0-鏈敮浠� 1-宸叉敮浠�,寰呭鏍� 10-瀹℃牳鎷掔粷 20-浜ゆ槗鎴愬姛
-	private Integer state;// 鐘舵��
-	@Column(name = "so_state_desc")
-	private String stateDesc;// 鐘舵�佺畝浠�
-	@Column(name = "so_charge_account")
-	private String chargeAccount;// 鍏呭�艰处鍙�
-	@Column(name = "so_charge_account2")
-	private String chargeAccount2;// 鍏呭�艰处鍙�2锛堝鐢級
-	@Column(name = "so_beizhu")
-	private String beiZhu;// 澶囨敞
-	@Column(name = "so_create_time")
-	private Date createTime;// 鍒涘缓鏃堕棿
-	@Column(name = "so_update_time")
-	private Date updateTime;// 鏇存柊鏃堕棿
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getUid() {
-		return uid;
-	}
-
-	public void setUid(Long uid) {
-		this.uid = uid;
-	}
-
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public BanLiShopGoods getGoods() {
-		return goods;
-	}
-
-	public void setGoods(BanLiShopGoods goods) {
-		this.goods = goods;
-	}
-
-	public BanLiShopGoodsSets getGoodsSet() {
-		return goodsSet;
-	}
-
-	public void setGoodsSet(BanLiShopGoodsSets goodsSet) {
-		this.goodsSet = goodsSet;
-	}
-
-	public BigDecimal getHongBaoPayment() {
-		return hongBaoPayment;
-	}
-
-	public void setHongBaoPayment(BigDecimal hongBaoPayment) {
-		this.hongBaoPayment = hongBaoPayment;
-	}
-
-	public Integer getHongBaoPaymentState() {
-		return hongBaoPaymentState;
-	}
-
-	public void setHongBaoPaymentState(Integer hongBaoPaymentState) {
-		this.hongBaoPaymentState = hongBaoPaymentState;
-	}
-
-	public BigDecimal getBalancePayment() {
-		return balancePayment;
-	}
-
-	public void setBalancePayment(BigDecimal balancePayment) {
-		this.balancePayment = balancePayment;
-	}
-
-	public Integer getBalancePaymentState() {
-		return balancePaymentState;
-	}
-
-	public void setBalancePaymentState(Integer balancePaymentState) {
-		this.balancePaymentState = balancePaymentState;
-	}
-
-	public BigDecimal getMoneyPayment() {
-		return moneyPayment;
-	}
-
-	public void setMoneyPayment(BigDecimal moneyPayment) {
-		this.moneyPayment = moneyPayment;
-	}
-
-	public Integer getMoneyPaymentState() {
-		return moneyPaymentState;
-	}
-
-	public void setMoneyPaymentState(Integer moneyPaymentState) {
-		this.moneyPaymentState = moneyPaymentState;
-	}
-
-	public Date getPayTime() {
-		return payTime;
-	}
-
-	public void setPayTime(Date payTime) {
-		this.payTime = payTime;
-	}
-
-	public Date getRejectTime() {
-		return rejectTime;
-	}
-
-	public void setRejectTime(Date rejectTime) {
-		this.rejectTime = rejectTime;
-	}
-
-	public Date getSuccessTime() {
-		return successTime;
-	}
-
-	public void setSuccessTime(Date successTime) {
-		this.successTime = successTime;
-	}
-
-	public Integer getState() {
-		return state;
-	}
-
-	public void setState(Integer state) {
-		this.state = state;
-	}
-
-	public String getStateDesc() {
-		return stateDesc;
-	}
-
-	public void setStateDesc(String stateDesc) {
-		this.stateDesc = stateDesc;
-	}
-
-	public String getChargeAccount() {
-		return chargeAccount;
-	}
-
-	public void setChargeAccount(String chargeAccount) {
-		this.chargeAccount = chargeAccount;
-	}
-
-	public String getChatgeAccount2() {
-		return chargeAccount2;
-	}
-
-	public void setChatgeAccount2(String chargeAccount2) {
-		this.chargeAccount2 = chargeAccount2;
-	}
-
-	public String getBeiZhu() {
-		return beiZhu;
-	}
-
-	public void setBeiZhu(String beiZhu) {
-		this.beiZhu = beiZhu;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-}
+package com.yeshi.fanli.entity.shop;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+/**
+ * 璁㈠崟
+ * 
+ * @author Administrator
+ *
+ */
+@Table("yeshi_ec_shop_order")
+public class BanLiShopOrder {
+
+	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_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;// 浜ゆ槗鎴愬姛
+
+	public BanLiShopOrder(Long id) {
+		super();
+		this.id = id;
+	}
+
+	public BanLiShopOrder() {
+	}
+
+	@Column(name = "so_id")
+	private Long id;
+	@Column(name = "so_uid")
+	private Long uid;
+	@Column(name = "so_order_no")
+	private String orderNo;
+	@Column(name = "so_goods_id")
+	private BanLiShopGoods goods;
+	@Column(name = "so_goods_set_id")
+	private BanLiShopGoodsSets goodsSet;
+	@Column(name = "so_payment_hongbao")
+	private BigDecimal hongBaoPayment;// 绾㈠寘鏀粯閲戦
+	@Column(name = "so_payment_hongbao_state")
+	private Integer hongBaoPaymentState;// 鏀粯閲戦鐘舵��
+	@Column(name = "so_payment_balance")
+	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;// 璁㈠崟鏀粯鏃堕棿
+	@Column(name = "so_reject_time")
+	private Date rejectTime;// 鎷掔粷鏃堕棿
+	@Column(name = "so_success_time")
+	private Date successTime;// 浜ゆ槗鎴愬姛鏃堕棿
+	@Column(name = "so_state") // -1-宸插け鏁� 0-鏈敮浠� 1-宸叉敮浠�,寰呭鏍� 10-瀹℃牳鎷掔粷 20-浜ゆ槗鎴愬姛
+	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")
+	private String chargeAccount2;// 鍏呭�艰处鍙�2锛堝鐢級
+	@Column(name = "so_beizhu")
+	private String beiZhu;// 澶囨敞
+	@Column(name = "so_create_time")
+	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;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getUid() {
+		return uid;
+	}
+
+	public void setUid(Long uid) {
+		this.uid = uid;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public BanLiShopGoods getGoods() {
+		return goods;
+	}
+
+	public void setGoods(BanLiShopGoods goods) {
+		this.goods = goods;
+	}
+
+	public BanLiShopGoodsSets getGoodsSet() {
+		return goodsSet;
+	}
+
+	public void setGoodsSet(BanLiShopGoodsSets goodsSet) {
+		this.goodsSet = goodsSet;
+	}
+
+	public BigDecimal getHongBaoPayment() {
+		return hongBaoPayment;
+	}
+
+	public void setHongBaoPayment(BigDecimal hongBaoPayment) {
+		this.hongBaoPayment = hongBaoPayment;
+	}
+
+	public Integer getHongBaoPaymentState() {
+		return hongBaoPaymentState;
+	}
+
+	public void setHongBaoPaymentState(Integer hongBaoPaymentState) {
+		this.hongBaoPaymentState = hongBaoPaymentState;
+	}
+
+	public BigDecimal getBalancePayment() {
+		return balancePayment;
+	}
+
+	public void setBalancePayment(BigDecimal balancePayment) {
+		this.balancePayment = balancePayment;
+	}
+
+	public Integer getBalancePaymentState() {
+		return balancePaymentState;
+	}
+
+	public void setBalancePaymentState(Integer balancePaymentState) {
+		this.balancePaymentState = balancePaymentState;
+	}
+
+	public BigDecimal getMoneyPayment() {
+		return moneyPayment;
+	}
+
+	public void setMoneyPayment(BigDecimal moneyPayment) {
+		this.moneyPayment = moneyPayment;
+	}
+
+	public Integer getMoneyPaymentState() {
+		return moneyPaymentState;
+	}
+
+	public void setMoneyPaymentState(Integer moneyPaymentState) {
+		this.moneyPaymentState = moneyPaymentState;
+	}
+
+	public Date getPayTime() {
+		return payTime;
+	}
+
+	public void setPayTime(Date payTime) {
+		this.payTime = payTime;
+	}
+
+	public Date getRejectTime() {
+		return rejectTime;
+	}
+
+	public void setRejectTime(Date rejectTime) {
+		this.rejectTime = rejectTime;
+	}
+
+	public Date getSuccessTime() {
+		return successTime;
+	}
+
+	public void setSuccessTime(Date successTime) {
+		this.successTime = successTime;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
+	public String getStateDesc() {
+		return stateDesc;
+	}
+
+	public void setStateDesc(String stateDesc) {
+		this.stateDesc = stateDesc;
+	}
+
+	public String getChargeAccount() {
+		return chargeAccount;
+	}
+
+	public void setChargeAccount(String chargeAccount) {
+		this.chargeAccount = chargeAccount;
+	}
+
+	public String getChatgeAccount2() {
+		return chargeAccount2;
+	}
+
+	public void setChatgeAccount2(String chargeAccount2) {
+		this.chargeAccount2 = chargeAccount2;
+	}
+
+	public String getBeiZhu() {
+		return beiZhu;
+	}
+
+	public void setBeiZhu(String beiZhu) {
+		this.beiZhu = beiZhu;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	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