添加address字段,修改crud筛选

3dshow/api/address.go

@@ -23,10 +23,17 @@ func Address(r *GinRouter) {
 			if err != nil {
 				return nil, errors.New("非法用户")
 			}
+			if entity.Addr == "" {
+				return nil, errors.New("地址不能为空")
+			}
+			if entity.Contact == "" {
+				return nil, errors.New("联系人不能为空")
+			}
 			entity.UserId = userId
+			// 默认设置第一条数据为默认数据
 			first, _ := repo.RepoCountDoc(apictx.CreateRepoCtx(), repo.CollectionAddress, repo.Map{"userId": userId})
 			if first > 0 {
-				entity.Defualt = 2
+				entity.Defualt = -1
 			} else {
 				entity.Defualt = 1
 			}
@@ -39,18 +46,20 @@ func Address(r *GinRouter) {
 			return &model.Address{}
 		},
 		JWT: true,
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
+		SearchFilter: func(_ *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
 			_userId := apictx.User.ID
 			userId, err := primitive.ObjectIDFromHex(_userId)
 			if err != nil {
 				// 6369f4b028c4bf8b14f47a6b
 				invalidId, _ := primitive.ObjectIDFromHex("6369f4b028c4bf8b14f47a6b")
-				return repo.Map{"userId": invalidId}
+				query["userId"] = invalidId
+				return query
 			}
 
-			return repo.Map{"userId": userId}
+			query["userId"] = userId
+			return query
 		},
-		SearchProject: []string{"area", "addr", "contact", "phone", "defualt", "createTime"},
-		DetailProject: []string{"area", "addr", "contact", "phone", "defualt", "createTime"},
+		SearchProject: []string{"province", "city", "area", "addr", "contact", "phone", "defualt", "createTime"},
+		DetailProject: []string{"province", "city", "area", "addr", "contact", "phone", "defualt", "createTime"},
 	})
 }

3dshow/api/collect.go

@@ -30,18 +30,21 @@ func Collect(r *GinRouter) {
 			return &model.Collect{}
 		},
 		JWT: true,
