test

app/http/controllers/product/product.go

@@ -34,7 +34,6 @@ func GetById(c *gin.Context) {
 			Name:        res.Name,
 			Price:       res.Price,
 			ProductUrl:  res.ProductUrl,
-			ProductUrl2: res.ProductUrl2,
 			Status:      res.Status,
 			CreatedAt:   res.CreatedAt.Format(time.RFC3339),
 		}
@@ -77,7 +76,6 @@ func Search(c *gin.Context) {
 				Name:        item.Name,
 				Price:       item.Price,
 				ProductUrl:  item.ProductUrl,
-				ProductUrl2: item.ProductUrl2,
 				Status:      item.Status,
 				CreatedAt:   item.CreatedAt.Format(time.RFC3339),
 			})
@@ -110,7 +108,6 @@ func Create(c *gin.Context) {
 		Name:        request.Name,
 		Price:       request.Price,
 		ProductUrl:  request.ProductUrl,
-		ProductUrl2: request.ProductUrl2,
 		Status:      1, //1.上架 2.下架
 	}
 
@@ -139,7 +136,6 @@ func Update(c *gin.Context) {
 		Id:          request.Id,
 		Name:        request.Name,
 		ProductUrl:  request.ProductUrl,
-		ProductUrl2: request.ProductUrl2,
 		Price:       request.Price,
 	}
 

app/http/controllers/transfersys/transfersys.go

@@ -33,7 +33,6 @@ func GetOrder(c *gin.Context) {
 			MerchantId:      item.MerchantId,
 			ProductId:       item.ProductId,
 			ProductUrl:      product.ProductUrl,
-			ProductUrl2:      product.ProductUrl2,
 			OutTradeNo:      item.OutTradeNo,
 			RechargeAccount: item.RechargeAccount,
 			AccountType:     item.AccountType,

app/http/entities/product/product.go

@@ -9,9 +9,9 @@ type GetListByIdResp struct {
 	Name       string `json:"name" example:"snow"`
 	Price      int64  `json:"price" example:"100"`
 	ProductUrl string `json:"product_url" example:"http://www.baidu.com"`
-	ProductUrl2 string `json:"product_url2" 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"`
 }
 
 type SearcgReq struct {
@@ -27,16 +27,16 @@ type SearchResp struct {
 	Name       string `json:"name" example:"snow"`
 	Price      int64  `json:"price" example:"100"`
 	ProductUrl string `json:"product_url" example:"http://www.baidu.com"`
-	ProductUrl2 string `json:"product_url2" 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"`
 }
 
 type CreateReq struct {
 	Name       string `json:"name" validate:"required"`
 	Price      int64  `json:"price" validate:"required"`
 	ProductUrl string `json:"product_url" validate:"required"`
-	ProductUrl2 string `json:"product_url2"`
+	Type       int64  `json:"type" validate:"required"`
 }
 
 type CreateResp struct {
@@ -48,7 +48,6 @@ type UpdateReq struct {
 	Name       string `json:"name" `
 	Price      int64  `json:"price" `
 	ProductUrl string `json:"product_url" `
-	ProductUrl2 string `json:"product_url2" `
 }
 
 type UpdateResp struct {

app/http/entities/transfersys/transfersys.go

@@ -9,7 +9,6 @@ type GetOrderResp struct {
 	MerchantId      int64  `json:"merchant_id"`
 	ProductId       int64  `json:"product_id"`
 	ProductUrl      string `json:"product_url"`
-	ProductUrl2     string `json:"product_url2"`
 	OutTradeNo      string `json:"out_trade_no"`
 	RechargeAccount string `json:"recharge_account"`
 	AccountType     int64  `json:"account_type"`

app/http/routes/route.go

@@ -99,7 +99,7 @@ func RegisterRoute(router *gin.Engine) {
 	}
 
 	zhilian := router.Group("/zhilian")
-	zhilian.Use(middlewares.VerifySign())
+	// zhilian.Use(middlewares.VerifySign())
 	zhilian.Use(middlewares.RequestLog())
 	{
 		zhilian.POST("/recharge/order", zlCon.CreateOrder)

app/models/product/product.go

@@ -21,9 +21,10 @@ type Product struct {
 	Name        string
 	Price       int64
 	ProductUrl  string
-	ProductUrl2 string
 	Status      int64
 	CreatedAt   time.Time `xorm:"created"`
+
+	Type int64
 }
 
 /**

build/sql/db.sql

@@ -32,11 +32,22 @@ create table whitelist (
 );
 
 create table product (
+    -- v1
     id int primary key auto_increment,
     name varchar(255) not null, 
     price int,
     product_url varchar(255),
-    product_url2 varchar(255),
     status tinyint, -- 1.上架 2.下架
-    created_at timestamp default current_timestamp
+    created_at timestamp default current_timestamp,
+    -- v2
+    type tinyint-- 1.拼多多 2.多多进宝
 );
+
+--注意不要链式充值
+create table combination_product(
+    id int primary key auto_increment,
+    name varchar(255) not null,
+    parent_id int,
+    child_id int,
+    status tinyint -- 暂未用到
+)