diff --git a/api/.gitignore b/api/.gitignore index 7502cf69..bd063e1f 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -18,3 +18,4 @@ data config.toml static/upload storage.json +certs/alipay/* diff --git a/api/core/types/config.go b/api/core/types/config.go index 3e39a20f..49f1ea6c 100644 --- a/api/core/types/config.go +++ b/api/core/types/config.go @@ -21,6 +21,9 @@ type AppConfig struct { MjConfig MidJourneyConfig // mj 绘画配置 WeChatBot bool // 是否启用微信机器人 SdConfig StableDiffusionConfig // sd 绘画配置 + + XXLConfig XXLConfig + AlipayConfig AlipayConfig } type ChatPlusApiConfig struct { @@ -57,6 +60,27 @@ type AliYunSmsConfig struct { CodeTempId string // 验证码短信模板 ID } +type AlipayConfig struct { + Enabled bool // 是否启用支付宝服务 + Company string // 公司名称 + UserId string // 支付宝用户 ID + AppId string // 支付宝 AppID + PrivateKey string // 用户私钥文件路径 + PublicKey string // 用户公钥文件路径 + AlipayPublicKey string // 支付宝公钥文件路径 + RootCert string // Root 秘钥路径 + ReturnURL string // 支付成功返回 URL + NotifyURL string // 异步通知回调 +} + +type XXLConfig struct { // XXL 任务调度配置 + ServerAddr string + AccessToken string + ExecutorIp string + ExecutorPort string + RegistryKey string +} + type RedisConfig struct { Host string Port int diff --git a/api/core/types/order.go b/api/core/types/order.go new file mode 100644 index 00000000..433580a1 --- /dev/null +++ b/api/core/types/order.go @@ -0,0 +1,17 @@ +package types + +type OrderStatus int + +const ( + OrderNotPaid = OrderStatus(0) + OrderScanned = OrderStatus(1) // 已扫码 + OrderPaidSuccess = OrderStatus(2) +) + +type OrderRemark struct { + Days int `json:"days"` // 有效期 + Calls int `json:"calls"` // 增加调用次数 + Name string `json:"name"` // 产品名称 + Price float64 `json:"price"` + Discount float64 `json:"discount"` +} diff --git a/api/go.mod b/api/go.mod index 2795d11c..a4113b18 100644 --- a/api/go.mod +++ b/api/go.mod @@ -18,12 +18,15 @@ require ( github.com/pkoukk/tiktoken-go v0.1.1-0.20230418101013-cae809389480 github.com/qiniu/go-sdk/v7 v7.17.1 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e + github.com/smartwalle/alipay/v3 v3.2.15 github.com/syndtr/goleveldb v1.0.0 go.uber.org/zap v1.23.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/mysql v1.4.7 ) +require github.com/xxl-job/xxl-job-executor-go v1.2.0 + require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/bytedance/sonic v1.9.1 // indirect @@ -34,6 +37,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/gaukas/godicttls v0.0.3 // indirect + github.com/go-basic/ipv4 v1.0.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/goccy/go-json v0.10.2 // indirect @@ -49,6 +53,7 @@ require ( github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/sha256-simd v1.0.1 // indirect + github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/onsi/ginkgo/v2 v2.10.0 // indirect github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect @@ -59,6 +64,9 @@ require ( github.com/refraction-networking/utls v1.3.2 // indirect github.com/rs/xid v1.5.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect + github.com/smartwalle/ncrypto v1.0.2 // indirect + github.com/smartwalle/ngx v1.0.6 // indirect + github.com/smartwalle/nsign v1.0.8 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect go.uber.org/dig v1.16.1 // indirect golang.org/x/arch v0.3.0 // indirect diff --git a/api/go.sum b/api/go.sum index 108f5b59..6bc673ed 100644 --- a/api/go.sum +++ b/api/go.sum @@ -39,6 +39,8 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/go-basic/ipv4 v1.0.0 h1:gjyFAa1USC1hhXTkPOwBWDPfMcUaIM+tvo1XzV9EZxs= +github.com/go-basic/ipv4 v1.0.0/go.mod h1:etLBnaxbidQfuqE6wgZQfs38nEWNmzALkxDZe4xY8Dg= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -133,6 +135,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= +github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -175,6 +179,14 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= +github.com/smartwalle/alipay/v3 v3.2.15 h1:3fvFJnINKKAOXHR/Iv20k1Z7KJ+nOh3oK214lELPqG8= +github.com/smartwalle/alipay/v3 v3.2.15/go.mod h1:niTNB609KyUYuAx9Bex/MawEjv2yPx4XOjxSAkqmGjE= +github.com/smartwalle/ncrypto v1.0.2 h1:pTAhCqtPCMhpOwFXX+EcMdR6PNzruBNoGQrN2S1GbGI= +github.com/smartwalle/ncrypto v1.0.2/go.mod h1:Dwlp6sfeNaPMnOxMNayMTacvC5JGEVln3CVdiVDgbBk= +github.com/smartwalle/ngx v1.0.6 h1:JPNqNOIj+2nxxFtrSkJO+vKJfeNUSEQueck/Wworjps= +github.com/smartwalle/ngx v1.0.6/go.mod h1:mx/nz2Pk5j+RBs7t6u6k22MPiBG/8CtOMpCnALIG8Y0= +github.com/smartwalle/nsign v1.0.8 h1:78KWtwKPrdt4Xsn+tNEBVxaTLIJBX9YRX0ZSrMUeuHo= +github.com/smartwalle/nsign v1.0.8/go.mod h1:eY6I4CJlyNdVMP+t6z1H6Jpd4m5/V+8xi44ufSTxXgc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -197,6 +209,8 @@ github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVK github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/xxl-job/xxl-job-executor-go v1.2.0 h1:MTl2DpwrK2+hNjRRks2k7vB3oy+3onqm9OaSarneeLQ= +github.com/xxl-job/xxl-job-executor-go v1.2.0/go.mod h1:bUFhz/5Irp9zkdYk5MxhQcDDT6LlZrI8+rv5mHtQ1mo= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/api/handler/admin/order_handler.go b/api/handler/admin/order_handler.go new file mode 100644 index 00000000..4ec4537a --- /dev/null +++ b/api/handler/admin/order_handler.go @@ -0,0 +1,93 @@ +package admin + +import ( + "chatplus/core" + "chatplus/core/types" + "chatplus/handler" + "chatplus/store/model" + "chatplus/store/vo" + "chatplus/utils" + "chatplus/utils/resp" + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +type OrderHandler struct { + handler.BaseHandler + db *gorm.DB +} + +func NewOrderHandler(app *core.AppServer, db *gorm.DB) *OrderHandler { + h := OrderHandler{db: db} + h.App = app + return &h +} + +func (h *OrderHandler) List(c *gin.Context) { + var data struct { + OrderNo string `json:"order_no"` + PayTime []string `json:"pay_time"` + Page int `json:"page"` + PageSize int `json:"page_size"` + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + session := h.db.Session(&gorm.Session{}) + if data.OrderNo != "" { + session = session.Where("order_no", data.OrderNo) + } + if len(data.PayTime) == 2 { + start := utils.Str2stamp(data.PayTime[0] + " 00:00:00") + end := utils.Str2stamp(data.PayTime[1] + " 00:00:00") + session = session.Where("pay_time >= ? AND pay_time <= ?", start, end) + } + var total int64 + session.Model(&model.Order{}).Count(&total) + var items []model.Order + var list = make([]vo.Order, 0) + offset := (data.Page - 1) * data.PageSize + res := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&items) + if res.Error == nil { + for _, item := range items { + var order vo.Order + err := utils.CopyObject(item, &order) + if err == nil { + order.Id = item.Id + order.CreatedAt = item.CreatedAt.Unix() + order.UpdatedAt = item.UpdatedAt.Unix() + list = append(list, order) + } else { + logger.Error(err) + } + } + } + resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, list)) +} + +func (h *OrderHandler) Remove(c *gin.Context) { + id := h.GetInt(c, "id", 0) + + if id > 0 { + var item model.Order + res := h.db.First(&item, id) + if res.Error != nil { + resp.ERROR(c, "记录不存在！") + return + } + + if item.Status == types.OrderPaidSuccess { + resp.ERROR(c, "已支付订单不允许删除！") + return + } + + res = h.db.Where("id = ?", id).Delete(&model.Order{}) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败！") + return + } + } + resp.SUCCESS(c) +} diff --git a/api/handler/admin/product_handler.go b/api/handler/admin/product_handler.go new file mode 100644 index 00000000..2c6d8df4 --- /dev/null +++ b/api/handler/admin/product_handler.go @@ -0,0 +1,144 @@ +package admin + +import ( + "chatplus/core" + "chatplus/core/types" + "chatplus/handler" + "chatplus/store/model" + "chatplus/store/vo" + "chatplus/utils" + "chatplus/utils/resp" + "github.com/gin-gonic/gin" + "gorm.io/gorm" + "time" +) + +type ProductHandler struct { + handler.BaseHandler + db *gorm.DB +} + +func NewProductHandler(app *core.AppServer, db *gorm.DB) *ProductHandler { + h := ProductHandler{db: db} + h.App = app + return &h +} + +func (h *ProductHandler) Save(c *gin.Context) { + var data struct { + Id uint `json:"id"` + Name string `json:"name"` + Price float64 `json:"price"` + Discount float64 `json:"discount"` + Enabled bool `json:"enabled"` + Days int `json:"days"` + Calls int `json:"calls"` + CreatedAt int64 `json:"created_at"` + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + item := model.Product{Name: data.Name, Price: data.Price, Discount: data.Discount, Days: data.Days, Calls: data.Calls, Enabled: data.Enabled} + item.Id = data.Id + if item.Id > 0 { + item.CreatedAt = time.Unix(data.CreatedAt, 0) + } + res := h.db.Save(&item) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败！") + return + } + + var itemVo vo.Product + err := utils.CopyObject(item, &itemVo) + if err != nil { + resp.ERROR(c, "数据拷贝失败！") + return + } + itemVo.Id = item.Id + itemVo.UpdatedAt = item.UpdatedAt.Unix() + resp.SUCCESS(c, itemVo) +} + +// List 模型列表 +func (h *ProductHandler) List(c *gin.Context) { + session := h.db.Session(&gorm.Session{}) + enable := h.GetBool(c, "enable") + if enable { + session = session.Where("enabled", enable) + } + var items []model.Product + var list = make([]vo.Product, 0) + res := session.Order("sort_num ASC").Find(&items) + if res.Error == nil { + for _, item := range items { + var product vo.Product + err := utils.CopyObject(item, &product) + if err == nil { + product.Id = item.Id + product.CreatedAt = item.CreatedAt.Unix() + product.UpdatedAt = item.UpdatedAt.Unix() + list = append(list, product) + } else { + logger.Error(err) + } + } + } + resp.SUCCESS(c, list) +} + +func (h *ProductHandler) Enable(c *gin.Context) { + var data struct { + Id uint `json:"id"` + Enabled bool `json:"enabled"` + } + + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + res := h.db.Model(&model.Product{}).Where("id = ?", data.Id).Update("enabled", data.Enabled) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败！") + return + } + resp.SUCCESS(c) +} + +func (h *ProductHandler) Sort(c *gin.Context) { + var data struct { + Ids []uint `json:"ids"` + Sorts []int `json:"sorts"` + } + + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + for index, id := range data.Ids { + res := h.db.Model(&model.Product{}).Where("id = ?", id).Update("sort_num", data.Sorts[index]) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败！") + return + } + } + + resp.SUCCESS(c) +} + +func (h *ProductHandler) Remove(c *gin.Context) { + id := h.GetInt(c, "id", 0) + + if id > 0 { + res := h.db.Where("id = ?", id).Delete(&model.Product{}) + if res.Error != nil { + resp.ERROR(c, "更新数据库失败！") + return + } + } + resp.SUCCESS(c) +} diff --git a/api/handler/order_handler.go b/api/handler/order_handler.go new file mode 100644 index 00000000..35d9e7ee --- /dev/null +++ b/api/handler/order_handler.go @@ -0,0 +1,57 @@ +package handler + +import ( + "chatplus/core" + "chatplus/core/types" + "chatplus/store/model" + "chatplus/store/vo" + "chatplus/utils" + "chatplus/utils/resp" + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +type OrderHandler struct { + BaseHandler + db *gorm.DB +} + +func NewOrderHandler(app *core.AppServer, db *gorm.DB) *OrderHandler { + h := OrderHandler{db: db} + h.App = app + return &h +} + +func (h *OrderHandler) List(c *gin.Context) { + var data struct { + Page int `json:"page"` + PageSize int `json:"page_size"` + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + user, _ := utils.GetLoginUser(c, h.db) + session := h.db.Session(&gorm.Session{}).Where("user_id = ? AND status = ?", user.Id, types.OrderPaidSuccess) + var total int64 + session.Model(&model.Order{}).Count(&total) + var items []model.Order + var list = make([]vo.Order, 0) + offset := (data.Page - 1) * data.PageSize + res := session.Order("id DESC").Offset(offset).Limit(data.PageSize).Find(&items) + if res.Error == nil { + for _, item := range items { + var order vo.Order + err := utils.CopyObject(item, &order) + if err == nil { + order.Id = item.Id + order.CreatedAt = item.CreatedAt.Unix() + order.UpdatedAt = item.UpdatedAt.Unix() + list = append(list, order) + } else { + logger.Error(err) + } + } + } + resp.SUCCESS(c, vo.NewPage(total, data.Page, data.PageSize, list)) +} diff --git a/api/handler/payment_handler.go b/api/handler/payment_handler.go new file mode 100644 index 00000000..e329f926 --- /dev/null +++ b/api/handler/payment_handler.go @@ -0,0 +1,259 @@ +package handler + +import ( + "chatplus/core" + "chatplus/core/types" + "chatplus/service" + "chatplus/service/payment" + "chatplus/store/model" + "chatplus/utils" + "chatplus/utils/resp" + "embed" + "encoding/base64" + "fmt" + "github.com/gin-gonic/gin" + "gorm.io/gorm" + "net/http" + "net/url" + "sync" + "time" +) + +// PaymentHandler 支付服务回调 handler +type PaymentHandler struct { + BaseHandler + alipayService *payment.AlipayService + snowflake *service.Snowflake + db *gorm.DB + fs embed.FS + lock sync.Mutex +} + +func NewPaymentHandler(server *core.AppServer, alipayService *payment.AlipayService, snowflake *service.Snowflake, db *gorm.DB, fs embed.FS) *PaymentHandler { + h := PaymentHandler{lock: sync.Mutex{}} + h.App = server + h.alipayService = alipayService + h.snowflake = snowflake + h.db = db + h.fs = fs + return &h +} + +func (h *PaymentHandler) Alipay(c *gin.Context) { + orderNo := h.GetTrim(c, "order_no") + if orderNo == "" { + resp.ERROR(c, types.InvalidArgs) + return + } + + var order model.Order + res := h.db.Where("order_no = ?", orderNo).First(&order) + if res.Error != nil { + resp.ERROR(c, "Order not found") + return + } + + // 更新扫码状态 + h.db.Model(&order).UpdateColumn("status", types.OrderScanned) + // 生成支付链接 + notifyURL := h.App.Config.AlipayConfig.NotifyURL + returnURL := h.App.Config.AlipayConfig.ReturnURL + amount := fmt.Sprintf("%.2f", order.Amount) + + uri, err := h.alipayService.PayUrlMobile(order.OrderNo, notifyURL, returnURL, amount, order.Subject) + if err != nil { + resp.ERROR(c, "error with generate pay url: "+err.Error()) + return + } + + c.Redirect(302, uri) +} + +// OrderQuery 清单状态查询 +func (h *PaymentHandler) OrderQuery(c *gin.Context) { + var data struct { + OrderNo string `json:"order_no"` + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + var order model.Order + res := h.db.Where("order_no = ?", data.OrderNo).First(&order) + if res.Error != nil { + resp.ERROR(c, "Order not found") + return + } + + if order.Status == types.OrderPaidSuccess { + resp.SUCCESS(c, gin.H{"status": order.Status}) + return + } + + counter := 0 + for { + time.Sleep(time.Second) + var item model.Order + h.db.Where("order_no = ?", data.OrderNo).First(&item) + if counter >= 15 || item.Status == types.OrderPaidSuccess || item.Status != order.Status { + order.Status = item.Status + break + } + counter++ + } + + resp.SUCCESS(c, gin.H{"status": order.Status}) +} + +// AlipayQrcode 生成支付宝支付 URL 二维码 +func (h *PaymentHandler) AlipayQrcode(c *gin.Context) { + var data struct { + ProductId uint `json:"product_id"` + } + if err := c.ShouldBindJSON(&data); err != nil { + resp.ERROR(c, types.InvalidArgs) + return + } + + var product model.Product + res := h.db.First(&product, data.ProductId) + if res.Error != nil { + resp.ERROR(c, "Product not found") + return + } + + orderNo, err := h.snowflake.Next() + if err != nil { + resp.ERROR(c, "error with generate trade no: "+err.Error()) + return + } + user, err := utils.GetLoginUser(c, h.db) + if err != nil { + resp.NotAuth(c) + return + } + + // 创建订单 + remark := types.OrderRemark{ + Days: product.Days, + Calls: product.Calls, + Name: product.Name, + Price: product.Price, + Discount: product.Discount, + } + order := model.Order{ + UserId: user.Id, + Mobile: user.Mobile, + ProductId: product.Id, + OrderNo: orderNo, + Subject: product.Name, + Amount: product.Price - product.Discount, + Status: types.OrderNotPaid, + Remark: utils.JsonEncode(remark), + } + res = h.db.Create(&order) + if res.Error != nil { + resp.ERROR(c, "error with create order: "+res.Error.Error()) + return + } + + // 生成二维码图片 + file, err := h.fs.Open("res/img/alipay.jpg") + if err != nil { + resp.ERROR(c, err.Error()) + return + } + parse, err := url.Parse(h.App.Config.AlipayConfig.NotifyURL) + if err != nil { + resp.ERROR(c, err.Error()) + return + } + + imageURL := fmt.Sprintf("%s://%s/api/payment/alipay?order_no=%s", parse.Scheme, parse.Host, orderNo) + imgData, err := utils.GenQrcode(imageURL, 400, file) + if err != nil { + resp.ERROR(c, err.Error()) + return + } + imgDataBase64 := base64.StdEncoding.EncodeToString(imgData) + resp.SUCCESS(c, gin.H{"order_no": orderNo, "image": fmt.Sprintf("data:image/jpg;base64, %s", imgDataBase64), "url": imageURL}) +} + +func (h *PaymentHandler) AlipayNotify(c *gin.Context) { + err := c.Request.ParseForm() + if err != nil { + c.String(http.StatusOK, "fail") + return + } + + // TODO：这里最好用支付宝的公钥签名签证一下交易真假 + //res := h.alipayService.TradeVerify(c.Request.Form) + r := h.alipayService.TradeQuery(c.Request.Form.Get("out_trade_no")) + logger.Infof("验证支付结果：%+v", r) + if !r.Success() { + c.String(http.StatusOK, "fail") + return + } + + h.lock.Lock() + defer h.lock.Unlock() + + var order model.Order + res := h.db.Where("order_no = ?", r.OutTradeNo).First(&order) + if res.Error != nil { + logger.Error(res.Error) + c.String(http.StatusOK, "fail") + return + } + var user model.User + res = h.db.First(&user, order.UserId) + if res.Error != nil { + logger.Error(res.Error) + c.String(http.StatusOK, "fail") + return + } + var remark types.OrderRemark + err = utils.JsonDecode(order.Remark, &remark) + if err != nil { + logger.Error(res.Error) + c.String(http.StatusOK, "fail") + return + } + // 1. 点卡：days == 0, calls > 0 + // 2. vip 套餐：days > 0, calls == 0 + if remark.Days > 0 { + if user.ExpiredTime > time.Now().Unix() { + user.ExpiredTime = time.Unix(user.ExpiredTime, 0).AddDate(0, 0, remark.Days).Unix() + } else { + user.ExpiredTime = time.Now().AddDate(0, 0, remark.Days).Unix() + } + user.Vip = true + } else if !user.Vip { // 充值点卡的非 VIP 用户 + user.ExpiredTime = time.Now().AddDate(0, 0, 30).Unix() + } + + if remark.Calls > 0 { // 充值点卡 + user.Calls += remark.Calls + } else { + user.Calls += h.App.SysConfig.VipMonthCalls + } + + // 更新用户信息 + res = h.db.Updates(&user) + if res.Error != nil { + logger.Error(res.Error) + c.String(http.StatusOK, "fail") + return + } + + // 更新订单状态 + order.PayTime = time.Now().Unix() + order.Status = types.OrderPaidSuccess + h.db.Updates(&order) + + // 更新产品销量 + h.db.Model(&model.Product{}).Where("id = ?", order.ProductId).UpdateColumn("sales", gorm.Expr("sales + ?", 1)) + + c.String(http.StatusOK, "success") +} diff --git a/api/handler/product_handler.go b/api/handler/product_handler.go new file mode 100644 index 00000000..9bc7988a --- /dev/null +++ b/api/handler/product_handler.go @@ -0,0 +1,44 @@ +package handler + +import ( + "chatplus/core" + "chatplus/store/model" + "chatplus/store/vo" + "chatplus/utils" + "chatplus/utils/resp" + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +type ProductHandler struct { + BaseHandler + db *gorm.DB +} + +func NewProductHandler(app *core.AppServer, db *gorm.DB) *ProductHandler { + h := ProductHandler{db: db} + h.App = app + return &h +} + +// List 模型列表 +func (h *ProductHandler) List(c *gin.Context) { + var items []model.Product + var list = make([]vo.Product, 0) + res := h.db.Where("enabled", true).Order("sort_num ASC").Find(&items) + if res.Error == nil { + for _, item := range items { + var product vo.Product + err := utils.CopyObject(item, &product) + if err == nil { + product.Id = item.Id + product.CreatedAt = item.CreatedAt.Unix() + product.UpdatedAt = item.UpdatedAt.Unix() + list = append(list, product) + } else { + logger.Error(err) + } + } + } + resp.SUCCESS(c, list) +} diff --git a/api/main.go b/api/main.go index 139fedd7..953793eb 100644 --- a/api/main.go +++ b/api/main.go @@ -11,6 +11,7 @@ import ( "chatplus/service/fun" "chatplus/service/mj" "chatplus/service/oss" + "chatplus/service/payment" "chatplus/service/sd" "chatplus/service/wx" "chatplus/store" @@ -96,6 +97,10 @@ func main() { fx.Provide(store.NewLevelDB), fx.Provide(store.NewRedisClient), + fx.Provide(func() embed.FS { + return xdbFS + }), + // 创建 Ip2Region 查询对象 fx.Provide(func() (*xdb.Searcher, error) { file, err := xdbFS.Open("res/ip2region.xdb") @@ -124,6 +129,9 @@ func main() { fx.Provide(handler.NewMidJourneyHandler), fx.Provide(handler.NewChatModelHandler), fx.Provide(handler.NewSdJobHandler), + fx.Provide(handler.NewPaymentHandler), + fx.Provide(handler.NewOrderHandler), + fx.Provide(handler.NewProductHandler), fx.Provide(admin.NewConfigHandler), fx.Provide(admin.NewAdminHandler), @@ -133,6 +141,8 @@ func main() { fx.Provide(admin.NewRewardHandler), fx.Provide(admin.NewDashboardHandler), fx.Provide(admin.NewChatModelHandler), + fx.Provide(admin.NewProductHandler), + fx.Provide(admin.NewOrderHandler), // 创建服务 fx.Provide(service.NewAliYunSmsService), @@ -181,6 +191,16 @@ func main() { }() } }), + + fx.Provide(payment.NewAlipayService), + fx.Provide(service.NewSnowflake), + fx.Provide(service.NewXXLJobExecutor), + fx.Invoke(func(exec *service.XXLJobExecutor) { + go func() { + log.Fatal(exec.Run()) + }() + }), + // 注册路由 fx.Invoke(func(s *core.AppServer, h *handler.ChatRoleHandler) { group := s.Engine.Group("/api/role/") @@ -296,6 +316,34 @@ func main() { group.POST("sort", h.Sort) group.GET("remove", h.Remove) }), + fx.Invoke(func(s *core.AppServer, h *handler.PaymentHandler) { + group := s.Engine.Group("/api/payment/") + group.GET("alipay", h.Alipay) + group.POST("query", h.OrderQuery) + group.POST("alipay/qrcode", h.AlipayQrcode) + group.POST("alipay/notify", h.AlipayNotify) + }), + fx.Invoke(func(s *core.AppServer, h *admin.ProductHandler) { + group := s.Engine.Group("/api/admin/product/") + group.POST("save", h.Save) + group.GET("list", h.List) + group.POST("enable", h.Enable) + group.POST("sort", h.Sort) + group.GET("remove", h.Remove) + }), + fx.Invoke(func(s *core.AppServer, h *admin.OrderHandler) { + group := s.Engine.Group("/api/admin/order/") + group.POST("list", h.List) + group.GET("remove", h.Remove) + }), + fx.Invoke(func(s *core.AppServer, h *handler.OrderHandler) { + group := s.Engine.Group("/api/order/") + group.POST("list", h.List) + }), + fx.Invoke(func(s *core.AppServer, h *handler.ProductHandler) { + group := s.Engine.Group("/api/product/") + group.GET("list", h.List) + }), fx.Invoke(func(s *core.AppServer, db *gorm.DB) { err := s.Run(db) diff --git a/api/service/payment/alipay_service.go b/api/service/payment/alipay_service.go new file mode 100644 index 00000000..64ab8aa3 --- /dev/null +++ b/api/service/payment/alipay_service.go @@ -0,0 +1,142 @@ +package payment + +import ( + "chatplus/core/types" + logger2 "chatplus/logger" + "fmt" + "github.com/smartwalle/alipay/v3" + "log" + "net/url" + "os" +) + +type AlipayService struct { + config *types.AlipayConfig + client *alipay.Client +} + +var logger = logger2.GetLogger() + +func NewAlipayService(appConfig *types.AppConfig) (*AlipayService, error) { + config := appConfig.AlipayConfig + if !config.Enabled { + logger.Info("Disabled alipay service") + return nil, nil + } + priKey, err := readKey(config.PrivateKey) + if err != nil { + return nil, err + } + + xClient, err := alipay.New(config.AppId, priKey, true) + if err != nil { + return nil, fmt.Errorf("error with initialize alipay service: %v", err) + } + + if err = xClient.LoadAppCertPublicKeyFromFile(config.PublicKey); err != nil { + return nil, fmt.Errorf("error with loading alipay CertPublicKey: %v", err) + } + if err = xClient.LoadAliPayRootCertFromFile(config.RootCert); err != nil { + return nil, fmt.Errorf("error with loading alipay RootCert: %v", err) + } + if err = xClient.LoadAlipayCertPublicKeyFromFile(config.AlipayPublicKey); err != nil { + return nil, fmt.Errorf("error with loading alipay AlipayCertPublicKey: %v", err) + } + + return &AlipayService{config: &config, client: xClient}, nil +} + +func (s *AlipayService) PayUrlMobile(outTradeNo string, notifyURL string, returnURL string, Amount string, subject string) (string, error) { + var p = alipay.TradeWapPay{} + p.NotifyURL = notifyURL + p.ReturnURL = returnURL + p.Subject = subject + p.OutTradeNo = outTradeNo + p.TotalAmount = Amount + p.ProductCode = "QUICK_WAP_WAY" + res, err := s.client.TradeWapPay(p) + if err != nil { + return "", err + } + + return res.String(), err +} + +func (s *AlipayService) PayUrlPc(outTradeNo string, notifyURL string, returnURL string, amount string, subject string) (string, error) { + var p = alipay.TradePagePay{} + p.NotifyURL = notifyURL + p.ReturnURL = returnURL + p.Subject = subject + p.OutTradeNo = outTradeNo + p.TotalAmount = amount + p.ProductCode = "FAST_INSTANT_TRADE_PAY" + res, err := s.client.TradePagePay(p) + if err != nil { + return "", nil + } + + return res.String(), err +} + +// TradeVerify 交易验证 +func (s *AlipayService) TradeVerify(reqForm url.Values) NotifyVo { + err := s.client.VerifySign(reqForm) + if err != nil { + log.Println("异步通知验证签名发生错误", err) + return NotifyVo{ + Status: 0, + Message: "异步通知验证签名发生错误", + } + } + + return s.TradeQuery(reqForm.Get("out_trade_no")) +} + +func (s *AlipayService) TradeQuery(outTradeNo string) NotifyVo { + var p = alipay.TradeQuery{} + p.OutTradeNo = outTradeNo + rsp, err := s.client.TradeQuery(p) + if err != nil { + return NotifyVo{ + Status: 0, + Message: "异步查询验证订单信息发生错误" + outTradeNo + err.Error(), + } + } + + if rsp.IsSuccess() == true && rsp.TradeStatus == "TRADE_SUCCESS" { + return NotifyVo{ + Status: 1, + OutTradeNo: rsp.OutTradeNo, + TradeNo: rsp.TradeNo, + Amount: rsp.TotalAmount, + Subject: rsp.Subject, + Message: "OK", + } + } else { + return NotifyVo{ + Status: 0, + Message: "异步查询验证订单信息发生错误" + outTradeNo, + } + } +} + +func readKey(filename string) (string, error) { + data, err := os.ReadFile(filename) + if err != nil { + return "", err + } + return string(data), nil +} + +type NotifyVo struct { + Status int + OutTradeNo string + TradeNo string + Amount string + Message string + Subject string +} + +func (v NotifyVo) Success() bool { + return v.Status == 1 +} diff --git a/api/service/snowflake.go b/api/service/snowflake.go new file mode 100644 index 00000000..66416bef --- /dev/null +++ b/api/service/snowflake.go @@ -0,0 +1,56 @@ +package service + +import ( + "fmt" + "sync" + "time" +) + +// Snowflake 雪花算法实现 +type Snowflake struct { + mu sync.Mutex + lastTimestamp int64 + workerID int + sequence int +} + +func NewSnowflake() *Snowflake { + return &Snowflake{ + lastTimestamp: -1, + workerID: 0, // TODO: 增加 WorkID 参数 + sequence: 0, + } +} + +// Next 生成一个新的唯一ID +func (s *Snowflake) Next() (string, error) { + s.mu.Lock() + defer s.mu.Unlock() + + timestamp := time.Now().UnixNano() / 1000000 // 转换为毫秒 + if timestamp < s.lastTimestamp { + return "", fmt.Errorf("clock moved backwards. Refusing to generate id for %d milliseconds", s.lastTimestamp-timestamp) + } + + if timestamp == s.lastTimestamp { + s.sequence = (s.sequence + 1) & 4095 + if s.sequence == 0 { + timestamp = s.waitNextMillis() + } + } else { + s.sequence = 0 + } + + s.lastTimestamp = timestamp + id := (timestamp << 22) | (int64(s.workerID) << 10) | int64(s.sequence) + now := time.Now() + return fmt.Sprintf("%d%02d%02d%d", now.Year(), now.Month(), now.Day(), id), nil +} + +func (s *Snowflake) waitNextMillis() int64 { + timestamp := time.Now().UnixNano() / 1000000 + for timestamp <= s.lastTimestamp { + timestamp = time.Now().UnixNano() / 1000000 + } + return timestamp +} diff --git a/api/service/xxl_job_service.go b/api/service/xxl_job_service.go new file mode 100644 index 00000000..1822429b --- /dev/null +++ b/api/service/xxl_job_service.go @@ -0,0 +1,123 @@ +package service + +import ( + "chatplus/core/types" + logger2 "chatplus/logger" + "chatplus/store/model" + "chatplus/utils" + "context" + "fmt" + "github.com/xxl-job/xxl-job-executor-go" + "gorm.io/gorm" + "time" +) + +var logger = logger2.GetLogger() + +type XXLJobExecutor struct { + executor xxl.Executor + db *gorm.DB +} + +func NewXXLJobExecutor(config *types.AppConfig, db *gorm.DB) *XXLJobExecutor { + exec := xxl.NewExecutor( + xxl.ServerAddr(config.XXLConfig.ServerAddr), + xxl.AccessToken(config.XXLConfig.AccessToken), //请求令牌(默认为空) + xxl.ExecutorIp(config.XXLConfig.ExecutorIp), //可自动获取 + xxl.ExecutorPort(config.XXLConfig.ExecutorPort), //默认9999（非必填） + xxl.RegistryKey(config.XXLConfig.RegistryKey), //执行器名称 + xxl.SetLogger(&customLogger{}), //自定义日志 + ) + exec.Init() + return &XXLJobExecutor{executor: exec, db: db} +} + +func (e *XXLJobExecutor) Run() error { + e.executor.RegTask("ClearOrder", e.ClearOrder) + e.executor.RegTask("ResetVipCalls", e.ResetVipCalls) + return e.executor.Run() +} + +// ClearOrder 清理未支付的订单，如果没有抛出异常则表示执行成功 +func (e *XXLJobExecutor) ClearOrder(cxt context.Context, param *xxl.RunReq) (msg string) { + timeout := time.Now().Unix() - 600 + start := utils.Stamp2str(timeout) + res := e.db.Where("status != ? AND created_at < ?", types.OrderPaidSuccess, start).Delete(&model.Order{}) + return fmt.Sprintf("Clear order successfully, affect rows: %d", res.RowsAffected) +} + +// ResetVipCalls 清理过期的 VIP 会员 +func (e *XXLJobExecutor) ResetVipCalls(cxt context.Context, param *xxl.RunReq) (msg string) { + logger.Info("开始进行月底账号盘点...") + var users []model.User + res := e.db.Where("vip = ?", 1).Find(&users) + if res.Error != nil { + return "No vip users found" + } + + var sysConfig model.Config + res = e.db.Where("marker", "system").First(&sysConfig) + if res.Error != nil { + panic(res.Error) + } + + var config types.SystemConfig + err := utils.JsonDecode(sysConfig.Config, &config) + if err != nil { + panic(err) + } + + // 获取本月月初时间 + currentTime := time.Now() + year, month, _ := currentTime.Date() + firstOfMonth := time.Date(year, month, 1, 0, 0, 0, 0, currentTime.Location()).Unix() + for _, u := range users { + // 账号到期，直接清零 + if u.ExpiredTime <= currentTime.Unix() { + logger.Info("账号过期：", u.Mobile) + u.Calls = 0 + u.Vip = false + } else { + if u.Calls <= 0 { + u.Calls = config.VipMonthCalls + } else { + // 如果该用户当月有充值点卡，则将点卡中未用完的点数结余到下个月 + var orders []model.Order + e.db.Debug().Where("user_id = ? AND pay_time > ?", u.Id, firstOfMonth).Find(&orders) + var calls = 0 + for _, o := range orders { + var remark types.OrderRemark + err = utils.JsonDecode(o.Remark, &remark) + if err != nil { + continue + } + if remark.Days > 0 { // 会员续费 + continue + } + calls += remark.Calls + } + if u.Calls > calls { // 本月套餐没有用完 + u.Calls = calls + config.VipMonthCalls + } else { + u.Calls = u.Calls + config.VipMonthCalls + } + logger.Infof("%s 点卡结余：%d", u.Mobile, calls) + } + } + u.Tokens = 0 + // update user + e.db.Updates(&u) + } + logger.Info("月底盘点完成！") + return "success" +} + +type customLogger struct{} + +func (l *customLogger) Info(format string, a ...interface{}) { + logger.Debug(format, a) +} + +func (l *customLogger) Error(format string, a ...interface{}) { + logger.Error(format, a) +} diff --git a/api/store/model/order.go b/api/store/model/order.go new file mode 100644 index 00000000..65d5580f --- /dev/null +++ b/api/store/model/order.go @@ -0,0 +1,21 @@ +package model + +import ( + "chatplus/core/types" + "gorm.io/gorm" +) + +// Order 充值订单 +type Order struct { + BaseModel + UserId uint + ProductId uint + Mobile string + OrderNo string + Subject string + Amount float64 + Status types.OrderStatus + Remark string + PayTime int64 + DeletedAt gorm.DeletedAt +} diff --git a/api/store/model/product.go b/api/store/model/product.go new file mode 100644 index 00000000..040f715a --- /dev/null +++ b/api/store/model/product.go @@ -0,0 +1,14 @@ +package model + +// Product 充值产品 +type Product struct { + BaseModel + Name string + Price float64 + Discount float64 + Days int + Calls int + Enabled bool + Sales int + SortNum int +} diff --git a/api/store/model/user.go b/api/store/model/user.go index ccbf6442..ab35a748 100644 --- a/api/store/model/user.go +++ b/api/store/model/user.go @@ -16,4 +16,6 @@ type User struct { Status bool `gorm:"default:true"` // 当前状态 LastLoginAt int64 // 最后登录时间 LastLoginIp string // 最后登录 IP + Vip bool // 是否 VIP 会员 + Tokens int } diff --git a/api/store/vo/order.go b/api/store/vo/order.go new file mode 100644 index 00000000..f7d6bc3c --- /dev/null +++ b/api/store/vo/order.go @@ -0,0 +1,18 @@ +package vo + +import ( + "chatplus/core/types" +) + +type Order struct { + BaseVo + UserId uint `json:"user_id"` + ProductId uint `json:"product_id"` + Mobile string `json:"mobile"` + OrderNo string `json:"order_no"` + Subject string `json:"subject"` + Amount float64 `json:"amount"` + Status types.OrderStatus `json:"status"` + PayTime int64 `json:"pay_time"` + Remark types.OrderRemark `json:"remark"` +} diff --git a/api/store/vo/product.go b/api/store/vo/product.go new file mode 100644 index 00000000..b0a867d3 --- /dev/null +++ b/api/store/vo/product.go @@ -0,0 +1,13 @@ +package vo + +type Product struct { + BaseVo + Name string `json:"name"` + Price float64 `json:"price"` + Discount float64 `json:"discount"` + Days int `json:"days"` + Calls int `json:"calls"` + Enabled bool `json:"enabled"` + Sales int `json:"sales"` + SortNum int `json:"sort_num"` +} diff --git a/api/store/vo/user.go b/api/store/vo/user.go index 8c291a96..05f413b9 100644 --- a/api/store/vo/user.go +++ b/api/store/vo/user.go @@ -17,4 +17,6 @@ type User struct { Status bool `json:"status"` // 当前状态 LastLoginAt int64 `json:"last_login_at"` // 最后登录时间 LastLoginIp string `json:"last_login_ip"` // 最后登录 IP + Vip bool `json:"vip"` + Tokens int `json:"token"` // 当月消耗的 fee } diff --git a/api/utils/common.go b/api/utils/common.go index 5147d470..748dbc8c 100644 --- a/api/utils/common.go +++ b/api/utils/common.go @@ -1,8 +1,16 @@ package utils import ( + "bytes" "encoding/json" "fmt" + "github.com/nfnt/resize" + "github.com/skip2/go-qrcode" + "image" + "image/color" + "image/draw" + "image/jpeg" + "io" "reflect" "strconv" "strings" @@ -150,3 +158,47 @@ func ForceCovert(src any, dst interface{}) error { } return nil } + +func GenQrcode(text string, size int, logo io.Reader) ([]byte, error) { + qr, err := qrcode.New(text, qrcode.Medium) + if err != nil { + return nil, err + } + + qr.BackgroundColor = color.White + qr.ForegroundColor = color.Black + if logo == nil { + return qr.PNG(size) + } + + // 生成带Logo的二维码图像 + logoImage, _, err := image.Decode(logo) + if err != nil { + return nil, err + } + + // 缩放 Logo + scaledLogo := resize.Resize(uint(size/9), uint(size/9), logoImage, resize.Lanczos3) + // 将Logo叠加到二维码图像上 + qrWithLogo := overlayLogo(qr.Image(size), scaledLogo) + + // 将带Logo的二维码图像以JPEG格式编码为图片数据 + var buf bytes.Buffer + err = jpeg.Encode(&buf, qrWithLogo, nil) + if err != nil { + return nil, err + } + return buf.Bytes(), nil +} + +// 叠加Logo到图片上 +func overlayLogo(qrImage, logoImage image.Image) image.Image { + offsetX := (qrImage.Bounds().Dx() - logoImage.Bounds().Dx()) / 2 + offsetY := (qrImage.Bounds().Dy() - logoImage.Bounds().Dy()) / 2 + + combinedImage := image.NewRGBA(qrImage.Bounds()) + draw.Draw(combinedImage, qrImage.Bounds(), qrImage, image.Point{}, draw.Over) + draw.Draw(combinedImage, logoImage.Bounds().Add(image.Pt(offsetX, offsetY)), logoImage, image.Point{}, draw.Over) + + return combinedImage +} diff --git a/database/update-v3.1.8.sql b/database/update-v3.1.8.sql new file mode 100644 index 00000000..fbdbf498 --- /dev/null +++ b/database/update-v3.1.8.sql @@ -0,0 +1,60 @@ +ALTER TABLE `chatgpt_users` ADD `vip` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '是否会员' AFTER `last_login_at`; +ALTER TABLE `chatgpt_users` ADD `tokens` BIGINT NOT NULL DEFAULT '0' COMMENT '当月消耗 tokens' AFTER `total_tokens`; + +CREATE TABLE `chatgpt_orders` ( + `id` int NOT NULL, + `user_id` int NOT NULL COMMENT '用户ID', + `product_id` int NOT NULL COMMENT '产品ID', + `mobile` char(11) NOT NULL COMMENT '用户手机号', + `order_no` varchar(30) NOT NULL COMMENT '订单ID', + `subject` varchar(100) NOT NULL COMMENT '订单产品', + `amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '订单金额', + `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '订单状态（0：待支付，1：已扫码，2：支付失败）', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '备注', + `pay_time` int DEFAULT NULL COMMENT '支付时间', + `created_at` datetime NOT NULL, + `updated_at` datetime NOT NULL, + `deleted_at` datetime DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='充值订单表'; + +-- +-- 转存表中的数据 `chatgpt_orders` +-- +INSERT INTO `chatgpt_orders` (`id`, `user_id`, `product_id`, `mobile`, `order_no`, `subject`, `amount`, `status`, `remark`, `pay_time`, `created_at`, `updated_at`, `deleted_at`) VALUES + (4, 4, 1, '18575670125', '202308317102915300416290816', '会员1个月', '0.01', 2, '{\"days\":30,\"calls\":500,\"name\":\"会员1个月\",\"discount\":10.99}', 1693466990, '2023-08-31 15:29:33', '2023-08-31 15:29:51', NULL), + (5, 4, 5, '18575670125', '202308317102946758199607296', '100次点卡', '0.30', 2, '{\"days\":0,\"calls\":100,\"name\":\"100次点卡\"}', 1693466990, '2023-08-31 17:34:34', '2023-08-31 17:34:34', NULL), + (6, 4, 5, '18575670125', '202308317102946843595636736', '100次点卡', '0.03', 2, '{\"days\":0,\"calls\":100,\"name\":\"100次点卡\"}', 1693474722, '2023-08-31 17:34:54', '2023-08-31 17:38:43', NULL), + (7, 4, 1, '18575670125', '202309017103252664456052736', '会员1个月', '0.01', 2, '{\"days\":30,\"calls\":0,\"name\":\"会员1个月\"}', 1693466990, '2023-09-01 13:50:07', '2023-09-01 13:50:07', NULL), + (8, 4, 1, '18575670125', '202309017103252894391992320', '会员1个月', '0.01', 2, '{\"days\":30,\"calls\":0,\"name\":\"会员1个月\"}', 1693466990, '2023-09-01 13:51:02', '2023-09-01 13:51:02', NULL), + (9, 4, 5, '18575670125', '202309017103254657538981888', '100次点卡', '0.03', 2, '{\"days\":0,\"calls\":100,\"name\":\"100次点卡\"}', 1693474722, '2023-09-01 13:58:02', '2023-09-01 13:58:02', NULL), + (10, 4, 1, '18575670125', '202309017103259375405367296', '会员1个月', '0.01', 2, '{\"days\":30,\"calls\":0,\"name\":\"会员1个月\"}', 1693474722, '2023-09-01 14:16:47', '2023-09-01 14:16:47', NULL), + (11, 4, 3, '18575670125', '202309017103290730432430080', '会员6个月', '190.00', 2, '{\"days\":180,\"calls\":0,\"name\":\"会员6个月\",\"price\":290,\"discount\":100}', 1693474722, '2023-09-01 16:21:23', '2023-09-01 16:21:23', NULL), + (12, 4, 4, '18575670125', '202309017103291707520712704', '会员12个月', '380.00', 2, '{\"days\":365,\"calls\":0,\"name\":\"会员12个月\",\"price\":580,\"discount\":200}', 1693466990, '2023-09-01 16:25:16', '2023-09-01 16:25:16', NULL); + +-- 创建索引 +ALTER TABLE `chatgpt_orders` ADD PRIMARY KEY (`id`), ADD UNIQUE KEY `order_no` (`order_no`); +ALTER TABLE `chatgpt_orders` MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13; + +CREATE TABLE `chatgpt_products` ( + `id` int NOT NULL, + `name` varchar(30) NOT NULL COMMENT '名称', + `price` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '价格', + `discount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '优惠金额', + `days` smallint NOT NULL DEFAULT '0' COMMENT '延长天数', + `calls` int NOT NULL DEFAULT '0' COMMENT '调用次数', + `enabled` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否启动', + `sales` int NOT NULL DEFAULT '0' COMMENT '销量', + `sort_num` tinyint NOT NULL DEFAULT '0' COMMENT '排序', + `created_at` datetime NOT NULL, + `updated_at` datetime NOT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='会员套餐表'; + +INSERT INTO `chatgpt_products` (`id`, `name`, `price`, `discount`, `days`, `calls`, `enabled`, `sales`, `sort_num`, `created_at`, `updated_at`) VALUES +(1, '会员1个月', '1.01', '1.00', 30, 0, 1, 0, 0, '2023-08-28 10:48:57', '2023-08-31 16:24:26'), +(2, '会员3个月', '140.00', '30.00', 90, 0, 1, 0, 0, '2023-08-28 10:52:22', '2023-08-31 16:24:31'), +(3, '会员6个月', '290.00', '100.00', 180, 0, 1, 0, 0, '2023-08-28 10:53:39', '2023-08-31 16:24:36'), +(4, '会员12个月', '580.00', '200.00', 365, 0, 1, 0, 0, '2023-08-28 10:54:15', '2023-08-31 16:24:42'), +(5, '100次点卡', '10.03', '10.00', 0, 100, 1, 0, 0, '2023-08-28 10:55:08', '2023-08-31 17:34:43'); + +ALTER TABLE `chatgpt_products` ADD PRIMARY KEY (`id`); +ALTER TABLE `chatgpt_products` MODIFY `id` int NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6; \ No newline at end of file diff --git a/web/src/components/admin/AdminSidebar.vue b/web/src/components/admin/AdminSidebar.vue index e8eaa26e..cbd2c5e5 100644 --- a/web/src/components/admin/AdminSidebar.vue +++ b/web/src/components/admin/AdminSidebar.vue @@ -96,6 +96,16 @@ const items = [ index: '/admin/chat/model', title: '语言模型', }, + { + icon: 'recharge', + index: '/admin/product', + title: '充值产品', + }, + { + icon: 'order', + index: '/admin/order', + title: '充值订单', + }, { icon: 'reward', index: '/admin/reward', diff --git a/web/src/router.js b/web/src/router.js index b21f0129..6b4ec273 100644 --- a/web/src/router.js +++ b/web/src/router.js @@ -126,6 +126,18 @@ const routes = [ meta: {title: '语言模型'}, component: () => import('@/views/admin/ChatModel.vue'), }, + { + path: '/admin/product', + name: 'admin-product', + meta: {title: '充值产品'}, + component: () => import('@/views/admin/Product.vue'), + }, + { + path: '/admin/order', + name: 'admin-order', + meta: {title: '充值订单'}, + component: () => import('@/views/admin/Order.vue'), + }, { path: '/admin/reward', name: 'admin-reward', diff --git a/web/src/views/admin/Order.vue b/web/src/views/admin/Order.vue new file mode 100644 index 00000000..a7c86e7e --- /dev/null +++ b/web/src/views/admin/Order.vue @@ -0,0 +1,139 @@ + + + + + \ No newline at end of file diff --git a/web/src/views/admin/Product.vue b/web/src/views/admin/Product.vue new file mode 100644 index 00000000..0543a7a1 --- /dev/null +++ b/web/src/views/admin/Product.vue @@ -0,0 +1,226 @@ + + + + + \ No newline at end of file