fnvtk/soul-yongping
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yongxu-dev' into devlop

Browse Source 
# Conflicts:
#	miniprogram/app.js
#	miniprogram/app.json
#	miniprogram/pages/chapters/chapters.js
#	miniprogram/pages/chapters/chapters.wxml
#	miniprogram/pages/chapters/chapters.wxss
#	miniprogram/pages/index/index.js
#	miniprogram/pages/index/index.wxml
#	miniprogram/pages/match/match.js
#	miniprogram/pages/my/my.js
#	miniprogram/pages/my/my.wxml
#	miniprogram/pages/read/read.js
#	miniprogram/pages/read/read.wxml
#	miniprogram/pages/read/read.wxss
#	miniprogram/pages/referral/referral.js
#	miniprogram/pages/search/search.js
#	miniprogram/pages/vip/vip.js
#	miniprogram/pages/wallet/wallet.wxml
#	miniprogram/project.private.config.json
#	soul-admin/dist/index.html
#	soul-admin/src/pages/dashboard/DashboardPage.tsx
#	soul-admin/src/pages/settings/SettingsPage.tsx
#	soul-api/go.mod
#	soul-api/internal/handler/admin_dashboard.go
#	soul-api/internal/handler/db.go
#	soul-api/wechat/info.log
#	开发文档/10、项目管理/运营与变更.md
#	开发文档/README.md
This commit is contained in:
Alex-larget
2026-03-18 17:55:34 +08:00
parent 34f7c7bbdc 0f3933fabd
commit 3d7a0d58a4
125 changed files with 46439 additions and 2916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
soul-api/internal/model/gift_pay_request.go
View File

@@ -2,7 +2,8 @@ package model
import "time"
// GiftPayRequest 代付请求表（美团式：发起人创建，好友支付，权益归发起人）
// GiftPayRequest 代付请求表（改造后：发起人创建并支付，好友领取）
// status: pending_pay（待发起人支付）| paid（已支付待领取）| cancelled | expired
type GiftPayRequest struct {
ID string `gorm:"column:id;primaryKey;size:50" json:"id"`
RequestSN string `gorm:"column:request_sn;uniqueIndex;size:32" json:"requestSn"`
@@ -11,7 +12,9 @@ type GiftPayRequest struct {
ProductID string `gorm:"column:product_id;size:50" json:"productId"`
Amount float64 `gorm:"column:amount;type:decimal(10,2)" json:"amount"`
Description string `gorm:"column:description;size:200" json:"description"`
Status string `gorm:"column:status;size:20;index" json:"status"` // pending / paid / cancelled / expired
Status string `gorm:"column:status;size:20;index" json:"status"` // pending_pay / paid / cancelled / expired
Quantity int `gorm:"column:quantity;default:1" json:"quantity"`
RedeemedCount int `gorm:"column:redeemed_count;default:0" json:"redeemedCount"`
PayerUserID *string `gorm:"column:payer_user_id;size:50" json:"payerUserId,omitempty"`
OrderID *string `gorm:"column:order_id;size:50" json:"orderId,omitempty"`
ExpireAt time.Time `gorm:"column:expire_at" json:"expireAt"`

10
soul-api/internal/model/user.go
View File

@@ -1,8 +1,13 @@
package model
import "time"
import (
"time"
"gorm.io/gorm"
)
// User 对应表 users，JSON 输出与现网接口 1:1（小写驼峰）
// 软删除：管理端删除仅设置 deleted_at，用户再次登录会创建新账号
type User struct {
ID string `gorm:"column:id;primaryKey;size:50" json:"id"`
OpenID *string `gorm:"column:open_id;size:100" json:"openId,omitempty"`
@@ -51,6 +56,9 @@ type User struct {
VipContact *string `gorm:"column:vip_contact;size:100" json:"vipContact,omitempty"`
VipBio *string `gorm:"column:vip_bio;type:text" json:"vipBio,omitempty"`
// 软删除：管理端假删除，用户再次登录会新建账号
DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;index" json:"-"`
// 以下为接口返回时从订单/绑定表实时计算的字段，不入库
PurchasedSectionCount int `gorm:"-" json:"purchasedSectionCount,omitempty"`
WalletBalance *float64 `gorm:"-" json:"walletBalance,omitempty"`