..

aarongao
1 parent d6a714e9
Showing 8 changed files with 61 additions and 117 deletions Show diff stats
API/DealyMessage.go
API/Item.go
API/Line.go
API/Scenic.go
API/Shop.go
API/Tag.go
API/User.go
DB/db.go
@@ -23,18 +23,12 @@ func DealyMessageInfo(c *gin.Context) {
 	DelayMessage.CDelayMessage.Find(bson.M{"UserId": c.Query("userid")}).All(&aDelayMessage)
 	if aDelayMessage == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			aDelayMessage,
-		})
+		aDelayMessage = []DelayMessage.Message{}
 	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		aDelayMessage,
+	})
 }
 // @Title 创建提醒
@@ -28,22 +28,14 @@ func ItemInfo(c *gin.Context) {
 		return
 	}
-	var SItem *DB.SItem
+	var SItem DB.SItem
 	DB.CItem.Find(bson.M{"_id": bson.ObjectIdHex(c.Query("id"))}).One(&SItem)
-	if SItem == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		SItem,
+	})
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			SItem,
-		})
-	}
 }
 // @Title 查询所有游玩项目
@@ -122,7 +114,6 @@ type ItemTime struct {
 	Time string `json:"time"`
 }
-
 // @Title 更新等待时间
 // @Description 更新等待时间
 // @Accept  json
@@ -28,22 +28,13 @@ func LineInfo(c *gin.Context) {
 		return
 	}
-	var SLine *DB.SLine
+	var SLine DB.SLine
 	DB.CLine.Find(bson.M{"_id": bson.ObjectIdHex(c.Query("id"))}).One(&SLine)
-	if SLine == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			SLine,
-		})
-	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		SLine,
+	})
 }
@@ -31,19 +31,10 @@ func ScenicInfo(c *gin.Context) {
 	var Scenic *DB.SScenic
 	DB.CScenic.Find(bson.M{"_id": bson.ObjectIdHex(c.Query("id"))}).One(&Scenic)
-	if Scenic == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			Scenic,
-		})
-	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		Scenic,
+	})
 }
@@ -62,21 +53,22 @@ func UpdateScenic(c *gin.Context) {
 	var Location DB.SLocation
 	json.Unmarshal([]byte(c.PostForm("Location")), &Location)
-	var Picture []string
+	var Picture []DB.SPicture
 	json.Unmarshal([]byte(c.PostForm("Picture")), &Picture)
-	var ShopAdPicture []string
+	var ShopAdPicture []DB.SPicture
 	json.Unmarshal([]byte(c.PostForm("ShopAdPicture")), &ShopAdPicture)
-	var ItemScenicPicture []string
+	var ItemScenicPicture []DB.SPicture
 	json.Unmarshal([]byte(c.PostForm("ItemScenicPicture")), &ItemScenicPicture)
-	var ActivityPicture []string
+	var ActivityPicture []DB.SPicture
 	json.Unmarshal([]byte(c.PostForm("ActivityPicture")), &ActivityPicture)
-	var VideoList []string
+	var VideoList []DB.SPicture
 	json.Unmarshal([]byte(c.PostForm("VideoList")), &VideoList)
+
 	var id bson.ObjectId
 	if pid := c.PostForm("id"); pid == "null" {
 		id = bson.NewObjectId()
@@ -123,17 +115,12 @@ func AllScenic(c *gin.Context) {
 	DB.CScenic.Find(bson.M{}).All(&Scenic)
 	if Scenic == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			Scenic,
-		})
+		Scenic = []*DB.SScenic{}
 	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		Scenic,
+	})
+
 }
@@ -28,22 +28,13 @@ func CommodityInfo(c *gin.Context) {
 		return
 	}
-	var SCommodity *DB.SCommodity
+	var SCommodity DB.SCommodity
 	DB.CCommodity.Find(bson.M{"_id": bson.ObjectIdHex(c.Query("id"))}).One(&SCommodity)
-	if SCommodity == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			SCommodity,
-		})
-	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		SCommodity,
+	})
 }
