update

3dshow-customer/api/address.go

@@ -19,10 +19,8 @@ func Address(r *GinRouter) {
 			c.ShouldBindJSON(entity)
 			entity.CreateTime = time.Now()
 			_userId := apictx.User.ID
-			userId, err := primitive.ObjectIDFromHex(_userId)
-			if err != nil {
-				return nil, errors.New("非法用户")
-			}
+			userId, _ := primitive.ObjectIDFromHex(_userId)
+
 			if entity.Addr == "" {
 				return nil, errors.New("地址不能为空")
 			}
@@ -42,11 +40,8 @@ func Address(r *GinRouter) {
 		OnUpdate: func(_ *gin.Context, apictx *ApiSession, entity interface{}) {
 			address := entity.(*model.Address)
 			_userId := apictx.User.ID
-			userId, err := primitive.ObjectIDFromHex(_userId)
-			if err != nil {
-				invalidId, _ := primitive.ObjectIDFromHex("6369f4b028c4bf8b14f47a6b")
-				userId = invalidId
-			}
+			userId, _ := primitive.ObjectIDFromHex(_userId)
+
 			// 更改默认地址的流程
 			if address.Defualt == 1 {
 				// 将已有的默认地址更改为非默认
@@ -73,14 +68,7 @@ func Address(r *GinRouter) {
 		JWT: true,
 		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")
-				query["userId"] = invalidId
-				return query
-			}
-
+			userId, _ := primitive.ObjectIDFromHex(_userId)
 			query["userId"] = userId
 			return query
 		},

3dshow-customer/api/collect.go

@@ -19,24 +19,17 @@ func Collect(r *GinRouter) {
 			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, _ := primitive.ObjectIDFromHex(_userId)
 
 			// 同一用户对同一产品只能有一条收藏记录
 			// 联合唯一索引 db.collect.ensureIndex({userId:1,productId:1},{unique:true})
-			opt := &repo.DocSearchOptions{
+			collect := &model.Collect{}
+			found, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 				CollectName: repo.CollectionCollect,
 				Query:       repo.Map{"userId": userId, "productId": entity.ProductId},
-			}
-			collect := &model.Collect{}
-			found, _ := repo.RepoSeachDoc(apictx.CreateRepoCtx(), opt, &collect)
+			}, &collect)
 			if found {
 				return entity, errors.New("该物品已被收藏")
 			}
@@ -47,18 +40,11 @@ func Collect(r *GinRouter) {
 		EmtyModel: func(c *gin.Context, apictx *ApiSession) interface{} {
 			return &model.Collect{}
 		},
-		JWT: true,
+		noUpdate: true,
+		JWT:      true,
 		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")
-				query["userId"] = invalidId
-				return query
-			}
-
+			userId, _ := primitive.ObjectIDFromHex(_userId)
 			query["userId"] = userId
 			return query
 		},
@@ -70,7 +56,7 @@ func Collect(r *GinRouter) {
 					productId := v["productId"].(primitive.ObjectID)
 					supplyId := v["supplyId"].(primitive.ObjectID)
 					product := model.Product{}
-					supply := model.Supply{}
+					supply := model.UserSmaple{}
 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 						CollectName: repo.CollectionProduct,
 						Query:       repo.Map{"_id": productId},
@@ -78,16 +64,17 @@ func Collect(r *GinRouter) {
 					}, &product)
 					// 供应商信息
 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-						CollectName: repo.CollectionSupply,
+						Db:          "supply-user",
+						CollectName: "users",
 						Query:       repo.Map{"_id": supplyId},
-						Project:     []string{"name", "avatar", "contact"},
+						Project:     []string{"name", "avatar", "email"},
 					}, &supply)
 					v["productName"] = product.Name
 					v["productUnit"] = product.Unit
 					v["productCover"] = product.Cover
 					v["supplyName"] = supply.Name
 					v["supplyAvatar"] = supply.Avatar
-					v["supplyContact"] = supply.Contact
+					v["supplyEmail"] = supply.Email
 
 				}
 			}

3dshow-customer/api/order.go

