收藏传参修复

3dshow/api/collect.go

@@ -16,13 +16,23 @@ func Collect(r *GinRouter) {
 		Collection: repo.CollectionCollect,
 		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 			entity := &model.Collect{}
-			c.ShouldBindJSON(entity)
+			err := c.ShouldBindJSON(entity)
+			if err != nil {
+				return nil, errors.New("参数错误")
+			}
+			if len(entity.SupplyId) < 12 {
+				return nil, errors.New("供应链id错误")
+			}
+			if len(entity.ProductId) < 12 {
+				return nil, errors.New("产品id错误")
+			}
 			entity.CreateTime = time.Now()
 			_userId := apictx.User.ID
 			userId, err := primitive.ObjectIDFromHex(_userId)
 			if err != nil {
 				return nil, errors.New("非法用户")
 			}
+
 			entity.UserId = userId
 			return entity, nil
 		},
@@ -44,6 +54,7 @@ func Collect(r *GinRouter) {
 			query["userId"] = userId
 			return query
 		},
+		SearchProject: []string{""},
 		SearchPostProcess: func(page *repo.PageResult, _ *gin.Context, apictx *ApiSession, _ map[string]interface{}) (interface{}, error) {
 			// 查询组装数据
 			if len(page.List) > 0 {

3dshow/api/product.go

@@ -97,17 +97,19 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	option1 := &repo.PageSearchOptions{
 		CollectName: repo.CollectionCollect,
 		Query:       repo.Map{"userId": userId, "supplyId": supplyId},
-		Project:     []string{"productId"},
+		Project:     []string{"_id", "productId"},
 	}
 	err1 := repo.RepoDocsSearch(apictx.CreateRepoCtx(), option1, &collects)
 
 	if len(pageResult.List) > 0 {
 		for _, v := range pageResult.List {
 			v["isCollect"] = false
+			v["collectId"] = ""
 			if len(collects) > 0 && err1 == nil {
 				for _, col := range collects {
 					if v["_id"].(primitive.ObjectID) == col.ProductId { // productId唯一
 						v["isCollect"] = true
+						v["collectId"] = col.Id.Hex()
 						break
 					}
 				}
@@ -134,7 +136,8 @@ func ProductUpdate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 // 产品信息
 type ProudctDetailRes struct {
 	model.Product
-	IsCollect bool `json:"isCollect"`
+	IsCollect bool   `json:"isCollect"`
+	CollectId string `json:"collectId"`
 }
 
 func ProductDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
@@ -164,9 +167,9 @@ func ProductDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		var collect model.Collect
 		found, _ = repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 			CollectName: repo.CollectionCollect,
-			Query:       repo.Map{"userId": userId},
+			Query:       repo.Map{"userId": userId, "productId": id},
 		}, &collect)
-		return ProudctDetailRes{Product: product, IsCollect: found}, nil
+		return ProudctDetailRes{Product: product, IsCollect: found, CollectId: collect.Id.Hex()}, nil
 	}
 
 	return product, nil

3dshow/api/test_print.go

@@ -1,46 +1,43 @@
 package api
 
 import (
-	"3dshow/db/model"
-	"3dshow/db/repo"
-	"fmt"
-
 	"github.com/gin-gonic/gin"
 )
 
 func Printr(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// _sort := "a"
-	statusMap := make(map[int]struct{})
-	// statusMap[-1] = struct{}{}
-	statusMap[1] = struct{}{}
-	statusMap[2] = struct{}{}
-	status := 0
-	if len(statusMap) == 1 {
-		if _, ok := statusMap[-1]; ok {
-			status = -1
-		}
-		if _, ok := statusMap[1]; ok {
-			status = 1
-		}
-		if _, ok := statusMap[2]; ok {
-			status = 2
-		}
-	}
-	if len(statusMap) == 2 {
-		if _, ok := statusMap[-1]; ok {
-			status = -1
-		} else if _, ok := statusMap[1]; ok {
-			status = 1
-		}
-	}
-	if len(statusMap) == 3 {
-		status = -1
-	}
-	fmt.Println(status)
-	var statusOrder model.Order
-	statusOrder.Status = status
-	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionOrder, "636b5b4a0bab456f8a558962", &statusOrder)
-	// return repo.RepoUpdateSetDocProps(apictx.CreateRepoCtx(), repo.CollectionOrder, "636b5b4a0bab456f8a558962", repo.Map{"status": status})
-	// sort, _ := strconv.Atoi("-1")
-	// return status, nil
+	// // _sort := "a"
+	// statusMap := make(map[int]struct{})
+	// // statusMap[-1] = struct{}{}
+	// statusMap[1] = struct{}{}
+	// statusMap[2] = struct{}{}
+	// status := 0
+	// if len(statusMap) == 1 {
+	// 	if _, ok := statusMap[-1]; ok {
+	// 		status = -1
+	// 	}
+	// 	if _, ok := statusMap[1]; ok {
+	// 		status = 1
+	// 	}
+	// 	if _, ok := statusMap[2]; ok {
+	// 		status = 2
+	// 	}
+	// }
+	// if len(statusMap) == 2 {
+	// 	if _, ok := statusMap[-1]; ok {
+	// 		status = -1
+	// 	} else if _, ok := statusMap[1]; ok {
+	// 		status = 1
+	// 	}
+	// }
+	// if len(statusMap) == 3 {
+	// 	status = -1
+	// }
+	// fmt.Println(status)
+	// var statusOrder model.Order
+	// statusOrder.Status = status
+	// return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionOrder, "636b5b4a0bab456f8a558962", &statusOrder)
+	// // return repo.RepoUpdateSetDocProps(apictx.CreateRepoCtx(), repo.CollectionOrder, "636b5b4a0bab456f8a558962", repo.Map{"status": status})
+	// // sort, _ := strconv.Atoi("-1")
+	// // return status, nil
+	return len("61c3d4a0d6649a1d7353e2d9"), nil
 }

3dshow/db/db.go

@@ -35,8 +35,8 @@ func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
 }
 
 func NewMongoDB(bus *comm.NatsBus) *MongoDB {
-	inst, err := bus.NewMongoDBFromConfig("3dshow-mongo")
-	// inst, err := bus.NewMongoDBFromConfigDev("3dshow-mongo")
+	// inst, err := bus.NewMongoDBFromConfig("3dshow-mongo")
+	inst, err := bus.NewMongoDBFromConfigDev("3dshow-mongo")
 	if err != nil {
 		panic(err)
 	}

3dshow/db/redis.go

@@ -6,8 +6,8 @@ import (
 )
 
 func NewRedisClient(bus *comm.NatsBus) *redis.Client {
-	client, err := bus.NewRedisFromConfig("3dshow-redis")
-	// client, err := bus.NewRedisFromConfigDev("3dshow-redis")
+	// client, err := bus.NewRedisFromConfig("3dshow-redis")
+	client, err := bus.NewRedisFromConfigDev("3dshow-redis")
 	if err != nil {
 		return nil
 	}