@@ -82,8 +73,8 @@ func UpdateCommodity(c *gin.Context) {
 	var TopPhoto []string
 	json.Unmarshal([]byte(c.PostForm("TopPhoto")), &TopPhoto)
-	var Location DB.SLocation
-	json.Unmarshal([]byte(c.PostForm("Location")), &Location)
+	//var Location DB.SLocation
+	//json.Unmarshal([]byte(c.PostForm("Location")), &Location)
 	var id bson.ObjectId
 	if pid := c.PostForm("id"); pid == "null" {
@@ -100,7 +91,7 @@ func UpdateCommodity(c *gin.Context) {
 			"ShopName": c.PostForm("ShopName"),
 			"KvPhoto":  c.PostForm("KvPhoto"),
 			"TopPhoto": TopPhoto,
-			"Location": Location,
+			"ItemId":   c.PostForm("ItemId"),
 			"Images":   Picture,
 		}},
 	)
@@ -18,22 +18,16 @@ func AllTag(c *gin.Context) {
 	c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin"))
 	c.Header("Access-Control-Allow-Credentials", "true")
-
 	var Stags []*DB.STag
 	DB.CTags.Find(bson.M{}).All(&Stags)
 	if Stags == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			Stags,
-		})
+		Stags = []*DB.STag{}
 	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		Stags,
+	})
+
 }
@@ -196,22 +196,13 @@ func UserInfo(c *gin.Context) {
 		return
 	}
-	var User *DB.SMember
+	var User DB.SMember
 	DB.CMember.Find(bson.M{"_id": bson.ObjectIdHex(c.Query("id"))}).One(&User)
-	if User == nil {
-
-		c.JSON(200, tools.ResponseError{
-			1,
-			"空",
-		})
-	} else {
-
-		c.JSON(200, tools.ResponseSeccess{
-			0,
-			User,
-		})
-	}
+	c.JSON(200, tools.ResponseSeccess{
+		0,
+		User,
+	})
 }
@@ -73,7 +73,7 @@ type SCommodity struct {
 	Name     string         `bson:"Name" json:"Name"`
 	Price    string         `bson:"Price" json:"Price"`
 	ShopName string         `bson:"ShopName" json:"ShopName"`
-	Location SLocation      `bson:"Location" json:"Location"`
+	ItemId   string         `bson:"ItemId" json:"ItemId"`     //项目id
 	KvPhoto  string         `bson:"KvPhoto" json:"KvPhoto"`   //用于列表页的图片
 	TopPhoto []string       `bson:"TopPhoto" json:"TopPhoto"` //详情页最上面的轮播图
 	Images   []string       `bson:"Images" json:"Images"`     //详情页下面的产品详细图
@@ -116,6 +116,11 @@ type STag struct {
 	Type string `bson:"Type" json:"Type"`
 	Name string `bson:"Name" json:"Name"`
 }
+
+type SPicture struct {
+	Src  string `bson:"Src" json:"Src"`
+	Link string `bson:"Link" json:"Link"`
+}
 type SScenic struct {
 	Id                *bson.ObjectId `bson:"_id" json:"Id" valid:"required"`
 	Name              string         `bson:"Name" json:"Name"`
@@ -124,9 +129,9 @@ type SScenic struct {
 	Mobile            string         `bson:"Mobile" json:"Mobile"`
 	Address           string         `bson:"Address" json:"Address"`
 	Location          SLocation      `bson:"Location" json:"Location"`
-	Picture           []string       `bson:"Picture" json:"Picture"`
-	ShopAdPicture     []string       `bson:"ShopAdPicture" json:"ShopAdPicture"`         //商城列表页图片
-	ItemScenicPicture []string       `bson:"ItemScenicPicture" json:"ItemScenicPicture"` //项目场次照片
-	ActivityPicture   []string       `bson:"ActivityPicture" json:"ActivityPicture"`     //活动照片
-	VideoList         []string       `bson:"VideoList" json:"VideoList"`
+	Picture           []SPicture     `bson:"Picture" json:"Picture"`
+	ShopAdPicture     []SPicture     `bson:"ShopAdPicture" json:"ShopAdPicture"`         //商城列表页图片
+	ItemScenicPicture []SPicture     `bson:"ItemScenicPicture" json:"ItemScenicPicture"` //项目场次照片
+	ActivityPicture   []SPicture     `bson:"ActivityPicture" json:"ActivityPicture"`     //活动照片
+	VideoList         []SPicture     `bson:"VideoList" json:"VideoList"`
 }