@@ -15,9 +15,11 @@ import (
 func Order(r *GinRouter) {
 	r.POSTJWT("/order/createBatch", OrderAddBatch)
 	r.GETJWT("/order/list", OrderList)
+	// ??? 更新订单的操作 订单
+	r.POSTJWT("/order/complete", OrderComplete)
+	r.POSTJWT("/order/cancel", OrderCancel)
 	r.POSTJWT("/order/update", OrderUpdate)
 	r.GETJWT("/order/detail/:id", OrderDetail)
-	r.POSTJWT("/order/delete/:id", OrderDelete)
 	r.GETJWT("/order/count", OrderCount)
 }
 
@@ -65,6 +67,7 @@ func OrderAddBatch(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		order.DeliveryMethod = v.DeliveryMethod
 		order.Remark = v.Remark
 		order.Status = -1
+		order.IsCancel = 1
 		order.CreateTime = time.Now()
 		repo.RepoAddDoc(ctx, repo.CollectionOrder, order)
 
@@ -76,30 +79,27 @@ func OrderAddBatch(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 // 订单列表
 func OrderList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	// customer
-	// supplier
 	page, size, query := UtilQueryPageSize(c)
 	_userId := apictx.User.ID
 	userId, _ := primitive.ObjectIDFromHex(_userId)
-
-	// if apictx.User.Role == "customer"{
 	query["userId"] = userId
-	// }
+
 	result, err := repo.RepoPageSearch(apictx.CreateRepoCtx(), &repo.PageSearchOptions{
 		CollectName: repo.CollectionOrder,
 		Page:        page,
 		Size:        size,
 		Query:       query,
-		// Project: []string{},
-		Sort: repo.Map{"createTime": -1},
+		Project:     []string{"createTime", "userId", "supplyId", "products"},
+		Sort:        repo.Map{"createTime": -1},
 	})
 
 	if len(result.List) > 0 {
 		for _, v := range result.List {
 			supplyId := v["supplyId"].(primitive.ObjectID)
-			supply := model.Supply{}
+			supply := model.UserSmaple{}
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-				CollectName: repo.CollectionSupply,
+				Db:          "supply-user",
+				CollectName: "users",
 				Query:       repo.Map{"_id": supplyId},
 			}, &supply)
 			v["supplyName"] = supply.Name
@@ -112,10 +112,8 @@ func OrderList(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 {
-		return nil, errors.New("非法用户")
-	}
+	userId, _ := primitive.ObjectIDFromHex(_userId)
+
 	statusArray := []int{-1, 1, 2, 3}
 	resMap := make(map[int]int64)
 	// var ret []int64
@@ -129,6 +127,49 @@ func OrderCount(_ *gin.Context, apictx *ApiSession) (interface{}, error) {
 	return resMap, nil
 }
 
+// 订单完成
+func OrderComplete(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	// 订单状态为已发货
+	_id := c.Param("id")
+	if len(_id) < 1 {
+		return nil, errors.New("id不能为空")
+	}
+	orderId, err := primitive.ObjectIDFromHex(_id)
+	if err != nil {
+		return nil, errors.New("id非法")
+	}
+	order := model.Order{}
+	found, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+		CollectName: repo.CollectionOrder,
+		Query:       repo.Map{"_id": orderId},
+	}, &order)
+	if !found || err != nil {
+		return nil, errors.New("未找到该订单数据")
+	}
+	if len(order.Products) < 1 {
+		return nil, errors.New("该订单为空")
+	}
+	statusMap := map[int]struct{}{}
+	for _, v := range order.Products {
+		statusMap[v.Status] = struct{}{}
+	}
+	// 状态为一种，且都为已发货时 可以完成订单
+	if len(statusMap) == 1 {
+		if _, ok := statusMap[1]; ok {
+			return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionOrder, _id, &model.Order{Status: 2, IsCancel: -1})
+		}
+	}
+
+	return nil, errors.New("该订单商品未全部发货")
+}
+
+// 订单取消
+func OrderCancel(c *gin.Context, apictx *ApiSession) (interface{}, error) {
+	// 订单状态为未发货
+
+	return nil, nil
+}
+
 // 更新订单 发货
 func OrderUpdate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	var form model.Order
@@ -205,32 +246,29 @@ func OrderUpdate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 
 // 订单信息
 func OrderDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	orderId := c.Param("id")
-	id, err := primitive.ObjectIDFromHex(orderId)
+	_id := c.Param("id")
+	if len(_id) < 1 {
+		return nil, errors.New("id不能为空")
+	}
+	orderId, err := primitive.ObjectIDFromHex(_id)
 	if err != nil {
 		return nil, errors.New("非法id")
 	}
-	var order model.Order
-	option := &repo.DocSearchOptions{
+	ok, result := repo.RepoSeachDocMap(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 		CollectName: repo.CollectionOrder,
-		Query:       repo.Map{"_id": id},
-	}
-
-	found, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), option, &order)
-	if !found || err != nil {
+		Query:       repo.Map{"_id": orderId},
+	})
+	if !ok {
 		return nil, errors.New("数据未找到")
 	}