-		SearchFilter: func(c *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
+		SearchFilter: func(_ *gin.Context, apictx *ApiSession, query map[string]interface{}) map[string]interface{} {
 			_userId := apictx.User.ID
 			userId, err := primitive.ObjectIDFromHex(_userId)
 			if err != nil {
+
 				// 6369f4b028c4bf8b14f47a6b
 				invalidId, _ := primitive.ObjectIDFromHex("6369f4b028c4bf8b14f47a6b")
-				return repo.Map{"userId": invalidId}
+				query["userId"] = invalidId
+				return query
 			}
 
-			return repo.Map{"userId": userId}
+			query["userId"] = userId
+			return query
 		},
-		SearchPostProcess: func(page *repo.PageResult, c *gin.Context, apictx *ApiSession, query map[string]interface{}) (interface{}, error) {
+		SearchPostProcess: func(page *repo.PageResult, _ *gin.Context, apictx *ApiSession, _ map[string]interface{}) (interface{}, error) {
 			// 查询组装数据
 			if len(page.List) > 0 {
 				for _, v := range page.List {
@@ -55,6 +58,7 @@ func Collect(r *GinRouter) {
 						Query:       repo.Map{"_id": productId},
 						Project:     []string{"name", "unit", "cover"},
 					}, &product)
+					// 供应商信息
 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 						CollectName: repo.CollectionSupply,
 						Query:       repo.Map{"_id": supplyId},
@@ -64,6 +68,8 @@ func Collect(r *GinRouter) {
 					v["productUnit"] = product.Unit
 					v["productCover"] = product.Cover
 					v["supplyName"] = supply.Name
+					v["supplyAvatar"] = supply.Avatar
+					v["supplyContact"] = supply.Contact
 
 				}
 			}

3dshow/api/order.go

@@ -68,7 +68,7 @@ func OrderList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 }
 
 // 个人页面数量展示
-func OrderCount(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+func OrderCount(_ *gin.Context, apictx *ApiSession) (interface{}, error) {
 	_userId := apictx.User.ID
 	userId, err := primitive.ObjectIDFromHex(_userId)
 	if err != nil {

3dshow/api/supply.go

@@ -12,7 +12,7 @@ func Supply(r *GinRouter) {
 
 	CreateCRUD(r, "/supply", &CRUDOption{
 		Collection: repo.CollectionSupply,
-		NewModel: func(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+		NewModel: func(c *gin.Context, _ *ApiSession) (interface{}, error) {
 			entity := &model.Supply{}
 			c.ShouldBindJSON(entity)
 			entity.CreateTime = time.Now()
@@ -22,7 +22,7 @@ func Supply(r *GinRouter) {
 			return &model.Supply{}
 		},
 		JWT:           true,
-		SearchProject: []string{"name", "avatar", "createTime"},
-		DetailProject: []string{"name", "avatar", "createTime"},
+		SearchProject: []string{"name", "avatar", "contact", "createTime"},
+		DetailProject: []string{"name", "avatar", "contact", "createTime"},
 	})
 }

3dshow/api/tmp.md

@@ -1 +0,0 @@
-eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NjgwNjE1MjIsImlkIjoiNjMwNWMzZGRkNWQ3OGRiY2I3MGI3ZjcwIiwia2V5Ijoic2t1M2QtdXNlciIsIm5hbWUiOiIxMzQwODU0NzgyMyIsIm9yaWdfaWF0IjoxNjY3OTc1MTIyLCJwYXJlbnQiOiI2MzA1YzNkZGQ1ZDc4ZGJjYjcwYjdmNzAiLCJwaG9uZSI6IjEzNDA4NTQ3ODIzIiwicm9sZSI6IiIsInN0YXRlIjoxLCJ1c2VyVHlwZSI6Mn0.HEnotz-KJ5wz1uReAL3EuP5HpFbYmFrxMuYf2pDh78w

3dshow/db/model/address.go

@@ -10,11 +10,13 @@ import (
 type Address struct {
 	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
 	UserId     primitive.ObjectID `bson:"userId,omitempty" json:"userId"`
-	Area       string             `bson:"area,omitempty" json:"area"`       // 区域
-	Addr       string             `bson:"addr,omitempty" json:"addr"`       // 详细地址
-	Contact    string             `bson:"contact,omitempty" json:"contact"` // 联系人
-	Phone      string             `bson:"phone,omitempty" json:"phone"`     // 联系人电话
-	Defualt    int                `bson:"defualt,omitempty" json:"defualt"` // 是否默认 2:否 1:是
+	Province   string             `bson:"province,omitempty" json:"province"` // 省
+	City       string             `bson:"city,omitempty" json:"city"`         // 市
+	Area       string             `bson:"area,omitempty" json:"area"`         // 区域
+	Addr       string             `bson:"addr,omitempty" json:"addr"`         // 详细地址
+	Contact    string             `bson:"contact,omitempty" json:"contact"`   // 联系人
+	Phone      string             `bson:"phone,omitempty" json:"phone"`       // 联系人电话
+	Defualt    int                `bson:"defualt,omitempty" json:"defualt"`   // 是否默认 -1:否 1:是
 	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
 	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
 }

3dshow/db/model/json/address.json

@@ -0,0 +1,12 @@
+{
+    "_id": "636b4dddb45f0238b7d0da50",
+    "userId": "6305c3ddd5d78dbcb70b7f70",
+    "province": "四川省",
+    "city": "成都市",
+    "area": "高新区",
+    "addr": "火车南站西路486号",
+    "contact": "刘先生",
+    "phone": "13586882266",
+    "defualt": 1,
+    "createTime": "2022-11-09T06:51:09.167Z"
+}

3dshow/db/model/json/order.json

@@ -0,0 +1,34 @@
+{
+  "_id": "636b8779a37839e503b1d7cb",
+  "userId": "6305c3ddd5d78dbcb70b7f70",
+  "address": {
+    "_id": "636b50c2829110ccd2dca0d5",
+    "userId": "6305c3ddd5d78dbcb70b7f70",
+    "area": "成都市双流区",
+    "addr": "南湖大道西路302号",
+    "contact": "A先生",
+    "phone": "13586381256"
+  },
+  "products": [
+    {
+      "id": "636b1a304a0c960098bd13bd",
+      "supplyId": "6369f46328c4bf8b14f47a6a",
+      "name": "女士双G裸靴",
+      "size": "37",
+      "color": "#ff0000",
+      "unit": "SL-H-1989",
+      "cover": "xxx.png"
+    },
+    {
+      "id": "636b1a304a0c960098bd13bd",
+      "supplyId": "6369f46328c4bf8b14f47a6a",
+      "name": "女士双G裸靴",
+      "size": "36",
+      "color": "#ff0000",
+      "unit": "SL-H-1989",
+      "cover": "xxx.png"
+    }
+  ],
+  "deliveryMethod": "快递配送",
+  "remark": "请勿损坏"
+}

3dshow/db/model/json/product.json

@@ -0,0 +1,24 @@
+{
+  "_id": "636b21438993c94980896fa7",
+  "supplyId": "6369f46328c4bf8b14f47a6a",
+  "senceId": "6369f46328c4bf8b14f47a6a",
+  "name": "女士双G裸靴",
+  "type": "shoes",
+  "unit": "SL-H-1989",
+  "price": 998,
+  "cover": "xxx.png",
+  "color": [
+    "#ff0000",
+    "#ff00ff"
+  ],
+  "size": [
+    "36",
+    "37",
+    "38"
+  ],
+  "thumbnail": [
+    "image1.png",
+    "image2.png",
+    "image3.png"
+  ]
+}

3dshow/db/model/json/supply.json

@@ -0,0 +1,6 @@
+{
+  "id": "",
+  "name": "",
+  "avatar": "",
+  "contact": ""
+}

3dshow/db/model/supply.go

@@ -11,6 +11,7 @@ type Supply struct {
 	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
 	Name       string             `bson:"name,omitempty" json:"name"`
 	Avatar     string             `bson:"avatar,omitempty" json:"avatar"`
+	Contact    string             `bson:"contact,omitempty" json:"contact"`
 	CreateTime time.Time          `bson:"createTime,omitempty" json:"createTime"`
 	UpdateTime time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
 }