diff --git a/src/implement/fin_withdraw_apply_implement.go b/src/implement/fin_withdraw_apply_implement.go index bc559c5..c755067 100644 --- a/src/implement/fin_withdraw_apply_implement.go +++ b/src/implement/fin_withdraw_apply_implement.go @@ -20,7 +20,7 @@ type FinWithdrawApplyDb struct { func (f FinWithdrawApplyDb) FinWithdrawApplyGetBySession(session *xorm.Session, startAt, endAt string, params map[string]interface{}) (*[]model.FinWithdrawApply, error) { var m *[]model.FinWithdrawApply - session = session.Where("create_at > ?", startAt).And("create_at < ?", endAt) + session = session.Where("create_at >= ?", startAt).And("create_at <= ?", endAt) if reflect.TypeOf(params["value"]).Kind() == reflect.Slice { //指定In查询 if err := session.In(zhios_order_relate_utils.AnyToString(params["key"]), params["value"]).Find(m); err != nil { diff --git a/src/model/fin_withdraw_setting.go b/src/model/fin_withdraw_setting.go index 75560b6..109d9ac 100644 --- a/src/model/fin_withdraw_setting.go +++ b/src/model/fin_withdraw_setting.go @@ -11,6 +11,7 @@ type FinWithdrawSetting struct { WithdrawMultipleLimit string `json:"withdraw_multiple_limit" xorm:"not null comment('提现倍数限制(0为不限制,金额限制倍数才可以申请提现 )') DECIMAL(10,2)"` IsSupportDecimalPoint int `json:"is_support_decimal_point" xorm:"not null default 0 comment('是否支持小数点(0:否 1:是)') TINYINT(1)"` IsAuto int `json:"is_auto" xorm:"not null default 0 comment('是否开启自动提现(0:否 1:是)') TINYINT(1)"` + IsAutoAmountLimit string `json:"is_auto_amount_limit" xorm:"not null comment('自动提现金额限制') DECIMAL(10,2)"` WithdrawTimeInterval string `json:"withdraw_time_interval" xorm:"not null default '' comment('提现时段') VARCHAR(255)"` WithdrawFeeSet string `json:"withdraw_fee_set" xorm:"comment('提现手续费设置') TEXT"` CreateAt string `json:"create_at" xorm:"not null default 'CURRENT_TIMESTAMP' comment('申请时间') TIMESTAMP"`