+	// 供应链信息
+	supply := model.UserSmaple{}
+	repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
+		Db:          "supply-user",
+		CollectName: "users",
+		Query:       repo.Map{"_id": result["supplyId"].(primitive.ObjectID)},
+	}, &supply)
+	result["supply"] = supply
 
-	return order, nil
-}
-
-// 删除订单
-func OrderDelete(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	orderId := c.Param("id")
-	_, err := primitive.ObjectIDFromHex(orderId)
-	if err != nil {
-		return nil, errors.New("非法id")
-	}
-
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionOrder, orderId)
+	return result, nil
 }

3dshow-customer/api/product.go

@@ -16,10 +16,8 @@ import (
 func Product(r *GinRouter) {
 	r.POSTJWT("/product/create", ProductAdd)
 	r.GETJWT("/product/list", ProductList)
-	r.POSTJWT("/product/update", ProductUpdate)
 	r.GETJWT("/product/detail/:id", ProductDetail)
 	r.GET("/product/share/detail/:id", ProductDetail)
-	r.POSTJWT("/product/delete/:id", ProductDelete)
 }
 
 // 新增产品
@@ -49,7 +47,6 @@ func ProductAdd(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 }
 
 // 产品列表
-// ??? 上架才能展示 前端传 status:1
 func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	page, size, query := UtilQueryPageSize(c)
 	// asc:升序1  desc:降序-1
@@ -59,12 +56,9 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		if query["sort"].(string) == "asc" {
 			onsaleTimeSort = repo.Map{"onsaleTime": 1}
 		}
-		// if sort.(string) == "desc"{
-		// 	onsaleTimeSort = repo.Map{"onsaleTime": -1}
-		// }
-
+		delete(query, "sort")
 	}
-	delete(query, "sort")
+
 	// 查询数据
 	if _, ok := query["supplyId"]; !ok {
 		return nil, errors.New("供应链id不能为空")
@@ -74,6 +68,8 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 		return nil, errors.New("供应链id错误")
 	}
 	query["supplyId"] = supplyId
+	// 只展示上架商品
+	query["status"] = 1
 
 	option := &repo.PageSearchOptions{
 		CollectName: repo.CollectionProduct,
@@ -119,20 +115,6 @@ func ProductList(c *gin.Context, apictx *ApiSession) (interface{}, error) {
 	return pageResult, err
 }
 
-// 更新产品/编辑、下架
-func ProductUpdate(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	var form model.Product
-	err := c.ShouldBindJSON(&form)
-	if err != nil {
-		return nil, errors.New("参数错误")
-	}
-	if form.Id.Hex() == "" {
-		return nil, errors.New("更新的产品id不能为空")
-	}
-	form.UpdateTime = time.Now()
-	return repo.RepoUpdateSetDoc(apictx.CreateRepoCtx(), repo.CollectionProduct, form.Id.Hex(), &form)
-}
-
 // 产品信息
 type ProudctDetailRes struct {
 	model.Product
@@ -141,48 +123,36 @@ type ProudctDetailRes struct {
 }
 
 func ProductDetail(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	productId := c.Param("id")
-	id, err := primitive.ObjectIDFromHex(productId)
+	_id := c.Param("id")
+	if len(_id) < 1 {
+		return nil, errors.New("id不能为空")
+	}
+	productId, err := primitive.ObjectIDFromHex(_id)
 	if err != nil {
 		return nil, errors.New("非法id")
 	}
 	var product model.Product
-	option := &repo.DocSearchOptions{
+	found, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 		CollectName: repo.CollectionProduct,
-		Query:       repo.Map{"_id": id},
-	}
+		Query:       repo.Map{"_id": productId},
+	}, &product)
 
-	found, err := repo.RepoSeachDoc(apictx.CreateRepoCtx(), option, &product)
 	if !found || err != nil {
 		log.Info(err)
 		return nil, errors.New("数据未找到")
 	}
-	// 是否收藏
+	// 用户登录状态 是否收藏
 	if apictx.User != nil {
 		_userId := apictx.User.ID
-		userId, err := primitive.ObjectIDFromHex(_userId)
-		if err != nil {
-			return nil, errors.New("非法用户")
-		}
+		userId, _ := primitive.ObjectIDFromHex(_userId)
+
 		var collect model.Collect
 		found, _ = repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
 			CollectName: repo.CollectionCollect,
-			Query:       repo.Map{"userId": userId, "productId": id},
+			Query:       repo.Map{"userId": userId, "productId": productId},
 		}, &collect)
 		return ProudctDetailRes{Product: product, IsCollect: found, CollectId: collect.Id.Hex()}, nil
 	}
 
 	return product, nil
 }
