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/do/app_member_payment_account.go
+31 -23
View File
@@ -11,27 +11,35 @@ import (
// AppMemberPaymentAccount is the golang structure of table hg_app_member_payment_account for DAO operations like Where/Data.
type AppMemberPaymentAccount struct {
g.Meta `orm:"table:hg_app_member_payment_account, do:true"`
Id any // 主键
TenantId any // 租户ID
MemberId any // 会员ID
AccountType any // 账户类型
BankCode any // 银行编码
BankName any // 银行名称
HolderCipher any // 持有人密文
HolderMask any // 持有人脱敏值
MobileCipher any // 预留手机号密文
MobileMask any // 预留手机号脱敏值
AccountNoCipher any // 账号密文
AccountNoHash any // 账号检索哈希
AccountNoMask any // 账号脱敏值
QrAttachmentId any // 收款码附件ID
VerifyStatus any // 核验状态
IsDefault any // 默认账户
CreatedBy any // 创建者
UpdatedBy any // 更新者
DeletedBy any // 删除者
CreatedAt *gtime.Time // 创建时间
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 删除时间
g.Meta `orm:"table:hg_app_member_payment_account, do:true"`
Id any // 主键
TenantId any // 租户ID
MemberId any // 会员ID
AccountType any // 账户类型
BankCode any // 银行编码
BankName any // 银行名称
HolderCipher any // 持有人密文
HolderMask any // 持有人脱敏值
IdentityNoCipher any // 身份证号密文
IdentityNoHash any // 身份证号检索哈希
IdentityNoMask any // 身份证号脱敏值
MobileCipher any // 预留手机号密文
MobileMask any // 预留手机号脱敏值
AccountNoCipher any // 账号密文
AccountNoHash any // 账号检索哈希
AccountNoMask any // 账号脱敏值
DigitalRmbCodeCipher any // 数字人民币编码密文
DigitalRmbCodeHash any // 数字人民币编码检索哈希
DigitalRmbCodeMask any // 数字人民币编码脱敏值
QrAttachmentId any // 收款码附件ID
WechatQrAttachmentId any // 微信二维码附件ID
AlipayQrAttachmentId any // 支付宝二维码附件ID
VerifyStatus any // 核验状态
IsDefault any // 默认账户
CreatedBy any // 创建者
UpdatedBy any // 更新者
DeletedBy any // 删除者
CreatedAt *gtime.Time // 创建时间
UpdatedAt *gtime.Time // 更新时间
DeletedAt *gtime.Time // 删除时间
}
server/internal/model/do/task.go
+1
View File
@@ -16,6 +16,7 @@ type Task struct {
TenantId any // 租户ID
TaskNo any // 任务编号
HallId any // 任务大厅ID
ProductId any // 关联商品ID
Title any // 标题
Description any // 描述
DetailHtml any // 清洗后的任务详情
server/internal/model/entity/app_member_payment_account.go
+30 -22
View File
@@ -10,26 +10,34 @@ import (
// AppMemberPaymentAccount is the golang structure for table app_member_payment_account.
type AppMemberPaymentAccount struct {
Id uint64 `json:"id" orm:"id" description:"主键"`
TenantId uint64 `json:"tenantId" orm:"tenant_id" description:"租户ID"`
MemberId uint64 `json:"memberId" orm:"member_id" description:"会员ID"`
AccountType int `json:"accountType" orm:"account_type" description:"账户类型"`
BankCode string `json:"bankCode" orm:"bank_code" description:"银行编码"`
BankName string `json:"bankName" orm:"bank_name" description:"银行名称"`
HolderCipher string `json:"holderCipher" orm:"holder_cipher" description:"持有人密文"`
HolderMask string `json:"holderMask" orm:"holder_mask" description:"持有人脱敏值"`
MobileCipher string `json:"mobileCipher" orm:"mobile_cipher" description:"预留手机号密文"`
MobileMask string `json:"mobileMask" orm:"mobile_mask" description:"预留手机号脱敏值"`
AccountNoCipher string `json:"accountNoCipher" orm:"account_no_cipher" description:"账号密文"`
AccountNoHash string `json:"accountNoHash" orm:"account_no_hash" description:"账号检索哈希"`
AccountNoMask string `json:"accountNoMask" orm:"account_no_mask" description:"账号脱敏值"`
QrAttachmentId uint64 `json:"qrAttachmentId" orm:"qr_attachment_id" description:"收款码附件ID"`
VerifyStatus int `json:"verifyStatus" orm:"verify_status" description:"核验状态"`
IsDefault int `json:"isDefault" orm:"is_default" description:"默认账户"`
CreatedBy uint64 `json:"createdBy" orm:"created_by" description:"创建者"`
UpdatedBy uint64 `json:"updatedBy" orm:"updated_by" description:"更新者"`
DeletedBy uint64 `json:"deletedBy" orm:"deleted_by" description:"删除者"`
CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"`
UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"`
DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"删除时间"`
Id uint64 `json:"id" orm:"id" description:"主键"`
TenantId uint64 `json:"tenantId" orm:"tenant_id" description:"租户ID"`
MemberId uint64 `json:"memberId" orm:"member_id" description:"会员ID"`
AccountType int `json:"accountType" orm:"account_type" description:"账户类型"`
BankCode string `json:"bankCode" orm:"bank_code" description:"银行编码"`
BankName string `json:"bankName" orm:"bank_name" description:"银行名称"`
HolderCipher string `json:"holderCipher" orm:"holder_cipher" description:"持有人密文"`
HolderMask string `json:"holderMask" orm:"holder_mask" description:"持有人脱敏值"`
IdentityNoCipher string `json:"identityNoCipher" orm:"identity_no_cipher" description:"身份证号密文"`
IdentityNoHash string `json:"identityNoHash" orm:"identity_no_hash" description:"身份证号检索哈希"`
IdentityNoMask string `json:"identityNoMask" orm:"identity_no_mask" description:"身份证号脱敏值"`
MobileCipher string `json:"mobileCipher" orm:"mobile_cipher" description:"预留手机号密文"`
MobileMask string `json:"mobileMask" orm:"mobile_mask" description:"预留手机号脱敏值"`
AccountNoCipher string `json:"accountNoCipher" orm:"account_no_cipher" description:"账号密文"`
AccountNoHash string `json:"accountNoHash" orm:"account_no_hash" description:"账号检索哈希"`
AccountNoMask string `json:"accountNoMask" orm:"account_no_mask" description:"账号脱敏值"`
DigitalRmbCodeCipher string `json:"digitalRmbCodeCipher" orm:"digital_rmb_code_cipher" description:"数字人民币编码密文"`
DigitalRmbCodeHash string `json:"digitalRmbCodeHash" orm:"digital_rmb_code_hash" description:"数字人民币编码检索哈希"`
DigitalRmbCodeMask string `json:"digitalRmbCodeMask" orm:"digital_rmb_code_mask" description:"数字人民币编码脱敏值"`
QrAttachmentId uint64 `json:"qrAttachmentId" orm:"qr_attachment_id" description:"收款码附件ID"`
WechatQrAttachmentId uint64 `json:"wechatQrAttachmentId" orm:"wechat_qr_attachment_id" description:"微信二维码附件ID"`
AlipayQrAttachmentId uint64 `json:"alipayQrAttachmentId" orm:"alipay_qr_attachment_id" description:"支付宝二维码附件ID"`
VerifyStatus int `json:"verifyStatus" orm:"verify_status" description:"核验状态"`
IsDefault int `json:"isDefault" orm:"is_default" description:"默认账户"`
CreatedBy uint64 `json:"createdBy" orm:"created_by" description:"创建者"`
UpdatedBy uint64 `json:"updatedBy" orm:"updated_by" description:"更新者"`
DeletedBy uint64 `json:"deletedBy" orm:"deleted_by" description:"删除者"`
CreatedAt *gtime.Time `json:"createdAt" orm:"created_at" description:"创建时间"`
UpdatedAt *gtime.Time `json:"updatedAt" orm:"updated_at" description:"更新时间"`
DeletedAt *gtime.Time `json:"deletedAt" orm:"deleted_at" description:"删除时间"`
}
server/internal/model/entity/task.go
+1
View File
@@ -14,6 +14,7 @@ type Task struct {
TenantId uint64 `json:"tenantId" orm:"tenant_id" description:"租户ID"`
TaskNo string `json:"taskNo" orm:"task_no" description:"任务编号"`
HallId uint64 `json:"hallId" orm:"hall_id" description:"任务大厅ID"`
ProductId uint64 `json:"productId" orm:"product_id" description:"关联商品ID"`
Title string `json:"title" orm:"title" description:"标题"`
Description string `json:"description" orm:"description" description:"描述"`
DetailHtml string `json:"detailHtml" orm:"detail_html" description:"清洗后的任务详情"`
server/internal/model/input/sysin/app_member.go
+36 -24
View File
@@ -164,32 +164,44 @@ type AppMemberPaymentListInp struct {
func (in *AppMemberPaymentListInp) Filter(ctx context.Context) error { return nil }
type AppMemberPaymentModel struct {
Id uint64 `json:"id"`
MemberId uint64 `json:"memberId"`
AccountType int `json:"accountType"`
BankCode string `json:"bankCode"`
BankName string `json:"bankName"`
HolderMask string `json:"holderMask"`
MobileMask string `json:"mobileMask"`
AccountNoMask string `json:"accountNoMask"`
QrAttachmentId uint64 `json:"qrAttachmentId"`
VerifyStatus int `json:"verifyStatus"`
IsDefault int `json:"isDefault"`
CreatedAt *gtime.Time `json:"createdAt"`
UpdatedAt *gtime.Time `json:"updatedAt"`
Id uint64 `json:"id"`
MemberId uint64 `json:"memberId"`
AccountType int `json:"accountType"`
BankCode string `json:"bankCode"`
BankName string `json:"bankName"`
HolderMask string `json:"holderMask"`
IdentityNoMask string `json:"identityNoMask"`
MobileMask string `json:"mobileMask"`
AccountNoMask string `json:"accountNoMask"`
DigitalRMBCodeMask string `json:"digitalRmbCodeMask"`
QrAttachmentId uint64 `json:"qrAttachmentId"`
WechatQrAttachmentId uint64 `json:"wechatQrAttachmentId"`
AlipayQrAttachmentId uint64 `json:"alipayQrAttachmentId"`
WechatQrUrl string `json:"wechatQrUrl"`
AlipayQrUrl string `json:"alipayQrUrl"`
VerifyStatus int `json:"verifyStatus"`
IsDefault int `json:"isDefault"`
CreatedAt *gtime.Time `json:"createdAt"`
UpdatedAt *gtime.Time `json:"updatedAt"`
}
type AppMemberPaymentEditInp struct {
Id uint64 `json:"id"`
MemberId uint64 `json:"memberId" v:"required|min:1#会员ID不能为空|会员ID不能为空"`
AccountType int `json:"accountType" v:"required#账户类型不能为空"`
BankCode string `json:"bankCode" v:"max-length:32#银行编码不能超过32个字符"`
BankName string `json:"bankName" v:"max-length:100#银行名称不能超过100个字符"`
Holder string `json:"holder"`
Mobile string `json:"mobile" v:"phone-loose#手机号格式不正确"`
AccountNo string `json:"accountNo"`
QrAttachmentId uint64 `json:"qrAttachmentId"`
VerifyStatus int `json:"verifyStatus" d:"1"`
IsDefault int `json:"isDefault" d:"2"`
Id uint64 `json:"id"`
MemberId uint64 `json:"memberId" v:"required|min:1#会员ID不能为空|会员ID不能为空"`
AccountType int `json:"accountType" v:"required#账户类型不能为空"`
BankCode string `json:"bankCode" v:"max-length:32#银行编码不能超过32个字符"`
BankName string `json:"bankName" v:"max-length:100#银行名称不能超过100个字符"`
Holder string `json:"holder"`
IdentityNo string `json:"identityNo"`
Mobile string `json:"mobile" v:"phone-loose#手机号格式不正确"`
AccountNo string `json:"accountNo"`
DigitalRMBCode string `json:"digitalRmbCode"`
QrAttachmentId uint64 `json:"qrAttachmentId"`
WechatQrAttachmentId uint64 `json:"wechatQrAttachmentId"`
AlipayQrAttachmentId uint64 `json:"alipayQrAttachmentId"`
WechatQrUrl string `json:"wechatQrUrl"`
AlipayQrUrl string `json:"alipayQrUrl"`
VerifyStatus int `json:"verifyStatus" d:"1"`
IsDefault int `json:"isDefault" d:"2"`
}
func (in *AppMemberPaymentEditInp) Filter(ctx context.Context) error {
server/internal/model/input/sysin/portal.go
+9 -11
View File
@@ -55,14 +55,12 @@ func (in *SiteConfigSaveInp) Filter(ctx context.Context) error {
if strings.TrimSpace(in.Config.SiteName) == "" {
return gerror.New("站点名称不能为空")
}
if in.Config.PrivacyPolicyUrl != "" {
u, err := url.Parse(in.Config.PrivacyPolicyUrl)
if err != nil || u.Scheme != "https" || u.Host == "" {
return gerror.New("隐私政策地址必须是有效的 HTTPS 地址")
}
u, err := url.Parse(in.Config.PrivacyPolicyUrl)
if err != nil || u.Scheme != "https" || u.Host == "" {
return gerror.New("隐私政策地址不能为空且必须是有效的 HTTPS 地址")
}
if in.Config.TradeWaitSeconds < 0 || in.Config.DailyTradeLimit < 0 || in.Config.DailyRewardLimit < 0 {
return gerror.New("交易等待时间和每日次数不能为负数")
if in.Config.TradeBalanceAmount <= 0 || in.Config.TradeWaitSeconds <= 0 || in.Config.DailyTradeLimit <= 0 || in.Config.DailyRewardLimit <= 0 || in.Config.MinimumRechargeAmount <= 0 {
return gerror.New("交易余额、支付等待时长、每日次数和最低充值金额必须大于0")
}
if len(in.Config.CommissionRates) != 6 {
return gerror.New("必须配置 0 至 5 级共 6 个佣金比例")
@@ -77,11 +75,11 @@ func (in *SiteConfigSaveInp) Filter(ctx context.Context) error {
if total > 1 {
return gerror.New("各级佣金比例总和不能超过 100%")
}
if in.Config.AutoOrderDelaySeconds < 0 {
return gerror.New("自动派单时间不能为负数")
if in.Config.AutoOrderDelaySeconds <= 0 {
return gerror.New("自动派单时间必须大于0")
}
if in.Config.AutoOrderMinAmount < 0 || in.Config.AutoOrderMaxAmount < in.Config.AutoOrderMinAmount {
return gerror.New("自动派单最大金额不能小于最小金额")
if in.Config.AutoOrderMinAmount <= 0 || in.Config.AutoOrderMaxAmount < in.Config.AutoOrderMinAmount {
return gerror.New("自动派单金额必须大于0，且最大金额不能小于最小金额")
}
for _, ranges := range [][]string{in.Config.WithdrawTimeRanges, in.Config.RechargeTimeRanges, in.Config.TradeTimeRanges, in.Config.SignTimeRanges} {
for _, value := range ranges {
server/internal/model/input/sysin/product_task.go
+10 -6
View File
@@ -123,6 +123,7 @@ func (in *ProductDeleteInp) Filter(ctx context.Context) error { return nil }
type TaskUpdateFields struct {
HallId uint64
ProductId uint64
Title string
Description string
DetailHtml string
@@ -157,10 +158,11 @@ func (in *TaskListInp) Filter(ctx context.Context) error { return nil }
type TaskListModel struct {
entity.Task
HallName string `json:"hallName"`
LevelIds []uint64 `json:"levelIds"`
LevelNames []string `json:"levelNames"`
Referenced bool `json:"referenced"`
HallName string `json:"hallName"`
ProductName string `json:"productName"`
LevelIds []uint64 `json:"levelIds"`
LevelNames []string `json:"levelNames"`
Referenced bool `json:"referenced"`
}
type TaskViewInp struct {
Id uint64 `json:"id" v:"required|min:1#任务ID不能为空|任务ID不能为空"`
@@ -178,8 +180,8 @@ func (in *TaskEditInp) Filter(ctx context.Context) error {
if strings.TrimSpace(in.Title) == "" || strings.TrimSpace(in.Description) == "" || strings.TrimSpace(in.CoverUrl) == "" {
return gerror.New("任务标题、描述和封面不能为空")
}
if in.HallId == 0 || len(in.LevelIds) == 0 {
return gerror.New("请选择任务大厅和会员等级")
if in.HallId == 0 || in.ProductId == 0 || len(in.LevelIds) == 0 {
return gerror.New("请选择关联商品、任务大厅和会员等级")
}
if in.PerMemberLimit == 0 {
return gerror.New("单会员任务限制必须大于0")
@@ -231,6 +233,8 @@ type TaskSubmissionListModel struct {
Id uint64 `json:"id"`
SubmissionNo string `json:"submissionNo"`
TradeOrderId uint64 `json:"tradeOrderId"`
TradeOrderNo string `json:"tradeOrderNo"`
ProductName string `json:"productName"`
TaskId uint64 `json:"taskId"`
TaskTitle string `json:"taskTitle"`
MemberId uint64 `json:"memberId"`
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 {