Merge remote-tracking branch 'origin/div' into div

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 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,7 +26,8 @@
   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;// 交易成功



   @Column(name = "so_id")

@@ -60,6 +62,9 @@
   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 +75,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 +253,12 @@
   public void setUpdateTime(Date updateTime) {

      this.updateTime = updateTime;

   }



   public ChargeTypeEnum getChargeAccountType() {

      return chargeAccountType;

   }



   public void setChargeAccountType(ChargeTypeEnum chargeAccountType) {

      this.chargeAccountType = chargeAccountType;

   }

}