-
-// 删除产品
-// ???权限控制 admin 和 供应商本人
-func ProductDelete(c *gin.Context, apictx *ApiSession) (interface{}, error) {
-	productId := c.Param("id")
-	_, err := primitive.ObjectIDFromHex(productId)
-	if err != nil {
-		return nil, errors.New("非法id")
-	}
-
-	return repo.RepoDeleteDoc(apictx.CreateRepoCtx(), repo.CollectionProduct, productId)
-}

3dshow-customer/api/shopCart.go

@@ -25,12 +25,6 @@ func ShopCart(r *GinRouter) {
 			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, _ := primitive.ObjectIDFromHex(_userId)
@@ -58,16 +52,17 @@ func ShopCart(r *GinRouter) {
 				for _, v := range page.List {
 					// 查询产品信息
 					supplyId := v["supplyId"].(primitive.ObjectID)
-					supply := model.Supply{}
+					supply := model.UserSmaple{}
 					// 供应商信息
 					repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-						CollectName: repo.CollectionSupply,
+						Db:          "supply-user",
+						CollectName: "users",
 						Query:       repo.Map{"_id": supplyId},
-						Project:     []string{"name", "avatar", "contact"},
+						Project:     []string{"name", "avatar", "email"},
 					}, &supply)
 					v["supplyName"] = supply.Name
 					v["supplyAvatar"] = supply.Avatar
-					v["supplyContact"] = supply.Contact
+					v["supplyEmail"] = supply.Email
 
 				}
 			}
