优化

3dshow/api/address.go

@@ -39,7 +39,7 @@ func Address(r *GinRouter) {
 			}
 			return entity, nil
 		},
-		OnUpdate: func(c *gin.Context, apictx *ApiSession, entity interface{}) {
+		OnUpdate: func(_ *gin.Context, apictx *ApiSession, entity interface{}) {
 			address := entity.(*model.Address)
 			_userId := apictx.User.ID
 			userId, err := primitive.ObjectIDFromHex(_userId)

3dshow/api/shopCart.go

@@ -3,17 +3,19 @@ package api
 import (
 	"3dshow/db/model"
 	"3dshow/db/repo"
+	"context"
 	"errors"
 	"fmt"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 func ShopCart(r *GinRouter) {
 	r.POSTJWT("/shopCart/deleteBatch", ShopCartDeleteBatch)
-	r.GETJWT("/shopCart/groupList", shopCartList)
+	r.GETJWT("/shopCart/groupList", shopCartGroupList)
 
 	CreateCRUD(r, "/shopCart", &CRUDOption{
 		Collection: repo.CollectionShopCart,
@@ -50,9 +52,31 @@ func ShopCart(r *GinRouter) {
 			ety := entity.(*model.ShopCart)
 			ety.UpdateTime = time.Now()
 		},
+		SearchPostProcess: func(page *repo.PageResult, _ *gin.Context, apictx *ApiSession, _ map[string]interface{}) (interface{}, error) {
+			// 查询组装数据
+			if len(page.List) > 0 {
+				for _, v := range page.List {
+					// 查询产品信息
+					supplyId := v["supplyId"].(primitive.ObjectID)
+					supply := model.Supply{}
+					// 供应商信息
+					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+						CollectName: repo.CollectionSupply,
+						Query:       repo.Map{"_id": supplyId},
+						Project:     []string{"name", "avatar", "contact"},
+					}, &supply)
+					v["supplyName"] = supply.Name
+					v["supplyAvatar"] = supply.Avatar
+					v["supplyContact"] = supply.Contact
+
+				}
+			}
+			return page, nil
+		},
 	})
 }
 
+// 批量删除
 type ShopCartDeleteBatchReq struct {
 	Ids []string `json:"ids"`
 }
@@ -81,46 +105,82 @@ func ShopCartDeleteBatch(c *gin.Context, apictx *ApiSession) (interface{}, error
 	return true, nil
 }
 
-func shopCartList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	var shopCarts []*model.ShopCart
-	userId, _ := primitive.ObjectIDFromHex(apictx.User.ID)
-	option := &repo.PageSearchOptions{
-		CollectName: repo.CollectionShopCart,
-		Query:       repo.Map{"userId": userId},
-	}
+// 供应链分组列表 算法版 map过滤supplyId 乱序
+// func shopCartList(_ *gin.Context, apictx *ApiSession) (interface{}, error) {
+// 	var shopCarts []*model.ShopCart
+// 	userId, _ := primitive.ObjectIDFromHex(apictx.User.ID)
+// 	option := &repo.PageSearchOptions{
+// 		CollectName: repo.CollectionShopCart,
+// 		Query:       repo.Map{"userId": userId},
+// 	}
 
-	repo.RepoDocsSearch(apictx.CreateRepoCtx(), option, &shopCarts)
+// 	repo.RepoDocsSearch(apictx.CreateRepoCtx(), option, &shopCarts)
 
-	supplyArr := map[primitive.ObjectID]struct{}{}
-	supplyList := make([]map[string]interface{}, 0)
+// 	supplyArr := map[primitive.ObjectID]struct{}{}
+// 	supplyList := make([]map[string]interface{}, 0)
 
-	if len(shopCarts) > 0 {
-		for _, v := range shopCarts {
-			supplyArr[v.SupplyId] = struct{}{}
-		}
-		// supplyId分组列表
-		for k, _ := range supplyArr {
-			// 查询产品信息
+// 	if len(shopCarts) > 0 {
+// 		// 找出供应id 去重
+// 		for _, v := range shopCarts {
+// 			supplyArr[v.SupplyId] = struct{}{}
+// 		}
+// 		// supplyId分组列表
+// 		for k := range supplyArr {
+// 			// 查询产品信息
+// 			supply := model.Supply{}
+// 			// 供应商信息
+// 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+// 				CollectName: repo.CollectionSupply,
+// 				Query:       repo.Map{"_id": k},
+// 				Project:     []string{"name", "avatar", "contact"},
+// 			}, &supply)
+// 			products := make([]*model.ShopCart, 0)
+// 			for _, v := range shopCarts {
+// 				if k == v.SupplyId {
+// 					products = append(products, v)
+
+// 				}
+// 			}
+// 			supplyList = append(supplyList, map[string]interface{}{
+// 				"supply":   supply,
+// 				"products": products,
+// 			})
+// 		}
+// 	}
+
+// 	return supplyList, nil
+// }
+
+// 供应链分组列表 数据库分组
+func shopCartGroupList(_ *gin.Context, apictx *ApiSession) (interface{}, error) {
+	userId, _ := primitive.ObjectIDFromHex(apictx.User.ID)
+	mongo := apictx.Svc.Mongo
+	cond := []interface{}{
+		bson.M{"$match": bson.M{"userId": userId}},
+		bson.M{"$group": bson.M{"_id": "$supplyId", "products": bson.M{"$push": "$$ROOT"}}},
+		bson.M{"$project": bson.M{"_id": 0, "supplyId": "$_id", "products": 1}},
+	}
+	tmp, err := mongo.GetCollection(repo.CollectionShopCart).Aggregate(context.Background(), cond)
+	if err != nil {
+		return nil, err
+	}
+	defer tmp.Close(context.Background())
+	list := make([]map[string]interface{}, 0)
+	tmp.All(context.Background(), &list)
+	if len(list) > 0 {
+		for _, item := range list {
 			supply := model.Supply{}
+			supplyId := item["supplyId"].(primitive.ObjectID)
 			// 供应商信息
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 				CollectName: repo.CollectionSupply,
-				Query:       repo.Map{"_id": k},
-				Project:     []string{"name", "avatar", "contact"},
+				Query:       repo.Map{"_id": supplyId},
 			}, &supply)
-			products := make([]*model.ShopCart, 0)
-			for _, v := range shopCarts {
-				if k == v.SupplyId {
-					products = append(products, v)
+			item["supply"] = supply
+			delete(item, "supplyId")
 
-				}
-			}
-			supplyList = append(supplyList, map[string]interface{}{
-				"supply":   supply,
-				"products": products,
-			})
 		}
 	}
 
-	return supplyList, nil
+	return list, nil
 }