123

src/server/webserver/shop.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"fmt"
 	"net/http"
+	"server/console"
+	"server/hall/shop"
 	"server/msg"
 
 	"github.com/gin-gonic/gin"
@@ -14,13 +15,10 @@ func MakeShop() []*msg.ShopItem {
 	if len(list) == 10 {
 		return list
 	}
-	for i := range 10 {
-		list = append(list, &msg.ShopItem{
-			Id:    fmt.Sprintf("%d", i+1),
-			Name:  fmt.Sprintf("Item:%d", i+1),
-			Price: int32((i + 1) * 100),
-			Num:   int32((i + 1) * 50),
-		})
+	var err error = nil
+	list, err = shop.GetShopList(1)
+	if err != nil {
+		console.Log("MakeShop error!")
 	}
 	return list
 }