BaseSystem
/
PaymentCenter
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

init

This commit is contained in:
wolter 2024-05-06 18:30:29 +08:00
parent bfe5bfb9a8
commit e2efa4bfcd
15 changed files with 269 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
app/http/controllers/backend/product.go
View File

@ -1,11 +1,13 @@
package backend
import (
"github.com/ahmetb/go-linq/v3"
"github.com/gin-gonic/gin"
"github.com/qit-team/snow-core/log/logger"
"qteam/app/constants/errorcode"
"qteam/app/http/controllers"
"qteam/app/http/controllers/backend/view_model"
"qteam/app/http/domains"
"qteam/app/http/entities/backend"
"qteam/app/services"
)
@ -17,7 +19,7 @@ func ProductCreateHandler(c *gin.Context) {
logger.Error(c.Request.Context(), "req不存在")
return
}
in, ok := req.(view_model.ProductCreateRequest)
in, ok := req.(*backend.ProductCreateRequest)
if !ok {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), "req不匹配")
@ -27,8 +29,81 @@ func ProductCreateHandler(c *gin.Context) {
do, _ := in.ToDomain()
if err := services.ProductCreate(do); err != nil {
controllers.Error(c, errorcode.SystemError)
logger.Error(c.Request.Context(), err.Error())
} else {
controllers.Success(c, "", "product create success")
}
}
func ProductUpdateHandler(c *gin.Context) {
req, exists := c.Get("request")
if !exists {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), "req不存在")
return
}
in, ok := req.(backend.ProductCreateRequest)
if !ok {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), "req不匹配")
return
}
do, _ := in.ToDomain()
if err := services.ProductUpdate(do); err != nil {
controllers.Error(c, errorcode.SystemError)
logger.Error(c.Request.Context(), err.Error())
} else {
controllers.Success(c, errorcode.Success, "product create success")
}
}
func ProductDeleteHandler(c *gin.Context) {
req, exists := c.Get("request")
if !exists {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), "req不存在")
return
}
in, ok := req.(backend.ProductCreateRequest)
if !ok {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), "req不匹配")
return
}
do, _ := in.ToDomain()
if err := services.ProductDelete(do); err != nil {
controllers.Error(c, errorcode.SystemError)
logger.Error(c.Request.Context(), err.Error())
} else {
controllers.Success(c, errorcode.Success, "product create success")
}
}
func ProductQueryHandler(c *gin.Context) {
//page := c.Param("page")
params := domains.ProductFilter{}
err := c.Bind(&params)
if err != nil {
controllers.Error(c, errorcode.ParamError)
logger.Error(c.Request.Context(), err.Error())
}
data, count, err := services.ProductQuery(params)
rsp := make([]backend.ProductCreateResponse, len(data))
linq.From(data).SelectT(func(do domains.Product) (rs backend.ProductCreateResponse) {
rs.FromDomain(do)
return rs
}).ToSlice(&rsp)
if err != nil {
controllers.Error(c, errorcode.SystemError)
logger.Error(c.Request.Context(), err.Error())
} else {
controllers.Success(c, gin.H{"data": rsp, "count": count}, "")
}
}

35
app/http/controllers/backend/view_model/product.go
View File

@ -1,35 +0,0 @@
package view_model
import "qteam/app/http/domains"
type ProductCreateRequest struct {
ProductName string `json:"product_name"`
ProductType int `json:"product_type"`
PacketRule int `json:"packet_rule"`
ProductKind int `json:"'product_kind'"`
Amount string `json:"'amount'"`
CouponType int `json:"'coupon_type'"`
IsSuperposition int `json:"'is_superposition' "`
TemplateId int `json:"'template_id'"`
Status int `json:"status"`
IsNeedBill int `json:"'is_need_bill'"`
//CreateTime string `json:"'create_time'"`
SupplierProductId int64 `json:"supplier_product_id"`
SupplierProductName string `json:"supplier_product_name"`
}
func (p *ProductCreateRequest) ToDomain() (do domains.Product, err error) {
do.ProductName = p.ProductName
do.ProductType = p.ProductType
do.PacketRule = p.PacketRule
do.ProductKind = p.ProductKind
do.Amount = p.Amount
do.CouponType = p.CouponType
do.IsSuperposition = p.IsSuperposition
do.TemplateId = do.TemplateId
do.Status = p.Status
do.SupplierProductId = p.SupplierProductId
do.SupplierProductName = p.SupplierProductName
return
}