@@ -123,11 +118,12 @@ func shopCartGroupList(_ *gin.Context, apictx *ApiSession) (interface{}, error)
 	tmp.All(context.Background(), &list)
 	if len(list) > 0 {
 		for _, item := range list {
-			supply := model.Supply{}
+			supply := model.UserSmaple{}
 			supplyId := item["supplyId"].(primitive.ObjectID)
 			// 供应商信息
 			repo.RepoSeachDoc(apictx.CreateRepoCtx(), &repo.DocSearchOptions{
-				CollectName: repo.CollectionSupply,
+				Db:          "supply-user",
+				CollectName: "users",
 				Query:       repo.Map{"_id": supplyId},
 			}, &supply)
 			item["supply"] = supply

3dshow-customer/api/supply.go

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

3dshow-customer/app.yaml

@@ -3,8 +3,6 @@ name: customer
 version: 1.0.0
 jwt: 
   timeoutHour: 24
-  # realm: 3dshow-customer-user
-  # key: 3dshow-customer-user secret
   realm: spu3d
   key: spu3d secret
   

3dshow-customer/db/model/json/tmp.json

@@ -1,43 +1,39 @@
-[
-  {
-    "supply": {
-      "_id": "636b1269cd5efc036be2b782"
-    },
-    "products": [
-      {
-        "supplyId": "636b1269cd5efc036be2b782",
-        "senceId": "6369f46328c4bf8b14f47a6a",
-        "name": "32342",
-        "type": "shoes",
-        "unit": "SL-H-1989",
-        "price": 111,
-        "cover": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1656484424701GCYvHS_untitled.jpg",
-        "color": "#ff00ff",
-        "size": "38",
-        "thumbnail": [
-          "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1656484424701GCYvHS_untitled.jpg"
-        ],
-        "status": -1,
-        "onsaleTimeTime": "0001-01-01T00:00:00Z",
-        "createTime": "2022-11-11T07:26:52.641Z",
-        "updateTime": "0001-01-01T00:00:00Z",
-        "isCollect": false,
-        "collectId": "000000000000000000000000",
-        "productId": "636df93c4fa01c203c478bb2"
-      }
-    ],
-    "deliveryMethod": "快递配送",
-    "remark": "请勿损坏",
-    "address": {
-      "_id": "637b3b62434c7a32bf6f9a6f",
-      "addr": "123",
-      "area": "东城区",
-      "city": "北京市",
-      "contact": "123u",
-      "createTime": "2022-11-21T16:48:34.786+08:00",
-      "defualt": 1,
-      "phone": "18981937200",
-      "province": "北京市"
-    }
-  }
-]
+// 1
+{
+  "_id": ObjectId("636b1269cd5efc036be2b782"),637f1491470c65733e0f6f61
+  "name": "旭宥供应链",
+  "createTime": ISODate("2022-11-09T02:37:29.539Z"),
+  "avatar": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/QueenTree/png/1667636956897bDHUBJ_f7c6c8cf4d7abdf606a8a198d654cee.png"
+}
+
+// 2
+{
+  "_id": ObjectId("636b53d6fa61a7aaf7c21aad"),637f14b0470c65733e0f6f62
+  "name": "酷炫佳品供应链s",
+  "createTime": ISODate("2022-11-09T07:16:38.589Z"),
+  "avatar": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/QueenTree/jpg/1668755728516SdxIaC_1668755699973.jpg"
+}
+
+// 3
+{
+  "_id": ObjectId("636b6269fa61a7aaf7c21aae"),637f14c6470c65733e0f6f63
+  "name": "中鱼供应链",
+  "createTime": ISODate("2022-11-09T08:18:49.95Z")
+}
+
+// 4
+{
+  "_id": ObjectId("636b6296fa61a7aaf7c21aaf"),637f14dc470c65733e0f6f64
+  "name": "大东供应链",
+  "createTime": ISODate("2022-11-09T08:19:34.123Z")
+}
+
+// 5
+{
+  "_id": ObjectId("636c66874fa01c203c478ba9"),637f14f5470c65733e0f6f65
+  "name": "cafin供应链",
+  "avatar": "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/image/jpg/1656484424701GCYvHS_untitled.jpg",
+  "contact": "23342423@qq.com",
+  "createTime": ISODate("2022-11-10T02:48:39.159Z")
+}
+

3dshow-customer/db/model/order.go

@@ -15,7 +15,8 @@ type Order struct {
 	Products       []*OrderProduct    `bson:"products,omitempty" json:"products"`
 	DeliveryMethod string             `bson:"deliveryMethod,omitempty" json:"deliveryMethod"`
 	Remark         string             `bson:"remark,omitempty" json:"remark"`
-	Status         int                `bson:"status,omitempty" json:"status"` // -1:待发货 1:已发货 2:已完成
+	Status         int                `bson:"status,omitempty" json:"status"`     // -1:待发货 1:已发货 2:已完成 3：取消
+	IsCancel       int                `bson:"isCancel,omitempty" json:"isCancel"` // -1:不可取消 1：可取消
 	CreateTime     time.Time          `bson:"createTime,omitempty" json:"createTime"`
 	UpdateTime     time.Time          `bson:"updateTime,omitempty" json:"updateTime"`
 }
@@ -29,12 +30,12 @@ type OrderProduct struct {
 	Unit      string             `bson:"unit,omitempty" json:"unit"`           // 型号
 	Cover     string             `bson:"cover,omitempty" json:"cover"`         // 封面图
 	ExpressNo string             `bson:"expressNo,omitempty" json:"expressNo"` // 快递单号，商家发货时需要输入
-	Status    int                `bson:"status,omitempty" json:"status"`       // -1:待发货 1:已发货
+	Status    int                `bson:"status,omitempty" json:"status"`       // -1:待发货 1:已发货 2:已完成 3：取消
 }
 
 type OrderAddReq struct {
 	Products       []*ShopCart `bson:"products,omitempty" json:"products"`
-	Supply         *Supply     `bson:"supply,omitempty" json:"supply"`
+	Supply         *UserSmaple `bson:"supply,omitempty" json:"supply"`
 	Address        *Address    `bson:"address,omitempty" json:"address"`
 	DeliveryMethod string      `bson:"deliveryMethod,omitempty" json:"deliveryMethod"`
 	Remark         string      `bson:"remark,omitempty" json:"remark"`

3dshow-customer/db/model/supply.go

@@ -1,14 +0,0 @@
-package model
-
-import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-// 供应链
-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"`
-	Email   string             `bson:"email,omitempty" json:"email"`
-}

3dshow-customer/db/model/user.go

@@ -0,0 +1,15 @@
+package model
+
+import (
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+// 供应链
+type UserSmaple struct {
+	Id         primitive.ObjectID `bson:"_id,omitempty" json:"_id"`
+	Name       string             `bson:"name,omitempty" json:"name"`
+	Avatar     string             `bson:"avatar,omitempty" json:"avatar"`
+	Email      string             `bson:"email,omitempty" json:"email"`
+	CreateTime string             `bson:"createTime,omitempty" json:"createTime"`
+	UpdateTime string             `bson:"updateTime,omitempty" json:"updateTime"`
+}