feat：完善项目信息

app/api/enterprise/controller/user/consume.go

@@ -5,6 +5,7 @@ import (
 	"SciencesServer/app/basic/controller"
 	model2 "SciencesServer/app/common/model"
 	"SciencesServer/app/session"
+	"strings"
 )
 
 // Consume 消耗日志
@@ -16,14 +17,15 @@ type Consume struct {
 type ConsumeHandle func(session *session.Enterprise, local string) *Consume
 
 type (
+	// ConsumeInfo 消耗日志信息
 	ConsumeInfo struct {
 		ID string `json:"id"`
 		*model2.UserConsume
 	}
 )
 
-// List 列表信息
-func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, error) {
+// Instance 列表信息
+func (c *Consume) Instance(source int, createdAt string, page, pageSize int) (*controller.ReturnPages, error) {
 	mUserConsume := model.NewUserConsume()
 
 	where := []*model2.ModelWhereOrder{
@@ -32,6 +34,18 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
 			Order: model2.NewOrder("id", model2.OrderModeToDesc),
 		},
 	}
+	if source > 0 {
+		where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("source", source)})
+	}
+	if createdAt != "" {
+		_wheres := model2.NewWhereSectionAt("created_at", strings.Split(createdAt, " ~ "))
+
+		where = append(where, &model2.ModelWhereOrder{
+			Where: _wheres[0],
+		}, &model2.ModelWhereOrder{
+			Where: _wheres[1],
+		})
+	}
 	out := make([]*model2.UserConsume, 0)
 
 	var count int64
@@ -39,6 +53,7 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
 	if err := model2.Pages(mUserConsume.UserConsume, &out, page, pageSize, &count, where...); err != nil {
 		return nil, err
 	}
+
 	list := make([]*ConsumeInfo, 0)
 
 	for _, v := range out {
@@ -50,6 +65,13 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
 	return &controller.ReturnPages{Data: list, Count: count}, nil
 }
 
+// Delete 删除操作
+func (c *Consume) Delete(id uint64) error {
+	mUserConsume := model.NewUserConsume()
+	mUserConsume.ID = id
+	return model2.Delete(mUserConsume.UserConsume)
+}
+
 func NewConsume() ConsumeHandle {
 	return func(session *session.Enterprise, local string) *Consume {
 		return &Consume{

app/api/enterprise/controller/user/withdrawal.go

@@ -0,0 +1,81 @@
+package user
+
+import (
+	"SciencesServer/app/api/enterprise/model"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"SciencesServer/config"
+	"strings"
+)
+
+// Withdrawal 提现信息
+type Withdrawal struct {
+	*session.Enterprise
+}
+
+type WithdrawalHandle func(session *session.Enterprise) *Withdrawal
+
+type (
+	// WithdrawalInfo 提现数据信息
+	WithdrawalInfo struct {
+		Data         []*model2.UserWithdrawal `json:"data"`
+		Amount       float64                  `json:"amount"`
+		ActualAmount float64                  `json:"actual_amount"`
+		Count        int64                    `json:"count"`
+	}
+	// WithdrawalTransferInfo 提现转账信息
+	WithdrawalTransferInfo struct {
+		Images []string `json:"images"`
+		Remark string   `json:"remark"`
+	}
+)
+
+// Instance 数据信息
+func (c *Withdrawal) Instance(status int, createdAt string, page, pageSize int) (*WithdrawalInfo, error) {
+	mUserWithdrawal := model.NewUserWithdrawal()
+
+	out := new(WithdrawalInfo)
+
+	where := []*model2.ModelWhere{model2.NewWhere("uid", c.UID), model2.NewWhere("status", status)}
+
+	if createdAt != "" {
+		where = append(where, model2.NewWhereSectionAt("created_at", strings.Split(createdAt, " ~ "))...)
+	}
+	var err error
+
+	if out.Data, err = mUserWithdrawal.Withdrawal(page, pageSize, &out.Count, &out.Amount, &out.ActualAmount, where...); err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Transfer 转账信息
+func (c *Withdrawal) Transfer(id uint64) (*WithdrawalTransferInfo, error) {
+	mUserWithdrawalTransfer := model.NewUserWithdrawalTransfer()
+
+	isExist, err := model2.FirstField(mUserWithdrawalTransfer.UserWithdrawalTransfer, []string{"images", "remark"},
+		model2.NewWhere("withdrawal_id", id))
+
+	if err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, nil
+	}
+	return &WithdrawalTransferInfo{
+		Images: mUserWithdrawalTransfer.Images.AnalysisSlice(config.SettingInfo.Domain),
+		Remark: mUserWithdrawalTransfer.Remark,
+	}, nil
+}
+
+// Delete 删除操作
+func (c *Withdrawal) Delete(id uint64) error {
+	mUserWithdrawal := model.NewUserWithdrawal()
+	mUserWithdrawal.ID = id
+	return model2.Delete(mUserWithdrawal.UserWithdrawal)
+}
+
+func NewWithdrawal() WithdrawalHandle {
+	return func(session *session.Enterprise) *Withdrawal {
+		return &Withdrawal{session}
+	}
+}