yujian
2020-01-18 f4a0f2acc63d7785eab108419a4e16f5f688cb95
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")