yujian
2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95
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;
   }
}