商品模块

controllers/goods/goods.go

@@ -80,7 +80,7 @@ func (c *GoodsController) UpdateGoods() {
 	gds := model.TaGoods{}
 	if err := c.ParseForm(&gds); err != nil {
 		utils.LogError("接收商品参数失败: " + err.Error())
-		c.ResponseError(errors.New("接收商品参数失败"))
+		c.ResponseError(errors.New("接收商品参数失败1"))
 	}
 
 	// 图片
@@ -91,7 +91,7 @@ func (c *GoodsController) UpdateGoods() {
 	specsJSON := c.GetString("specs")
 	if err := json.Unmarshal([]byte(specsJSON), &specs); err != nil {
 		utils.LogError("接收商品参数失败: " + err.Error())
-		c.ResponseError(errors.New("接收商品参数失败"))
+		c.ResponseError(errors.New("接收商品参数失败2"))
 	}
 
 	goodsID := c.GetString(":id")

models/goods/goods.go

@@ -5,6 +5,8 @@ import (
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/yl10/kit/guid"
@@ -32,43 +34,49 @@ func (m *GoodsDAO) GetGoodsListPageNavi(name, typeID, caseID string, limit []int
 	sql := `
 		SELECT *
 		FROM
-			ta_goods t
+			ta_goods
 		WHERE
-			t.case_id = ?
+			case_id in ('` + strings.Replace(caseID, ",", "','", -1) + `')
 	`
 
 	if name != "" {
 		sql += `
-			AND LOWER(t.goods_name) LIKE '%` + name + `%'
+			AND goods_name LIKE '%` + name + `%'
 		`
 	}
 
 	if typeID != "" {
 		sql += `
-			AND t.type_id = '` + typeID + `'
+			AND type_id = '` + typeID + `'
 		`
 	}
 
 	sql += `		
-		AND t.status > ?
+		AND status > ` + strconv.Itoa(models.STATUS_DEL) + `
 		ORDER BY
-			t.type_id,
-			t.create_date
+			type_id,
+			create_date
 	`
 
+	// sql += ` limit ` + strconv.Itoa(limit[0]) + ` OFFSET ` + strconv.Itoa(limit[1])
+
 	var goodsList []GoodsWithSpec
-	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&goodsList, sql, limit, caseID, models.STATUS_DEL)
+	cnt, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&goodsList, sql, limit)
 	if err != nil {
 		return nil, 0, err
 	}
-
 	for inx, goods := range goodsList {
 		specs, err := m.GetSpecWithPrice(goods.GoodsId)
 		if err != nil {
 			return nil, 0, err
 		}
-
 		goodsList[inx].Specs = specs
+
+		imgs, err := m.GetGoodsImgByGoodsID(goods.GoodsId)
+		if err != nil {
+			return nil, 0, err
+		}
+		goodsList[inx].Images = imgs
 	}
 
 	return goodsList, cnt, nil
@@ -98,9 +106,9 @@ func (m *GoodsDAO) GetGoodsListOfCase(caseID string) ([]GoodsWithSpec, error) {
 
 // GetSpecWithPrice 获取商品规格 含 金额
 func (m *GoodsDAO) GetSpecWithPrice(goodsID string) ([]SpecWithPrice, error) {
-	sql := `SELECT * FROM td_spec t
+	sql := `SELECT t.*,s.goods_price FROM td_spec t
 		JOIN ta_goods_spec s ON t.spec_id = s.spec_id
-		WHERE t.status = ? AND s.goods_id = ?
+		WHERE t.status > ? AND s.goods_id = ?
 	`
 
 	var specs []SpecWithPrice
@@ -162,9 +170,15 @@ func (m *GoodsDAO) GetGoodsWithSpecByID(id string) (*GoodsWithSpec, error) {
 		return nil, err
 	}
 
+	imgs, err := m.GetGoodsImgByGoodsID(id)
+	if err != nil {
+		return nil, err
+	}
+
 	return &GoodsWithSpec{
 		TaGoods: *goods,
 		Specs:   specs,
+		Images:  imgs,
 	}, nil
 }
 
@@ -293,3 +307,10 @@ func (m *GoodsDAO) DeleteGoods(id string) error {
 
 	return nil
 }
+
+// GetGoodsImgByGoodsID 根据商品ID获取商品图片信息
+func (m *GoodsDAO) GetGoodsImgByGoodsID(goodsid string) ([]model.TaGoodsImg, error) {
+	var goodsimg []model.TaGoodsImg
+	err := m.db.Where("goods_id=?", goodsid).Find(&goodsimg)
+	return goodsimg, err
+}

models/goods/types.go

@@ -14,20 +14,21 @@ const (
 
 // SpecWithPrice 规格价格
 type SpecWithPrice struct {
-	model.TdSpec `xorm."extends"`
+	model.TdSpec `xorm:"extends"`
 	GoodsPrice   string `xorm:"DECIMAL(8,2)"`
 }
 
 // GoodsWithSpec 含规格商品
 type GoodsWithSpec struct {
-	model.TaGoods `xorm."extends"`
+	model.TaGoods `xorm:"extends"`
 	Specs         []SpecWithPrice
+	Images        []model.TaGoodsImg
 }
 
 // GoodsWithPrice 含规格商品
 type GoodsWithPrice struct {
-	model.TaGoods     `xorm."extends"`
-	model.TaGoodsSpec `xorm."extends"`
+	model.TaGoods     `xorm:"extends"`
+	model.TaGoodsSpec `xorm:"extends"`
 }
 
 // OrdersWithGoods 订单列表

routers/common.go

@@ -185,10 +185,10 @@ func getCommonRoutes() beego.LinkNamespace {
 
 		// 商品
 		beego.NSRouter("/goods", &goods.GoodsController{}, "get:GetListByCase"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "get:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "get:GetGoodsByID"),
 		beego.NSRouter("/goods", &goods.GoodsController{}, "post:UpdateGoods"),
 		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "put:UpdateGoods"),
-		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:UpdateGoods"),
+		beego.NSRouter("/goods/:id", &goods.GoodsController{}, "delete:DeleteGoods"),
 
 		// 商品订单
 		beego.NSRouter("/order/goods", &goods.GoodsController{}, "get:GetOrderList"),