6
app/http/domains/filter.go
View File

@ -4,3 +4,9 @@ type Filter struct {
Page int `json:"page"`
PageSize int `json:"page_size"`
}
type ProductFilter struct {
Page int `json:"page" form:"page"`
PageSize int `json:"page_size" form:"page_size"`
ProductName string `json:"product_name" form:"product_name"`
}

3
app/http/domains/product.go
View File

@ -17,4 +17,7 @@ type Product struct {
CreateTime time.Time
SupplierProductId int64
SupplierProductName string
Creator string
UpdateTime time.Time
}

71
app/http/entities/backend/product.go Normal file
View File

@ -0,0 +1,71 @@
package backend
import (
"qteam/app/http/domains"
"time"
)
type ProductCreateRequest struct {
ProductName string `json:"product_name" validate:"required" example:"snow"`
ProductType int `json:"product_type" validate:"required,oneof=1 2 3" example:"1"` // 产品类型（1/优惠券类，2/组合礼包类，3/商城积分类）
PacketRule int `json:"packet_rule"`
ProductKind int `json:"'product_kind'"`
Amount string `json:"'amount'"`
CouponType int `json:"'coupon_type'"`
IsSuperposition int `json:"'is_superposition'"`
TemplateId int `json:"'template_id'"`
Status int `json:"status"`
IsNeedBill int `json:"'is_need_bill'"`
SupplierProductId int64 `json:"supplier_product_id"`
SupplierProductName string `json:"supplier_product_name"`
}
func (p *ProductCreateRequest) ToDomain() (do domains.Product, err error) {
do.ProductName = p.ProductName
do.ProductType = p.ProductType
do.PacketRule = p.PacketRule
do.ProductKind = p.ProductKind
do.Amount = p.Amount
do.CouponType = p.CouponType
do.IsSuperposition = p.IsSuperposition
do.TemplateId = do.TemplateId
do.Status = p.Status
do.SupplierProductId = p.SupplierProductId
do.SupplierProductName = p.SupplierProductName
return
}
type ProductCreateResponse struct {
Id int `json:"id"`
ProductName string `json:"product_name"`
ProductType int `json:"product_type"`
PacketRule int `json:"packet_rule"`
ProductKind int `json:"'product_kind'"`
Amount string `json:"'amount'"`
CouponType int `json:"'coupon_type'"`
IsSuperposition int `json:"'is_superposition'"`
TemplateId int `json:"'template_id'"`
Status int `json:"status"`
IsNeedBill int `json:"'is_need_bill'"`
SupplierProductId int64 `json:"supplier_product_id"`
SupplierProductName string `json:"supplier_product_name"`
CreateTime string `json:"create_time"`
UpdateTime string `json:"update_time"`
Creator string `json:"creator"`
}
func (p *ProductCreateResponse) FromDomain(do domains.Product) {
p.ProductName = do.ProductName
p.ProductType = do.ProductType
p.PacketRule = do.PacketRule
p.ProductKind = do.ProductKind
p.Amount = do.Amount
p.CouponType = do.CouponType
p.IsSuperposition = do.IsSuperposition
p.TemplateId = do.TemplateId
p.Status = do.Status
p.SupplierProductId = do.SupplierProductId
p.SupplierProductName = do.SupplierProductName
p.CreateTime = do.CreateTime.Format(time.DateTime)
}

8
app/http/middlewares/base.go
View File

@ -54,12 +54,14 @@ func ValidateRequest() gin.HandlerFunc {
utils.Log(c, "path", path)
controllers.HandCodeRes(c, nil, errorcode.NotFound)
} else {
err := controllers.GenRequest(c, handler())
value := handler()
err := controllers.GenRequest(c, value)
if err != nil {
utils.Log(c, "path", path)
controllers.HandCodeRes(c, nil, errorcode.ParamError)
controllers.Error(c, errorcode.ParamError, err.Error())
//controllers.HandCodeRes(c, nil, errorcode.ParamError)
} else {
c.Set("request", handler())
c.Set("request", value)
c.Next()
}

10
app/http/requestmapping/backend.go
View File

@ -1,9 +1,13 @@
package requestmapping
import "qteam/app/http/entities/front"
import (
"qteam/app/http/entities/backend"
)
var BackendRequestMap = map[string]func() interface{}{
"/v1/login": func() interface{} {
return new(front.LoginRequest)
"/admin/api/v1/product/create": func() interface{} {
return new(backend.ProductCreateRequest)
},
//"/admin/api/v1/product/query": func() interface{} { return new(domains.ProductFilter) },
}

15
app/http/routes/admin.go
View File

@ -27,10 +27,13 @@ func RegisterAdminRoute(router *gin.Engine) {
//api.GET("/banner_list", controllers.GetBannerList)
}
v1 := router.Group("/backend/v1", middlewares.ValidateRequest())
products := v1.Group("/products", backend.ProductCreateHandler)
products.POST("/create")
products.GET("/query")
products.PUT("/update")
products.DELETE("/delete")
v1 := router.Group("/admin/api/v1")
{
products := v1.Group("/product")
products.POST("/create", middlewares.ValidateRequest(), backend.ProductCreateHandler)
products.GET("/query", backend.ProductQueryHandler)
products.PUT("/update", middlewares.ValidateRequest(), backend.ProductUpdateHandler)
products.DELETE("/delete", backend.ProductDeleteHandler)
}
}

8
app/models/base.go
View File

@ -1,9 +1,17 @@
package models
import (
"time"
"xorm.io/xorm"
)
type CommonFields struct {
Creator string `xorm:"creator"`
CreateTime time.Time `xorm:"CreateTime created"`
UpdateTime time.Time `xorm:"UpdateTime updated"`
Deleted time.Time `xorm:"'deleted'"`
}
func GetListByPage(page int, pageSize int, where []map[string]interface{}, db xorm.EngineGroup) (count int64, data []interface{}, err error) {
db.ShowSQL(true)
var rs []interface{}

4
app/models/productsmodel/domain.go
View File

@ -13,7 +13,7 @@ func (p *Products) FromDomain(do domains.Product) {
p.Issuperposition = do.IsSuperposition
p.Status = do.Status
p.Isneedbill = do.TemplateId
p.Createtime = do.CreateTime
p.CreateTime = do.CreateTime
p.Supplierproductname = do.SupplierProductName
p.Supplierproductid = do.SupplierProductId
}
@ -29,7 +29,7 @@ func (p *Products) ToDomain() (do domains.Product) {
do.IsSuperposition = p.Issuperposition
do.Status = p.Status
do.TemplateId = p.Isneedbill
do.CreateTime = p.Createtime
do.CreateTime = p.CreateTime
do.SupplierProductName = p.Supplierproductname
do.SupplierProductId = p.Supplierproductid
return

31
app/models/productsmodel/products.go
View File

@ -2,8 +2,8 @@ package productsmodel
import (
"github.com/qit-team/snow-core/db"
"qteam/app/models"
"sync"
"time"
)
var (
@ -13,20 +13,21 @@ var (
// 实体
type Products struct {
Id int `xorm:"'Id' int(0)"`
Productname string `xorm:"'ProductName' varchar(255)"`
Producttype int `xorm:"'ProductType' int(0)"`
Packetrule int `xorm:"'PacketRule' TINYINT"`
Productkind int `xorm:"'ProductKind' TINYINT"`
Amount string `xorm:"'Amount' decimal(9,2)"`
Coupontype int `xorm:"'CouponType' TINYINT"`
Issuperposition int `xorm:"'IsSuperposition' TINYINT"`
Templateid int `xorm:"'TemplateId' int(0)"`
Status int `xorm:"'Status' TINYINT"`
Isneedbill int `xorm:"'IsNeedBill' TINYINT"`
Createtime time.Time `xorm:"'CreateTime' datetime"`
Supplierproductid int64 `xorm:"'SupplierProductId' bigint(0)"`
Supplierproductname string `xorm:"'SupplierProductName' varchar(255)"`
Id int `xorm:"'Id' int(0)"`
Productname string `xorm:"'ProductName' varchar(255)"`
Producttype int `xorm:"'ProductType' int(0)"`
Packetrule int `xorm:"'PacketRule' TINYINT"`
Productkind int `xorm:"'ProductKind' TINYINT"`
Amount string `xorm:"'Amount' decimal(9,2)"`
Coupontype int `xorm:"'CouponType' TINYINT"`
Issuperposition int `xorm:"'IsSuperposition' TINYINT"`
Templateid int `xorm:"'TemplateId' int(0)"`
Status int `xorm:"'Status' TINYINT"`
Isneedbill int `xorm:"'IsNeedBill' TINYINT"`
//Createtime time.Time `xorm:"'CreateTime' datetime"`
Supplierproductid int64 `xorm:"'SupplierProductId' bigint(0)"`
Supplierproductname string `xorm:"'SupplierProductName' varchar(255)"`
models.CommonFields `xorm:"extends"`
}
// 表名

57
app/services/product.go
View File

@ -2,8 +2,10 @@ package services
import (
"errors"
"github.com/ahmetb/go-linq/v3"
"qteam/app/http/domains"
"qteam/app/models/productsmodel"
"xorm.io/builder"
)
func ProductCreate(do domains.Product) (err error) {
@ -19,3 +21,58 @@ func ProductCreate(do domains.Product) (err error) {
return
}
func ProductUpdate(do domains.Product) (err error) {
m := productsmodel.Products{}
m.FromDomain(do)
count, err := productsmodel.GetInstance().Update(m.Id, m)
if err != nil {
return
}
if count == 0 {
err = errors.New("product update fail")
}
return
}
func ProductDelete(do domains.Product) (err error) {
m := productsmodel.Products{}
m.FromDomain(do)
count, err := productsmodel.GetInstance().Delete(m.Id, m)
if err != nil {
return
}
if count == 0 {
err = errors.New("product create fail")
}
return
}
func ProductQuery(filter domains.ProductFilter) (p []domains.Product, count int64, err error) {
repo := productsmodel.GetInstance()
products := []productsmodel.Products{}
conn := builder.NewCond()
if len(filter.ProductName) > 0 {
conn = conn.And(builder.Like{"ProductName", filter.ProductName})
}
session := repo.GetDb().Where(conn)
if filter.Page != 0 && filter.PageSize != 0 {
session = session.Limit(filter.PageSize, (filter.Page-1)*filter.PageSize)
}
count, err = session.FindAndCount(&products)
if err != nil {
return
}
linq.From(products).SelectT(func(in productsmodel.Products) (d domains.Product) {
d = in.ToDomain()
return d
}).ToSlice(&p)
return
}

8
config/option.go
View File

@ -7,7 +7,7 @@ import (
var options *Options
//------------------------启动命令配置
// ------------------------启动命令配置
type Options struct {
ShowVersion bool
Cmd string
@ -21,7 +21,7 @@ type Options struct {
func parseOptions() *Options {
opts := new(Options)
flag.BoolVar(&opts.ShowVersion, "v", false, "show version")
flag.StringVar(&opts.App, "a", "api", "application to run")
flag.StringVar(&opts.App, "a", "admin", "application to run")
flag.StringVar(&opts.Cmd, "k", "", "status|stop|restart")
flag.StringVar(&opts.ConfFile, "c", ".env", "conf file path")
flag.StringVar(&opts.PidDir, "p", "/var/run/", "pid directory")
@ -31,7 +31,7 @@ func parseOptions() *Options {
return opts
}
//获取启动命令配置
// 获取启动命令配置
func GetOptions() *Options {
if options == nil {
options = parseOptions()
@ -39,7 +39,7 @@ func GetOptions() *Options {
return options
}
//pid进程号的保存路径
// pid进程号的保存路径
func (opts *Options) GenPidFile() string {
return strings.TrimRight(opts.PidDir, "/") + "/" + opts.App + ".pid"
}

1
go.mod
View File

@ -27,6 +27,7 @@ require (
github.com/KyleBanks/depth v1.2.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/ahmetb/go-linq/v3 v3.2.0 // indirect
github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
github.com/alibabacloud-go/tea v1.1.17 // indirect
github.com/alibabacloud-go/tea-utils v1.4.4 // indirect

2
go.sum
View File

@ -57,6 +57,8 @@ github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/agiledragon/gomonkey/v2 v2.3.1 h1:k+UnUY0EMNYUFUAQVETGY9uUTxjMdnUkP0ARyJS1zzs=
github.com/agiledragon/gomonkey/v2 v2.3.1/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
github.com/ahmetb/go-linq/v3 v3.2.0 h1:BEuMfp+b59io8g5wYzNoFe9pWPalRklhlhbiU3hYZDE=
github.com/ahmetb/go-linq/v3 v3.2.0/go.mod h1:haQ3JfOeWK8HpVxMtHHEMPVgBKiYyQ+f1/kLZh/cj9U=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=