diff --git a/app/http/controllers/product/product.go b/app/http/controllers/product/product.go index 9367ecc..72acb95 100644 --- a/app/http/controllers/product/product.go +++ b/app/http/controllers/product/product.go @@ -30,12 +30,14 @@ func GetById(c *gin.Context) { if res != nil { response = &proEnt.GetListByIdResp{ - Id: res.Id, - Name: res.Name, - Price: res.Price, - ProductUrl: res.ProductUrl, - Status: res.Status, - CreatedAt: res.CreatedAt.Format(time.RFC3339), + Id: res.Id, + Name: res.Name, + Price: res.Price, + ProductUrl: res.ProductUrl, + Status: res.Status, + CreatedAt: res.CreatedAt.Format(time.RFC3339), + Type: res.Type, + ExtendParameter: res.ExtendParameter, } } @@ -72,12 +74,14 @@ func Search(c *gin.Context) { if len(res) > 0 { for _, item := range res { response = append(response, &proEnt.SearchResp{ - Id: item.Id, - Name: item.Name, - Price: item.Price, - ProductUrl: item.ProductUrl, - Status: item.Status, - CreatedAt: item.CreatedAt.Format(time.RFC3339), + Id: item.Id, + Name: item.Name, + Price: item.Price, + ProductUrl: item.ProductUrl, + Status: item.Status, + CreatedAt: item.CreatedAt.Format(time.RFC3339), + Type: item.Type, + ExtendParameter: item.ExtendParameter, }) } } @@ -105,10 +109,12 @@ func Create(c *gin.Context) { } product := &proMod.Product{ - Name: request.Name, - Price: request.Price, - ProductUrl: request.ProductUrl, - Status: 1, //1.上架 2.下架 + Name: request.Name, + Price: request.Price, + ProductUrl: request.ProductUrl, + Status: 1, //1.上架 2.下架 + Type: request.Type, + ExtendParameter: request.ExtendParameter, } affected, err := proServ.Create(product) @@ -133,10 +139,12 @@ func Update(c *gin.Context) { } product := &proMod.Product{ - Id: request.Id, - Name: request.Name, - ProductUrl: request.ProductUrl, - Price: request.Price, + Id: request.Id, + Name: request.Name, + ProductUrl: request.ProductUrl, + Price: request.Price, + Type: request.Type, + ExtendParameter: request.ExtendParameter, } affected, err := proServ.Update(product) diff --git a/app/http/entities/product/product.go b/app/http/entities/product/product.go index 5b3c687..36b6761 100644 --- a/app/http/entities/product/product.go +++ b/app/http/entities/product/product.go @@ -5,13 +5,14 @@ type GetListByIdReq struct { } type GetListByIdResp struct { - Id int64 `json:"id" example:"1"` - Name string `json:"name" example:"snow"` - Price int64 `json:"price" example:"100"` - ProductUrl string `json:"product_url" example:"http://www.baidu.com"` - Status int64 `json:"status" example:"1"` - CreatedAt string `json:"created_at" example:"2020-01-01 00:00:00"` - Type int64 `json:"type" example:"1"` + Id int64 `json:"id" example:"1"` + Name string `json:"name" example:"snow"` + Price int64 `json:"price" example:"100"` + ProductUrl string `json:"product_url" example:"http://www.baidu.com"` + Status int64 `json:"status" example:"1"` + CreatedAt string `json:"created_at" example:"2020-01-01 00:00:00"` + Type int64 `json:"type" example:"1"` + ExtendParameter string `json:"extend_parameter" example:"{}"` } type SearcgReq struct { @@ -23,20 +24,22 @@ type SearcgReq struct { } type SearchResp struct { - Id int64 `json:"id" example:"1"` - Name string `json:"name" example:"snow"` - Price int64 `json:"price" example:"100"` - ProductUrl string `json:"product_url" example:"http://www.baidu.com"` - Status int64 `json:"status" example:"1"` - CreatedAt string `json:"created_at" example:"2020-01-01 00:00:00"` - Type int64 `json:"type" example:"1"` + Id int64 `json:"id" example:"1"` + Name string `json:"name" example:"snow"` + Price int64 `json:"price" example:"100"` + ProductUrl string `json:"product_url" example:"http://www.baidu.com"` + Status int64 `json:"status" example:"1"` + CreatedAt string `json:"created_at" example:"2020-01-01 00:00:00"` + Type int64 `json:"type" example:"1"` + ExtendParameter string `json:"extend_parameter" example:"{}"` } type CreateReq struct { - Name string `json:"name" validate:"required"` - Price int64 `json:"price" validate:"required"` - ProductUrl string `json:"product_url" validate:"required"` - Type int64 `json:"type" validate:"required"` + Name string `json:"name" validate:"required"` + Price int64 `json:"price" validate:"required"` + ProductUrl string `json:"product_url" validate:"required"` + Type int64 `json:"type" validate:"required"` + ExtendParameter string `json:"extend_parameter"` } type CreateResp struct { @@ -44,10 +47,12 @@ type CreateResp struct { } type UpdateReq struct { - Id int64 `json:"id" validate:"required"` - Name string `json:"name" ` - Price int64 `json:"price" ` - ProductUrl string `json:"product_url" ` + Id int64 `json:"id" validate:"required"` + Name string `json:"name" ` + Price int64 `json:"price" ` + ProductUrl string `json:"product_url" ` + Type int64 `json:"type" ` + ExtendParameter string `json:"extend_parameter"` } type UpdateResp struct { diff --git a/app/models/product/product.go b/app/models/product/product.go index d2a65dc..ea8aa79 100644 --- a/app/models/product/product.go +++ b/app/models/product/product.go @@ -1,7 +1,6 @@ package product import ( - "fmt" "sync" "time" @@ -17,14 +16,15 @@ var ( * Product */ type Product struct { - Id int64 `xorm:"pk autoincr"` //注：使用getOne 或者ID() 需要设置主键 - Name string - Price int64 - ProductUrl string - Status int64 - CreatedAt time.Time `xorm:"created"` + Id int64 `xorm:"pk autoincr"` //注：使用getOne 或者ID() 需要设置主键 + Name string + Price int64 + ProductUrl string + Status int64 + CreatedAt time.Time `xorm:"created"` - Type int64 + Type int64 + ExtendParameter string } /** @@ -84,7 +84,6 @@ func (m *productModel) Search(id int64, name string, startTime string, endTime s args = append(args, startTime, endTime) } err = m.GetDb().Where(sql, args...).OrderBy("created_at desc").Limit(limit, page).Find(&product) - fmt.Println(err) return } diff --git a/app/services/transfersys/transfersys_rdb.go b/app/services/transfersys/transfersys_rdb.go index 5b9e728..0dc63ac 100644 --- a/app/services/transfersys/transfersys_rdb.go +++ b/app/services/transfersys/transfersys_rdb.go @@ -36,12 +36,11 @@ func ReadGroup() (order *models.Orders, err error) { jsonstr := res[key].(string) json.Unmarshal([]byte(jsonstr), &order) - return order, nil } func WriteOrder() { - fmt.Println("开始执行周期任务：getWxTransferStatus") + fmt.Println("开始执行周期任务：WriteOrder") // 创建分组 err := rdbmq.CreateStreamAndGroup("orders", "orders_one") if err != nil && err.Error() != "BUSYGROUP Consumer Group name already exists" { diff --git a/build/sql/db.sql b/build/sql/db.sql index bd8242a..2c015ba 100644 --- a/build/sql/db.sql +++ b/build/sql/db.sql @@ -40,7 +40,8 @@ create table product ( status tinyint, -- 1.上架 2.下架 created_at timestamp default current_timestamp, -- v2 - type tinyint-- 1.拼多多 2.多多进宝 + type tinyint-- 1.拼多多 2.多多进宝 3. 拼多多+多多进宝 + extend_parameter varchar(1024), ); --注意不要链式充值