pro/olons_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve admin acceptance defects

Browse Source
This commit is contained in:
richjohnrambo
2026-10-16 10:14:41 +08:00
parent c6ec45cccf
commit 2b3d855bcc
39 changed files with 1079 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/model/input/sysin/trade.go
+36 -9
View File
@@ -16,11 +16,12 @@ import (
type TradeOrderListInp struct {
form.PageReq
OrderNo string `json:"orderNo"`
Username string `json:"username"`
Mobile string `json:"mobile"`
OrderStatus int `json:"orderStatus"`
CreatedAt []*gtime.Time `json:"createdAt"`
OrderNo string `json:"orderNo"`
Username string `json:"username"`
Mobile string `json:"mobile"`
AutoDispatch int `json:"autoDispatch"`
OrderStatus int `json:"orderStatus"`
CreatedAt []*gtime.Time `json:"createdAt"`
}
func (in *TradeOrderListInp) Filter(ctx context.Context) error { return nil }
@@ -70,10 +71,36 @@ func (in *TradeOrderViewInp) Filter(ctx context.Context) error { return nil }
type TradeOrderViewModel struct {
TradeOrderListModel
TaskId uint64 `json:"taskId"`
ProductId uint64 `json:"productId"`
MemberLevelId uint64 `json:"memberLevelId"`
RuleSnapshot *gjson.Json `json:"ruleSnapshot"`
TaskId uint64 `json:"taskId"`
ProductId uint64 `json:"productId"`
MemberLevelId uint64 `json:"memberLevelId"`
RuleSnapshot *gjson.Json `json:"ruleSnapshot"`
UpdatedAt *gtime.Time `json:"updatedAt"`
Timeline []*TradeOrderTimelineModel `json:"timeline"`
Ledgers []*TradeOrderLedgerModel `json:"ledgers"`
ApprovalActions []*TradeOrderApprovalActionModel `json:"approvalActions"`
}
type TradeOrderTimelineModel struct {
Title string `json:"title"`
Time *gtime.Time `json:"time"`
}
type TradeOrderLedgerModel struct {
LedgerNo string `json:"ledgerNo"`
BizType string `json:"bizType"`
Direction int `json:"direction"`
Amount int64 `json:"amount"`
BeforeAmount int64 `json:"beforeAmount"`
AfterAmount int64 `json:"afterAmount"`
Remark string `json:"remark"`
OccurredAt *gtime.Time `json:"occurredAt"`
}
type TradeOrderApprovalActionModel struct {
StepNo uint `json:"stepNo"`
ActorId uint64 `json:"actorId"`
Action int `json:"action"`
Comment string `json:"comment"`
CreatedAt *gtime.Time `json:"createdAt"`
}
type TradeOrderApplyInp struct {