feat:完善项目信息

This commit is contained in:
henry
2021-12-29 16:12:25 +08:00
parent 43dd770336
commit c3da1ebc51
8 changed files with 121 additions and 19 deletions

View File

@ -1,11 +1,37 @@
package model
import "SciencesServer/app/common/model"
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
)
type UserConsume struct {
*model.UserConsume
}
func (m *UserConsume) Exchange(page, pageSize int, count *int64, consume *float64, where ...*model.ModelWhere) ([]*model.UserConsume, error) {
db := orm.GetDB().Table(m.TableName()).
Where("is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*model.UserConsume, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Pluck("SUM(consume) AS consume", consume).Error; err != nil {
return nil, err
}
if err := db.Order("id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewUserConsume() *UserConsume {
return &UserConsume{model.NewUserConsume()}
}

View File

@ -3,6 +3,7 @@ package model
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
)
// UserWithdrawal 用户提现模型
@ -10,28 +11,35 @@ type UserWithdrawal struct {
*model.UserWithdrawal
}
type UserWithdrawalInfo struct {
*model.UserWithdrawal
BankCard string `json:"bank_card"`
}
// Withdrawal 提现记录
func (m *UserWithdrawal) Withdrawal(page, pageSize int, count *int64, amount, actualAmount *float64, where ...*model.ModelWhere) ([]*model.UserWithdrawal, error) {
db := orm.GetDB().Table(m.TableName()).
Where("is_deleted = ?", model.DeleteStatusForNot)
func (m *UserWithdrawal) Withdrawal(page, pageSize int, count *int64, amount, actualAmount *float64, where ...*model.ModelWhere) ([]*UserWithdrawalInfo, error) {
db := orm.GetDB().Table(m.TableName()+" AS w").
Select("w.*", "b.bank_card").
Joins(fmt.Sprintf("LEFT JOIN %s AS b ON w.bank_id = b.id", model.NewUserBank().TableName())).
Where("w.is_deleted = ?", model.DeleteStatusForNot)
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*model.UserWithdrawal, 0)
out := make([]*UserWithdrawalInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Pluck("SUM(amount)", amount).Error; err != nil {
if err := db.Pluck("SUM(w.amount) AS amount", amount).Error; err != nil {
return nil, err
}
if err := db.Pluck("SUM(actual_amount)", actualAmount).Error; err != nil {
if err := db.Pluck("SUM(w.actual_amount) AS actual_amount", actualAmount).Error; err != nil {
return nil, err
}
if err := db.Order("id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
if err := db.Order("w.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil