完善定价与套餐关联表结构

web/handlers/product.go

@@ -158,6 +158,25 @@ func UpdateProductSku(c *fiber.Ctx) error {
 	return nil
 }
 
+func BatchUpdateProductSkuDiscount(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductSkuWrite)
+	if err != nil {
+		return err
+	}
+
+	var req s.BatchUpdateSkuDiscountData
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	err = s.ProductSku.BatchUpdateDiscount(req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func DeleteProductSku(c *fiber.Ctx) error {
 	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductSkuWrite)
 	if err != nil {

web/handlers/product_discount.go

@@ -0,0 +1,105 @@
+package handlers
+
+import (
+	"platform/web/auth"
+	"platform/web/core"
+	g "platform/web/globals"
+	s "platform/web/services"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func PageProductDiscountByAdmin(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductDiscountRead)
+	if err != nil {
+		return err
+	}
+
+	var req core.PageReq
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	list, total, err := s.ProductDiscount.Page(&req)
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(core.PageResp{
+		Total: int(total),
+		Page:  req.GetPage(),
+		Size:  req.GetSize(),
+		List:  list,
+	})
+}
+
+func AllProductDiscountsByAdmin(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductDiscountRead)
+	if err != nil {
+		return err
+	}
+
+	list, err := s.ProductDiscount.All()
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(list)
+}
+
+func CreateProductDiscount(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductDiscountWrite)
+	if err != nil {
+		return err
+	}
+
+	var req s.CreateProductDiscountData
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	err = s.ProductDiscount.Create(req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func UpdateProductDiscount(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductDiscountWrite)
+	if err != nil {
+		return err
+	}
+
+	var req s.UpdateProductDiscountData
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	err = s.ProductDiscount.Update(req)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func DeleteProductDiscount(c *fiber.Ctx) error {
+	_, err := auth.GetAuthCtx(c).PermitAdmin(core.ScopeProductDiscountWrite)
+	if err != nil {
+		return err
+	}
+
+	var req core.IdReq
+	if err := g.Validator.ParseBody(c, &req); err != nil {
+		return err
+	}
+
+	err = s.ProductDiscount.Delete(req.Id)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

web/handlers/resource.go

@@ -70,7 +70,7 @@ func PageResourceShort(c *fiber.Ctx) error {
 	}
 
 	resource, err := q.Resource.Where(do).
-		Joins(q.Resource.Short).
+		Joins(q.Resource.Short, q.ResourceShort.Sku).
 		Order(q.Resource.CreatedAt.Desc()).
 		Offset(req.GetOffset()).
 		Limit(req.GetLimit()).
@@ -615,7 +615,7 @@ func ResourcePrice(c *fiber.Ctx) error {
 	// 计算折扣
 	return c.JSON(ResourcePriceResp{
 		Price:           before.StringFixed(2),
-		Discounted:      sku.Discount,
+		Discounted:      float32(sku.Discount.Discount) / 100,
 		DiscountedPrice: after.StringFixed(2),
 	})
 }