新功能(#79): 实现促销管理接口并支持数量配价

Co-authored-by: multica-agent <github@multica.ai>

apis/admin/promo.api

@@ -0,0 +1,121 @@
+syntax = "v1"
+
+info (
+	title:   "promo admin API"
+	desc:    "API for ppanel"
+	author:  "Tension"
+	email:   "tension@ppanel.com"
+	version: "0.0.1"
+)
+
+import "../types.api"
+
+type (
+	CreatePromoRuleRequest {
+		Name      string                 `json:"name" validate:"required,max=100"`
+		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
+		Params    map[string]interface{} `json:"params"`
+		Priority  int64                  `json:"priority" validate:"gte=0"`
+		Enabled   *bool                  `json:"enabled"`
+		StartTime *int64                 `json:"start_time"`
+		EndTime   *int64                 `json:"end_time"`
+	}
+	UpdatePromoRuleRequest {
+		Id        int64                  `uri:"id" validate:"required,gt=0"`
+		Name      string                 `json:"name" validate:"required,max=100"`
+		Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
+		Params    map[string]interface{} `json:"params"`
+		Priority  int64                  `json:"priority" validate:"gte=0"`
+		Enabled   *bool                  `json:"enabled"`
+		StartTime *int64                 `json:"start_time"`
+		EndTime   *int64                 `json:"end_time"`
+	}
+	GetPromoRuleDetailRequest {
+		Id int64 `uri:"id" validate:"required,gt=0"`
+	}
+	DeletePromoRuleRequest {
+		Id int64 `uri:"id" validate:"required,gt=0"`
+	}
+	GetPromoRuleListRequest {
+		Page    int64  `form:"page" validate:"required"`
+		Size    int64  `form:"size" validate:"required"`
+		Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
+		Enabled *bool  `form:"enabled"`
+		Search  string `form:"search,omitempty"`
+	}
+	GetPromoRuleListResponse {
+		Total int64       `json:"total"`
+		List  []PromoRule `json:"list"`
+	}
+	SetPromoPriceRequest {
+		PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
+		Items       []PromoPriceItem `json:"items" validate:"required,dive"`
+	}
+	GetPromoPriceListRequest {
+		PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
+		Page        int64 `form:"page" validate:"required"`
+		Size        int64 `form:"size" validate:"required"`
+	}
+	GetPromoPriceListResponse {
+		Total int64        `json:"total"`
+		List  []PromoPrice `json:"list"`
+	}
+	DeletePromoPriceRequest {
+		Id int64 `uri:"id" validate:"required,gt=0"`
+	}
+	GetPromoUsageListRequest {
+		Page        int64  `form:"page" validate:"required"`
+		Size        int64  `form:"size" validate:"required"`
+		RuleId      int64  `form:"rule_id,omitempty"`
+		UserId      int64  `form:"user_id,omitempty"`
+		SubscribeId int64  `form:"subscribe_id,omitempty"`
+		OrderNo     string `form:"order_no,omitempty"`
+	}
+	GetPromoUsageListResponse {
+		Total int64        `json:"total"`
+		List  []PromoUsage `json:"list"`
+	}
+)
+
+@server (
+	prefix:     v1/admin/promo
+	group:      admin/promo
+	middleware: AuthMiddleware
+)
+service ppanel {
+	@doc "Create promo rule"
+	@handler CreateRule
+	post /rule (CreatePromoRuleRequest) returns (PromoRule)
+
+	@doc "Get promo rule list"
+	@handler GetRuleList
+	get /rule/list (GetPromoRuleListRequest) returns (GetPromoRuleListResponse)
+
+	@doc "Get promo rule detail"
+	@handler GetRuleDetail
+	get /rule/:id (GetPromoRuleDetailRequest) returns (PromoRule)
+
+	@doc "Update promo rule"
+	@handler UpdateRule
+	put /rule/:id (UpdatePromoRuleRequest) returns (PromoRule)
+
+	@doc "Delete promo rule"
+	@handler DeleteRule
+	delete /rule/:id (DeletePromoRuleRequest)
+
+	@doc "Set promo prices"
+	@handler SetPrice
+	post /price (SetPromoPriceRequest)
+
+	@doc "Get promo price list"
+	@handler GetPriceList
+	get /price/list (GetPromoPriceListRequest) returns (GetPromoPriceListResponse)
+
+	@doc "Delete promo price"
+	@handler DeletePrice
+	delete /price/:id (DeletePromoPriceRequest)
+
+	@doc "Get promo usage list"
+	@handler GetUsageList
+	get /usage/list (GetPromoUsageListRequest) returns (GetPromoUsageListResponse)
+}

apis/types.api

@@ -230,11 +230,40 @@ type (
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
 	}
-	SubscribePromo {
-		RuleName   string `json:"rule_name"`
-		RuleType   string `json:"rule_type"`
+	PromoPrice {
+		Id          int64 `json:"id"`
+		SubscribeId int64 `json:"subscribe_id"`
+		PromoRuleId int64 `json:"promo_rule_id"`
+		Quantity    int64 `json:"quantity"`
 		PromoPrice  int64 `json:"promo_price"`
-		ExpiresAt  int64  `json:"expires_at"`
+		CreatedAt   int64 `json:"created_at"`
+		UpdatedAt   int64 `json:"updated_at"`
+	}
+	PromoPriceItem {
+		SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
+		Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
+		PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
+	}
+	PromoRule {
+		Id        int64                  `json:"id"`
+		Name      string                 `json:"name"`
+		Type      string                 `json:"type"`
+		Params    map[string]interface{} `json:"params"`
+		Priority  int64                  `json:"priority"`
+		Enabled   bool                   `json:"enabled"`
+		StartTime *int64                 `json:"start_time"`
+		EndTime   *int64                 `json:"end_time"`
+		CreatedAt int64                  `json:"created_at"`
+		UpdatedAt int64                  `json:"updated_at"`
+	}
+	PromoUsage {
+		Id          int64  `json:"id"`
+		UserId      int64  `json:"user_id"`
+		PromoRuleId int64  `json:"promo_rule_id"`
+		SubscribeId int64  `json:"subscribe_id"`
+		OrderNo     string `json:"order_no"`
+		PromoPrice  int64  `json:"promo_price"`
+		CreatedAt   int64  `json:"created_at"`
 	}
 	TrafficLimit {
 		StatType     string `json:"stat_type"`
@@ -250,7 +279,6 @@ type (
 		UnitPrice         int64               `json:"unit_price"`
 		UnitTime          string              `json:"unit_time"`
 		Discount          []SubscribeDiscount `json:"discount"`
-		Promo             *SubscribePromo     `json:"promo"`
 		NodeCount         int64               `json:"node_count"`
 		Replacement       int64               `json:"replacement"`
 		Inventory         int64               `json:"inventory"`
@@ -715,7 +743,6 @@ type (
 		Price          int64  `json:"price"`
 		Amount         int64  `json:"amount"`
 		Discount       int64  `json:"discount"`
-		PromoDiscount  int64  `json:"promo_discount"`
 		GiftAmount     int64  `json:"gift_amount"`
 		Coupon         string `json:"coupon"`
 		CouponDiscount int64  `json:"coupon_discount"`

initialize/migrate/database/02154_promo_admin_api.down.sql

@@ -0,0 +1,3 @@
+DROP TABLE IF EXISTS `promo_usage`;
+DROP TABLE IF EXISTS `subscribe_promo`;
+DROP TABLE IF EXISTS `promo_rule`;

initialize/migrate/database/02154_promo_admin_api.up.sql

@@ -11,7 +11,8 @@ CREATE TABLE IF NOT EXISTS `promo_rule` (
   `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `deleted_at` DATETIME DEFAULT NULL COMMENT '软删除时间',
   PRIMARY KEY (`id`),
-  KEY `idx_enabled_priority_deleted` (`enabled`, `deleted_at`, `priority` DESC)
+  KEY `idx_enabled_priority` (`enabled`, `priority` DESC),
+  KEY `idx_deleted_at` (`deleted_at`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销规则表';
 
 CREATE TABLE IF NOT EXISTS `subscribe_promo` (
@@ -19,19 +20,19 @@ CREATE TABLE IF NOT EXISTS `subscribe_promo` (
   `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
   `quantity` INT NOT NULL DEFAULT 0 COMMENT '购买数量',
   `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
-  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '该规格在此规则下的优惠价（分）',
+  `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '优惠价（分）',
   `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_subscribe_qty_rule` (`subscribe_id`, `quantity`, `promo_rule_id`),
+  UNIQUE KEY `idx_subscribe_qty_rule` (`subscribe_id`, `quantity`, `promo_rule_id`),
   KEY `idx_promo_rule_id` (`promo_rule_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规格促销价表';
 
 CREATE TABLE IF NOT EXISTS `promo_usage` (
   `id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `user_id` BIGINT UNSIGNED NOT NULL COMMENT '用户 ID',
-  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '使用的规则 ID',
-  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '购买的规格 ID',
+  `promo_rule_id` BIGINT UNSIGNED NOT NULL COMMENT '促销规则 ID',
+  `subscribe_id` BIGINT UNSIGNED NOT NULL COMMENT '套餐规格 ID',
   `order_no` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '关联订单号',
   `promo_price` BIGINT NOT NULL DEFAULT 0 COMMENT '使用时的促销单价（分）',
   `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -39,39 +40,3 @@ CREATE TABLE IF NOT EXISTS `promo_usage` (
   KEY `idx_user_rule` (`user_id`, `promo_rule_id`),
   KEY `idx_order_no` (`order_no`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='促销使用记录表';
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_rule_id'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `order` ADD COLUMN `promo_rule_id` BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT ''促销规则ID, 0=未使用促销'' AFTER `discount`',
-  'SELECT ''Column promo_rule_id already exists in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_discount'
-);
-
-SET @sql = IF(
-  @column_exists = 0,
-  'ALTER TABLE `order` ADD COLUMN `promo_discount` BIGINT NOT NULL DEFAULT 0 COMMENT ''促销优惠金额(分)'' AFTER `promo_rule_id`',
-  'SELECT ''Column promo_discount already exists in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;

initialize/migrate/database/02154_promo_system.down.sql

@@ -1,39 +0,0 @@
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_discount'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `order` DROP COLUMN `promo_discount`',
-  'SELECT ''Column promo_discount does not exist in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-SET @column_exists = (
-  SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE TABLE_SCHEMA = DATABASE()
-    AND TABLE_NAME = 'order'
-    AND COLUMN_NAME = 'promo_rule_id'
-);
-
-SET @sql = IF(
-  @column_exists = 1,
-  'ALTER TABLE `order` DROP COLUMN `promo_rule_id`',
-  'SELECT ''Column promo_rule_id does not exist in order table'''
-);
-
-PREPARE stmt FROM @sql;
-EXECUTE stmt;
-DEALLOCATE PREPARE stmt;
-
-DROP TABLE IF EXISTS `promo_usage`;
-DROP TABLE IF EXISTS `subscribe_promo`;
-DROP TABLE IF EXISTS `promo_rule`;

internal/handler/admin/promo/createRuleHandler.go

@@ -0,0 +1,23 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func CreateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.CreatePromoRuleRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewCreateRuleLogic(c.Request.Context(), svcCtx)
+		resp, err := l.CreateRule(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/admin/promo/deletePriceHandler.go

@@ -0,0 +1,26 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func DeletePriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.DeletePromoPriceRequest
+		if err := c.ShouldBindUri(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewDeletePriceLogic(c.Request.Context(), svcCtx)
+		err := l.DeletePrice(&req)
+		result.HttpResult(c, nil, err)
+	}
+}

internal/handler/admin/promo/deleteRuleHandler.go

@@ -0,0 +1,26 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func DeleteRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.DeletePromoRuleRequest
+		if err := c.ShouldBindUri(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewDeleteRuleLogic(c.Request.Context(), svcCtx)
+		err := l.DeleteRule(&req)
+		result.HttpResult(c, nil, err)
+	}
+}

internal/handler/admin/promo/getPriceListHandler.go

@@ -0,0 +1,23 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func GetPriceListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.GetPromoPriceListRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewGetPriceListLogic(c.Request.Context(), svcCtx)
+		resp, err := l.GetPriceList(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/admin/promo/getRuleDetailHandler.go

@@ -0,0 +1,26 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func GetRuleDetailHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.GetPromoRuleDetailRequest
+		if err := c.ShouldBindUri(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewGetRuleDetailLogic(c.Request.Context(), svcCtx)
+		resp, err := l.GetRuleDetail(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/admin/promo/getRuleListHandler.go

@@ -0,0 +1,23 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func GetRuleListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.GetPromoRuleListRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewGetRuleListLogic(c.Request.Context(), svcCtx)
+		resp, err := l.GetRuleList(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/admin/promo/getUsageListHandler.go

@@ -0,0 +1,23 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func GetUsageListHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.GetPromoUsageListRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewGetUsageListLogic(c.Request.Context(), svcCtx)
+		resp, err := l.GetUsageList(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/admin/promo/setPriceHandler.go

@@ -0,0 +1,23 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func SetPriceHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.SetPromoPriceRequest
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewSetPriceLogic(c.Request.Context(), svcCtx)
+		err := l.SetPrice(&req)
+		result.HttpResult(c, nil, err)
+	}
+}

internal/handler/admin/promo/updateRuleHandler.go

@@ -0,0 +1,27 @@
+package promo
+
+import (
+	"github.com/gin-gonic/gin"
+	"github.com/perfect-panel/server/internal/logic/admin/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/result"
+)
+
+func UpdateRuleHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
+	return func(c *gin.Context) {
+		var req types.UpdatePromoRuleRequest
+		if err := c.ShouldBindUri(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		_ = c.ShouldBind(&req)
+		if err := svcCtx.Validate(&req); err != nil {
+			result.ParamErrorResult(c, err)
+			return
+		}
+		l := promo.NewUpdateRuleLogic(c.Request.Context(), svcCtx)
+		resp, err := l.UpdateRule(&req)
+		result.HttpResult(c, resp, err)
+	}
+}

internal/handler/routes.go

@@ -17,6 +17,7 @@ import (
 	adminMarketing "github.com/perfect-panel/server/internal/handler/admin/marketing"
 	adminOrder "github.com/perfect-panel/server/internal/handler/admin/order"
 	adminPayment "github.com/perfect-panel/server/internal/handler/admin/payment"
+	adminPromo "github.com/perfect-panel/server/internal/handler/admin/promo"
 	adminRedemption "github.com/perfect-panel/server/internal/handler/admin/redemption"
 	adminServer "github.com/perfect-panel/server/internal/handler/admin/server"
 	adminSubscribe "github.com/perfect-panel/server/internal/handler/admin/subscribe"
@@ -374,6 +375,38 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 		adminPaymentGroupRouter.GET("/platform", adminPayment.GetPaymentPlatformHandler(serverCtx))
 	}
 
+	adminPromoGroupRouter := router.Group("/v1/admin/promo")
+	adminPromoGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
+
+	{
+		// Create promo rule
+		adminPromoGroupRouter.POST("/rule", adminPromo.CreateRuleHandler(serverCtx))
+
+		// Get promo rule list
+		adminPromoGroupRouter.GET("/rule/list", adminPromo.GetRuleListHandler(serverCtx))
+
+		// Get promo rule detail
+		adminPromoGroupRouter.GET("/rule/:id", adminPromo.GetRuleDetailHandler(serverCtx))
+
+		// Update promo rule
+		adminPromoGroupRouter.PUT("/rule/:id", adminPromo.UpdateRuleHandler(serverCtx))
+
+		// Delete promo rule
+		adminPromoGroupRouter.DELETE("/rule/:id", adminPromo.DeleteRuleHandler(serverCtx))
+
+		// Set promo prices
+		adminPromoGroupRouter.POST("/price", adminPromo.SetPriceHandler(serverCtx))
+
+		// Get promo price list
+		adminPromoGroupRouter.GET("/price/list", adminPromo.GetPriceListHandler(serverCtx))
+
+		// Delete promo price
+		adminPromoGroupRouter.DELETE("/price/:id", adminPromo.DeletePriceHandler(serverCtx))
+
+		// Get promo usage list
+		adminPromoGroupRouter.GET("/usage/list", adminPromo.GetUsageListHandler(serverCtx))
+	}
+
 	adminRedemptionGroupRouter := router.Group("/v1/admin/redemption")
 	adminRedemptionGroupRouter.Use(middleware.AuthMiddleware(serverCtx))
 
@@ -978,16 +1011,17 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
 	}
 
 	publicSubscribeGroupRouter := router.Group("/v1/public/subscribe")
+	publicSubscribeGroupRouter.Use(middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx))
 
 	{
 		// Get subscribe list
-		publicSubscribeGroupRouter.GET("/list", middleware.OptionalAuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/list", publicSubscribe.QuerySubscribeListHandler(serverCtx))
 
 		// Get user subscribe node info
-		publicSubscribeGroupRouter.GET("/node/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/node/list", publicSubscribe.QueryUserSubscribeNodeListHandler(serverCtx))
 
 		// Get subscribe group list
-		publicSubscribeGroupRouter.GET("/group/list", middleware.AuthMiddleware(serverCtx), middleware.DeviceMiddleware(serverCtx), publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
+		publicSubscribeGroupRouter.GET("/group/list", publicSubscribe.QuerySubscribeGroupListHandler(serverCtx))
 	}
 
 	publicTicketGroupRouter := router.Group("/v1/public/ticket")

internal/logic/admin/application/deleteSubscribeApplicationLogic.go

@@ -29,7 +29,7 @@ func (l *DeleteSubscribeApplicationLogic) DeleteSubscribeApplication(req *types.
 	err := l.svcCtx.ClientModel.Delete(l.ctx, req.Id)
 	if err != nil {
 		l.Errorf("Failed to delete subscribe application with ID %d: %v", req.Id, err)
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/promo/createRuleLogic.go

@@ -0,0 +1,58 @@
+package promo
+
+import (
+	"context"
+
+	promomodel "github.com/perfect-panel/server/internal/model/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type CreateRuleLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCreateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateRuleLogic {
+	return &CreateRuleLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CreateRuleLogic) CreateRule(req *types.CreatePromoRuleRequest) (*types.PromoRule, error) {
+	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
+		return nil, err
+	}
+	params, err := paramsToString(req.Params)
+	if err != nil {
+		return nil, err
+	}
+	enabled := true
+	if req.Enabled != nil {
+		enabled = *req.Enabled
+	}
+	rule := &promomodel.Rule{
+		Name:      req.Name,
+		Type:      req.Type,
+		Params:    params,
+		Priority:  req.Priority,
+		Enabled:   &enabled,
+		StartTime: unixPtrToTimePtr(req.StartTime),
+		EndTime:   unixPtrToTimePtr(req.EndTime),
+	}
+	if err := l.svcCtx.PromoModel.InsertRule(l.ctx, rule); err != nil {
+		l.Errorw("[CreatePromoRule] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), "create promo rule error: %v", err.Error())
+	}
+	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
+		l.Errorw("[CreatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
+	}
+	resp := convertRule(rule)
+	return &resp, nil
+}

internal/logic/admin/promo/deletePriceLogic.go

@@ -0,0 +1,41 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type DeletePriceLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewDeletePriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeletePriceLogic {
+	return &DeletePriceLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *DeletePriceLogic) DeletePrice(req *types.DeletePromoPriceRequest) error {
+	price, err := l.svcCtx.PromoModel.FindPrice(l.ctx, req.Id)
+	if err != nil {
+		l.Errorw("[DeletePromoPrice] Find Price Error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo price error: %v", err.Error())
+	}
+	if err := l.svcCtx.PromoModel.DeletePrice(l.ctx, req.Id); err != nil {
+		l.Errorw("[DeletePromoPrice] Database Error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo price error: %v", err.Error())
+	}
+	if err := l.svcCtx.Redis.Del(l.ctx, subscribePromoCacheKey(price.SubscribeId)).Err(); err != nil {
+		l.Errorw("[DeletePromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
+	}
+	return nil
+}

internal/logic/admin/promo/deleteRuleLogic.go

@@ -0,0 +1,36 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type DeleteRuleLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewDeleteRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteRuleLogic {
+	return &DeleteRuleLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *DeleteRuleLogic) DeleteRule(req *types.DeletePromoRuleRequest) error {
+	if err := l.svcCtx.PromoModel.DeleteRule(l.ctx, req.Id); err != nil {
+		l.Errorw("[DeletePromoRule] Database Error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseDeletedError), "delete promo rule error: %v", err.Error())
+	}
+	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
+		l.Errorw("[DeletePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
+	}
+	return nil
+}

internal/logic/admin/promo/getPriceListLogic.go

@@ -0,0 +1,41 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetPriceListLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetPriceListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetPriceListLogic {
+	return &GetPriceListLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetPriceListLogic) GetPriceList(req *types.GetPromoPriceListRequest) (*types.GetPromoPriceListResponse, error) {
+	total, list, err := l.svcCtx.PromoModel.QueryPriceList(l.ctx, req.PromoRuleId, int(req.Page), int(req.Size))
+	if err != nil {
+		l.Errorw("[GetPromoPriceList] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo price list error: %v", err.Error())
+	}
+	resp := &types.GetPromoPriceListResponse{
+		Total: total,
+		List:  make([]types.PromoPrice, 0, len(list)),
+	}
+	for _, item := range list {
+		resp.List = append(resp.List, convertPrice(item))
+	}
+	return resp, nil
+}

internal/logic/admin/promo/getRuleDetailLogic.go

@@ -0,0 +1,35 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetRuleDetailLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetRuleDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleDetailLogic {
+	return &GetRuleDetailLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetRuleDetailLogic) GetRuleDetail(req *types.GetPromoRuleDetailRequest) (*types.PromoRule, error) {
+	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
+	if err != nil {
+		l.Errorw("[GetPromoRuleDetail] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule detail error: %v", err.Error())
+	}
+	resp := convertRule(rule)
+	return &resp, nil
+}

internal/logic/admin/promo/getRuleListLogic.go

@@ -0,0 +1,41 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetRuleListLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetRuleListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetRuleListLogic {
+	return &GetRuleListLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetRuleListLogic) GetRuleList(req *types.GetPromoRuleListRequest) (*types.GetPromoRuleListResponse, error) {
+	total, list, err := l.svcCtx.PromoModel.QueryRuleList(l.ctx, int(req.Page), int(req.Size), req.Type, req.Enabled, req.Search)
+	if err != nil {
+		l.Errorw("[GetPromoRuleList] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo rule list error: %v", err.Error())
+	}
+	resp := &types.GetPromoRuleListResponse{
+		Total: total,
+		List:  make([]types.PromoRule, 0, len(list)),
+	}
+	for _, item := range list {
+		resp.List = append(resp.List, convertRule(item))
+	}
+	return resp, nil
+}

internal/logic/admin/promo/getUsageListLogic.go

@@ -0,0 +1,49 @@
+package promo
+
+import (
+	"context"
+
+	promomodel "github.com/perfect-panel/server/internal/model/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type GetUsageListLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetUsageListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUsageListLogic {
+	return &GetUsageListLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetUsageListLogic) GetUsageList(req *types.GetPromoUsageListRequest) (*types.GetPromoUsageListResponse, error) {
+	total, list, err := l.svcCtx.PromoModel.QueryUsageList(l.ctx, promomodel.UsageFilter{
+		Page:        int(req.Page),
+		Size:        int(req.Size),
+		RuleId:      req.RuleId,
+		UserId:      req.UserId,
+		SubscribeId: req.SubscribeId,
+		OrderNo:     req.OrderNo,
+	})
+	if err != nil {
+		l.Errorw("[GetPromoUsageList] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "get promo usage list error: %v", err.Error())
+	}
+	resp := &types.GetPromoUsageListResponse{
+		Total: total,
+		List:  make([]types.PromoUsage, 0, len(list)),
+	}
+	for _, item := range list {
+		resp.List = append(resp.List, convertUsage(item))
+	}
+	return resp, nil
+}

internal/logic/admin/promo/setPriceLogic.go

@@ -0,0 +1,67 @@
+package promo
+
+import (
+	"context"
+
+	promomodel "github.com/perfect-panel/server/internal/model/promo"
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+	"gorm.io/gorm"
+)
+
+type SetPriceLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewSetPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SetPriceLogic {
+	return &SetPriceLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *SetPriceLogic) SetPrice(req *types.SetPromoPriceRequest) error {
+	if _, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.PromoRuleId); err != nil {
+		l.Errorw("[SetPromoPrice] Find Rule Error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
+	}
+	items := make([]*promomodel.SubscribePromo, 0, len(req.Items))
+	cacheKeys := make([]string, 0, len(req.Items))
+	for _, item := range req.Items {
+		sub, err := l.svcCtx.SubscribeModel.FindOne(l.ctx, item.SubscribeId)
+		if err != nil {
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "subscribe plan not found")
+			}
+			l.Errorw("[SetPromoPrice] Find Subscribe Error", logger.Field("error", err.Error()))
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find subscribe error: %v", err.Error())
+		}
+		originPrice := sub.UnitPrice * item.Quantity
+		if item.PromoPrice >= originPrice {
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "promo_price must be less than unit_price * quantity")
+		}
+		items = append(items, &promomodel.SubscribePromo{
+			SubscribeId: item.SubscribeId,
+			PromoRuleId: req.PromoRuleId,
+			Quantity:    item.Quantity,
+			PromoPrice:  item.PromoPrice,
+		})
+		cacheKeys = append(cacheKeys, subscribePromoCacheKey(item.SubscribeId))
+	}
+	if err := l.svcCtx.PromoModel.UpsertPrices(l.ctx, req.PromoRuleId, items); err != nil {
+		l.Errorw("[SetPromoPrice] Database Error", logger.Field("error", err.Error()))
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "set promo price error: %v", err.Error())
+	}
+	if len(cacheKeys) > 0 {
+		if err := l.svcCtx.Redis.Del(l.ctx, cacheKeys...).Err(); err != nil {
+			l.Errorw("[SetPromoPrice] Delete Cache Error", logger.Field("error", err.Error()))
+		}
+	}
+	return nil
+}

internal/logic/admin/promo/tool.go

@@ -0,0 +1,166 @@
+package promo
+
+import (
+	"encoding/json"
+	"fmt"
+	"math"
+	"time"
+
+	promomodel "github.com/perfect-panel/server/internal/model/promo"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+const (
+	ruleCacheKey       = "promo:rules:enabled"
+	subscribeCachePref = "promo:subscribe:"
+)
+
+func validateRuleInput(ruleType string, params map[string]interface{}, priority int64, startTime, endTime *int64) error {
+	if priority < 0 {
+		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "priority must be greater than or equal to 0")
+	}
+	if startTime != nil && endTime != nil && *startTime >= *endTime {
+		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "start_time must be less than end_time")
+	}
+	switch ruleType {
+	case "new_user":
+		windowHours, ok := numberParam(params, "window_hours")
+		if !ok || windowHours <= 0 {
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.window_hours must be greater than 0")
+		}
+	case "inactive_user":
+		inactiveMonths, ok := numberParam(params, "inactive_months")
+		if !ok || inactiveMonths <= 0 {
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "params.inactive_months must be greater than 0")
+		}
+	case "campaign":
+		if params == nil {
+			return nil
+		}
+	default:
+		return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "unsupported promo rule type")
+	}
+	return nil
+}
+
+func numberParam(params map[string]interface{}, key string) (int64, bool) {
+	if params == nil {
+		return 0, false
+	}
+	value, ok := params[key]
+	if !ok {
+		return 0, false
+	}
+	switch v := value.(type) {
+	case float64:
+		if math.Trunc(v) != v {
+			return 0, false
+		}
+		return int64(v), true
+	case int64:
+		return v, true
+	case int:
+		return int64(v), true
+	case json.Number:
+		n, err := v.Int64()
+		return n, err == nil
+	default:
+		return 0, false
+	}
+}
+
+func paramsToString(params map[string]interface{}) (string, error) {
+	if params == nil {
+		params = map[string]interface{}{}
+	}
+	b, err := json.Marshal(params)
+	if err != nil {
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "invalid params")
+	}
+	return string(b), nil
+}
+
+func parseParams(data string) map[string]interface{} {
+	if data == "" {
+		return map[string]interface{}{}
+	}
+	var params map[string]interface{}
+	if err := json.Unmarshal([]byte(data), &params); err != nil {
+		return map[string]interface{}{}
+	}
+	return params
+}
+
+func unixPtrToTimePtr(ts *int64) *time.Time {
+	if ts == nil || *ts == 0 {
+		return nil
+	}
+	t := time.Unix(*ts, 0)
+	return &t
+}
+
+func timePtrToUnixPtr(t *time.Time) *int64 {
+	if t == nil {
+		return nil
+	}
+	ts := t.Unix()
+	return &ts
+}
+
+func convertRule(item *promomodel.Rule) types.PromoRule {
+	if item == nil {
+		return types.PromoRule{}
+	}
+	enabled := false
+	if item.Enabled != nil {
+		enabled = *item.Enabled
+	}
+	return types.PromoRule{
+		Id:        item.Id,
+		Name:      item.Name,
+		Type:      item.Type,
+		Params:    parseParams(item.Params),
+		Priority:  item.Priority,
+		Enabled:   enabled,
+		StartTime: timePtrToUnixPtr(item.StartTime),
+		EndTime:   timePtrToUnixPtr(item.EndTime),
+		CreatedAt: item.CreatedAt.Unix(),
+		UpdatedAt: item.UpdatedAt.Unix(),
+	}
+}
+
+func convertPrice(item *promomodel.SubscribePromo) types.PromoPrice {
+	if item == nil {
+		return types.PromoPrice{}
+	}
+	return types.PromoPrice{
+		Id:          item.Id,
+		SubscribeId: item.SubscribeId,
+		PromoRuleId: item.PromoRuleId,
+		Quantity:    item.Quantity,
+		PromoPrice:  item.PromoPrice,
+		CreatedAt:   item.CreatedAt.Unix(),
+		UpdatedAt:   item.UpdatedAt.Unix(),
+	}
+}
+
+func convertUsage(item *promomodel.Usage) types.PromoUsage {
+	if item == nil {
+		return types.PromoUsage{}
+	}
+	return types.PromoUsage{
+		Id:          item.Id,
+		UserId:      item.UserId,
+		PromoRuleId: item.PromoRuleId,
+		SubscribeId: item.SubscribeId,
+		OrderNo:     item.OrderNo,
+		PromoPrice:  item.PromoPrice,
+		CreatedAt:   item.CreatedAt.Unix(),
+	}
+}
+
+func subscribePromoCacheKey(subscribeId int64) string {
+	return fmt.Sprintf("%s%d", subscribeCachePref, subscribeId)
+}

internal/logic/admin/promo/updateRuleLogic.go

@@ -0,0 +1,63 @@
+package promo
+
+import (
+	"context"
+
+	"github.com/perfect-panel/server/internal/svc"
+	"github.com/perfect-panel/server/internal/types"
+	"github.com/perfect-panel/server/pkg/logger"
+	"github.com/perfect-panel/server/pkg/xerr"
+	"github.com/pkg/errors"
+)
+
+type UpdateRuleLogic struct {
+	logger.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewUpdateRuleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateRuleLogic {
+	return &UpdateRuleLogic{
+		Logger: logger.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *UpdateRuleLogic) UpdateRule(req *types.UpdatePromoRuleRequest) (*types.PromoRule, error) {
+	if err := validateRuleInput(req.Type, req.Params, req.Priority, req.StartTime, req.EndTime); err != nil {
+		return nil, err
+	}
+	rule, err := l.svcCtx.PromoModel.FindRule(l.ctx, req.Id)
+	if err != nil {
+		l.Errorw("[UpdatePromoRule] Find Rule Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find promo rule error: %v", err.Error())
+	}
+	params, err := paramsToString(req.Params)
+	if err != nil {
+		return nil, err
+	}
+	enabled := true
+	if rule.Enabled != nil {
+		enabled = *rule.Enabled
+	}
+	if req.Enabled != nil {
+		enabled = *req.Enabled
+	}
+	rule.Name = req.Name
+	rule.Type = req.Type
+	rule.Params = params
+	rule.Priority = req.Priority
+	rule.Enabled = &enabled
+	rule.StartTime = unixPtrToTimePtr(req.StartTime)
+	rule.EndTime = unixPtrToTimePtr(req.EndTime)
+	if err := l.svcCtx.PromoModel.UpdateRule(l.ctx, rule); err != nil {
+		l.Errorw("[UpdatePromoRule] Database Error", logger.Field("error", err.Error()))
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), "update promo rule error: %v", err.Error())
+	}
+	if err := l.svcCtx.Redis.Del(l.ctx, ruleCacheKey).Err(); err != nil {
+		l.Errorw("[UpdatePromoRule] Delete Cache Error", logger.Field("error", err.Error()))
+	}
+	resp := convertRule(rule)
+	return &resp, nil
+}

internal/logic/admin/server/resetSortWithNodeLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithNodeLogic) ResetSortWithNode(req *types.ResetSortRequest)
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }

internal/logic/admin/server/resetSortWithServerLogic.go

@@ -80,7 +80,7 @@ func (l *ResetSortWithServerLogic) ResetSortWithServer(req *types.ResetSortReque
 	})
 	if err != nil {
 		l.Errorw("[NodeSort] Update Database Error: ", logger.Field("error", err.Error()))
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseUpdateError), err.Error())
 	}
 	return nil
 }

internal/logic/common/promoEligibility.go

@@ -1,170 +0,0 @@
-package common
-
-import (
-	"context"
-	"encoding/json"
-	"time"
-
-	"github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/model/user"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-type PromoResult struct {
-	Eligible   bool
-	RuleID     int64
-	RuleName   string
-	RuleType   string
-	PromoPrice int64
-	ExpiresAt  time.Time
-}
-
-type promoRuleParams struct {
-	WindowHours    int `json:"window_hours"`
-	InactiveMonths int `json:"inactive_months"`
-}
-
-func EvaluatePromo(ctx context.Context, svcCtx *svc.ServiceContext, userID int64, subscribeID int64) (*PromoResult, error) {
-	result := &PromoResult{}
-	if svcCtx == nil || svcCtx.PromoModel == nil || svcCtx.DB == nil || userID <= 0 || subscribeID <= 0 {
-		return result, nil
-	}
-
-	rules, err := svcCtx.PromoModel.QueryEligibleRules(ctx, subscribeID)
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo rules failed: %v", err.Error())
-	}
-	if len(rules) == 0 {
-		return result, nil
-	}
-
-	var currentUser user.User
-	now := time.Now()
-	for _, rule := range rules {
-		if rule == nil || !isPromoRuleInTimeWindow(rule, now) {
-			continue
-		}
-		if rule.PromoPrice <= 0 {
-			continue
-		}
-
-		params := promoRuleParams{}
-		if rule.Params != "" {
-			if err = json.Unmarshal([]byte(rule.Params), &params); err != nil {
-				continue
-			}
-		}
-
-		eligible, expiresAt, err := evaluatePromoRule(ctx, svcCtx.DB, rule, params, userID, &currentUser, now)
-		if err != nil {
-			return nil, err
-		}
-		if !eligible {
-			continue
-		}
-
-		return &PromoResult{
-			Eligible:   true,
-			RuleID:     rule.Id,
-			RuleName:   rule.Name,
-			RuleType:   rule.Type,
-			PromoPrice: rule.PromoPrice,
-			ExpiresAt:  expiresAt,
-		}, nil
-	}
-
-	return result, nil
-}
-
-func isPromoRuleInTimeWindow(rule *promo.RuleWithPrice, now time.Time) bool {
-	if rule.StartTime != nil && !rule.StartTime.IsZero() && now.Before(*rule.StartTime) {
-		return false
-	}
-	if rule.EndTime != nil && !rule.EndTime.IsZero() && now.After(*rule.EndTime) {
-		return false
-	}
-	return true
-}
-
-func evaluatePromoRule(
-	ctx context.Context,
-	db *gorm.DB,
-	rule *promo.RuleWithPrice,
-	params promoRuleParams,
-	userID int64,
-	currentUser *user.User,
-	now time.Time,
-) (bool, time.Time, error) {
-	switch rule.Type {
-	case promo.RuleTypeNewUser:
-		return evaluateNewUserPromo(ctx, db, params, userID, currentUser, now)
-	case promo.RuleTypeInactiveUser:
-		return evaluateInactiveUserPromo(ctx, db, params, userID, promoRuleExpiresAt(rule), now)
-	case promo.RuleTypeCampaign:
-		return true, promoRuleExpiresAt(rule), nil
-	default:
-		return false, time.Time{}, nil
-	}
-}
-
-func evaluateNewUserPromo(
-	ctx context.Context,
-	db *gorm.DB,
-	params promoRuleParams,
-	userID int64,
-	currentUser *user.User,
-	now time.Time,
-) (bool, time.Time, error) {
-	if params.WindowHours <= 0 {
-		return false, time.Time{}, nil
-	}
-
-	if currentUser.Id == 0 {
-		if err := db.WithContext(ctx).Model(&user.User{}).Where("id = ?", userID).First(currentUser).Error; err != nil {
-			return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo user failed")
-		}
-	}
-
-	expiresAt := currentUser.CreatedAt.Add(time.Duration(params.WindowHours) * time.Hour)
-	return now.Before(expiresAt), expiresAt, nil
-}
-
-func evaluateInactiveUserPromo(
-	ctx context.Context,
-	db *gorm.DB,
-	params promoRuleParams,
-	userID int64,
-	ruleExpiresAt time.Time,
-	now time.Time,
-) (bool, time.Time, error) {
-	if params.InactiveMonths <= 0 {
-		return false, time.Time{}, nil
-	}
-
-	var lastSub user.Subscribe
-	err := db.WithContext(ctx).
-		Model(&user.Subscribe{}).
-		Where("user_id = ?", userID).
-		Order("expire_time DESC").
-		Limit(1).
-		Take(&lastSub).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return true, ruleExpiresAt, nil
-		}
-		return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo inactive user subscription failed")
-	}
-
-	threshold := now.AddDate(0, -params.InactiveMonths, 0)
-	return lastSub.ExpireTime.Before(threshold) || lastSub.ExpireTime.Equal(threshold), ruleExpiresAt, nil
-}
-
-func promoRuleExpiresAt(rule *promo.RuleWithPrice) time.Time {
-	if rule != nil && rule.EndTime != nil {
-		return *rule.EndTime
-	}
-	return time.Time{}
-}

internal/logic/public/order/preCreateOrderLogic.go

@@ -2,6 +2,7 @@ package order
 
 import (
 	"context"
+	"math"
 
 	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/order"
@@ -114,28 +115,14 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
 	}
 
-	priceResult, err := calculatePurchasePrice(
-		l.ctx,
-		l.svcCtx,
-		u.Id,
-		targetSubscribeID,
-		sub.UnitPrice,
-		req.Quantity,
-		newUserDiscount.Discounts,
-		newUserDiscount.EligibleForDiscount,
-		!isSingleModeRenewal,
-	)
-	if err != nil {
-		l.Errorw("[PreCreateOrder] Promo price calculation error",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id),
-			logger.Field("subscribe_id", targetSubscribeID),
-		)
-		return nil, err
+	var discount float64 = 1
+	if len(newUserDiscount.Discounts) > 0 {
+		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
 	}
-	price := priceResult.OriginalPrice
-	amount := priceResult.PayableBase
-	discountAmount := priceResult.DiscountAmount
+	price := sub.UnitPrice * req.Quantity
+
+	amount := int64(math.Round(float64(price) * discount))
+	discountAmount := price - amount
 	var couponAmount int64
 	if req.Coupon != "" {
 		couponInfo, err := l.svcCtx.CouponModel.FindOneByCode(l.ctx, req.Coupon)
@@ -198,7 +185,6 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		Price:          price,
 		Amount:         amount,
 		Discount:       discountAmount,
-		PromoDiscount:  priceResult.PromoDiscount,
 		GiftAmount:     deductionAmount,
 		Coupon:         req.Coupon,
 		CouponDiscount: couponAmount,

internal/logic/public/order/promoPricing.go

@@ -1,62 +0,0 @@
-package order
-
-import (
-	"context"
-	"math"
-
-	commonLogic "github.com/perfect-panel/server/internal/logic/common"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-)
-
-type orderPriceResult struct {
-	OriginalPrice  int64
-	PayableBase    int64
-	DiscountAmount int64
-	PromoRuleId    int64
-	PromoDiscount  int64
-	PromoPrice     int64
-}
-
-func calculatePurchasePrice(
-	ctx context.Context,
-	svcCtx *svc.ServiceContext,
-	userID int64,
-	subscribeID int64,
-	unitPrice int64,
-	quantity int64,
-	discounts []types.SubscribeDiscount,
-	eligibleForDiscount bool,
-	allowPromo bool,
-) (*orderPriceResult, error) {
-	originalPrice := unitPrice * quantity
-	result := &orderPriceResult{
-		OriginalPrice: originalPrice,
-		PayableBase:   originalPrice,
-	}
-
-	if allowPromo {
-		promoResult, err := commonLogic.EvaluatePromo(ctx, svcCtx, userID, subscribeID)
-		if err != nil {
-			return nil, err
-		}
-		if promoResult != nil && promoResult.Eligible && promoResult.PromoPrice < unitPrice {
-			result.PayableBase = promoResult.PromoPrice * quantity
-			result.PromoRuleId = promoResult.RuleID
-			result.PromoDiscount = originalPrice - result.PayableBase
-			result.PromoPrice = promoResult.PromoPrice
-			if result.PromoDiscount < 0 {
-				result.PromoDiscount = 0
-			}
-			return result, nil
-		}
-	}
-
-	discount := float64(1)
-	if len(discounts) > 0 {
-		discount = getDiscount(discounts, quantity, eligibleForDiscount)
-	}
-	result.PayableBase = int64(math.Round(float64(originalPrice) * discount))
-	result.DiscountAmount = originalPrice - result.PayableBase
-	return result, nil
-}

internal/logic/public/order/promoPricing_test.go

@@ -1,113 +0,0 @@
-package order
-
-import (
-	"context"
-	"testing"
-
-	"github.com/perfect-panel/server/internal/model/promo"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"gorm.io/gorm"
-)
-
-type fakePromoModel struct {
-	rules []*promo.RuleWithPrice
-}
-
-func (m fakePromoModel) QueryEligibleRules(context.Context, int64) ([]*promo.RuleWithPrice, error) {
-	return m.rules, nil
-}
-
-func (m fakePromoModel) InsertUsage(context.Context, *promo.Usage, ...*gorm.DB) error {
-	return nil
-}
-
-func TestCalculatePurchasePricePromoSkipsPercentDiscount(t *testing.T) {
-	svcCtx := &svc.ServiceContext{
-		DB: &gorm.DB{},
-		PromoModel: fakePromoModel{rules: []*promo.RuleWithPrice{
-			{
-				Rule: promo.Rule{
-					Id:      9,
-					Name:    "campaign",
-					Type:    promo.RuleTypeCampaign,
-					Enabled: true,
-				},
-				PromoPrice: 600,
-			},
-		}},
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		3,
-		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.OriginalPrice != 3000 {
-		t.Fatalf("OriginalPrice = %d, want 3000", result.OriginalPrice)
-	}
-	if result.PayableBase != 1800 {
-		t.Fatalf("PayableBase = %d, want 1800", result.PayableBase)
-	}
-	if result.DiscountAmount != 0 {
-		t.Fatalf("DiscountAmount = %d, want 0", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 9 {
-		t.Fatalf("PromoRuleId = %d, want 9", result.PromoRuleId)
-	}
-	if result.PromoDiscount != 1200 {
-		t.Fatalf("PromoDiscount = %d, want 1200", result.PromoDiscount)
-	}
-}
-
-func TestCalculatePurchasePriceIgnoresInvalidPromoPrice(t *testing.T) {
-	svcCtx := &svc.ServiceContext{
-		DB: &gorm.DB{},
-		PromoModel: fakePromoModel{rules: []*promo.RuleWithPrice{
-			{
-				Rule: promo.Rule{
-					Id:      10,
-					Name:    "invalid campaign",
-					Type:    promo.RuleTypeCampaign,
-					Enabled: true,
-				},
-				PromoPrice: 1000,
-			},
-		}},
-	}
-
-	result, err := calculatePurchasePrice(
-		context.Background(),
-		svcCtx,
-		1,
-		2,
-		1000,
-		3,
-		[]types.SubscribeDiscount{{Quantity: 3, Discount: 50}},
-		true,
-		true,
-	)
-	if err != nil {
-		t.Fatalf("calculatePurchasePrice returned error: %v", err)
-	}
-
-	if result.PayableBase != 1500 {
-		t.Fatalf("PayableBase = %d, want 1500", result.PayableBase)
-	}
-	if result.DiscountAmount != 1500 {
-		t.Fatalf("DiscountAmount = %d, want 1500", result.DiscountAmount)
-	}
-	if result.PromoRuleId != 0 || result.PromoDiscount != 0 {
-		t.Fatalf("promo fields = (%d, %d), want (0, 0)", result.PromoRuleId, result.PromoDiscount)
-	}
-}

internal/logic/public/order/purchaseLogic.go

@@ -3,6 +3,7 @@ package order
 import (
 	"context"
 	"encoding/json"
+	"math"
 	"strings"
 	"time"
 
@@ -203,28 +204,14 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		return nil, err
 	}
 
-	priceResult, err := calculatePurchasePrice(
-		l.ctx,
-		l.svcCtx,
-		u.Id,
-		targetSubscribeID,
-		sub.UnitPrice,
-		req.Quantity,
-		newUserDiscount.Discounts,
-		newUserDiscount.EligibleForDiscount,
-		orderType == 1,
-	)
-	if err != nil {
-		l.Errorw("[Purchase] Promo price calculation error",
-			logger.Field("error", err.Error()),
-			logger.Field("user_id", u.Id),
-			logger.Field("subscribe_id", targetSubscribeID),
-		)
-		return nil, err
+	var discount float64 = 1
+	if len(newUserDiscount.Discounts) > 0 {
+		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
 	}
-	price := priceResult.OriginalPrice
-	amount := priceResult.PayableBase
-	discountAmount := priceResult.DiscountAmount
+	price := sub.UnitPrice * req.Quantity
+	// discount amount
+	amount := int64(math.Round(float64(price) * discount))
+	discountAmount := price - amount
 
 	// Validate amount to prevent overflow
 	if amount > MaxOrderAmount {
@@ -319,8 +306,6 @@ func (l *PurchaseLogic) Purchase(req *types.PurchaseOrderRequest) (resp *types.P
 		Price:              price,
 		Amount:             amount,
 		Discount:           discountAmount,
-		PromoRuleId:        priceResult.PromoRuleId,
-		PromoDiscount:      priceResult.PromoDiscount,
 		GiftAmount:         deductionAmount,
 		Coupon:             req.Coupon,
 		CouponDiscount:     coupon,

internal/logic/public/subscribe/promo.go

@@ -1,224 +0,0 @@
-package subscribe
-
-import (
-	"context"
-	"encoding/json"
-	stderrors "errors"
-	"strings"
-	"time"
-
-	"github.com/go-sql-driver/mysql"
-	"github.com/perfect-panel/server/internal/model/user"
-	"github.com/perfect-panel/server/internal/svc"
-	"github.com/perfect-panel/server/internal/types"
-	"github.com/perfect-panel/server/pkg/constant"
-	"github.com/perfect-panel/server/pkg/xerr"
-	"github.com/pkg/errors"
-	"gorm.io/gorm"
-)
-
-const (
-	promoRuleTypeNewUser      = "new_user"
-	promoRuleTypeInactiveUser = "inactive_user"
-	promoRuleTypeCampaign     = "campaign"
-)
-
-type subscribePromoCandidate struct {
-	SubscribeId int64      `gorm:"column:subscribe_id"`
-	RuleName    string     `gorm:"column:rule_name"`
-	RuleType    string     `gorm:"column:rule_type"`
-	PromoPrice  int64      `gorm:"column:promo_price"`
-	Params      string     `gorm:"column:params"`
-	StartTime   *time.Time `gorm:"column:start_time"`
-	EndTime     *time.Time `gorm:"column:end_time"`
-}
-
-type promoRuleParams struct {
-	WindowHours    int64 `json:"window_hours"`
-	InactiveMonths int   `json:"inactive_months"`
-}
-
-func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64) (map[int64]*types.SubscribePromo, error) {
-	result := make(map[int64]*types.SubscribePromo)
-	if len(subscribeIDs) == 0 || svcCtx == nil || svcCtx.DB == nil {
-		return result, nil
-	}
-
-	userInfo, _ := ctx.Value(constant.CtxKeyUser).(*user.User)
-	candidates, err := querySubscribePromoCandidates(ctx, svcCtx, subscribeIDs, userInfo != nil)
-	if err != nil {
-		if isMissingPromoTableError(err) {
-			return result, nil
-		}
-		return nil, err
-	}
-
-	evaluator := promoEligibilityEvaluator{ctx: ctx, db: svcCtx.DB, userInfo: userInfo}
-	now := time.Now()
-	for _, candidate := range candidates {
-		if _, exists := result[candidate.SubscribeId]; exists {
-			continue
-		}
-		if !candidate.isActive(now) {
-			continue
-		}
-		ok, expiresAt, err := evaluator.match(candidate, now)
-		if err != nil {
-			return nil, err
-		}
-		if !ok {
-			continue
-		}
-		result[candidate.SubscribeId] = &types.SubscribePromo{
-			RuleName:   candidate.RuleName,
-			RuleType:   candidate.RuleType,
-			PromoPrice: candidate.PromoPrice,
-			ExpiresAt:  unixSeconds(expiresAt),
-		}
-	}
-
-	return result, nil
-}
-
-func querySubscribePromoCandidates(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64, loggedIn bool) ([]subscribePromoCandidate, error) {
-	var candidates []subscribePromoCandidate
-	query := svcCtx.DB.WithContext(ctx).
-		Table("subscribe_promo AS sp").
-		Select("sp.subscribe_id, sp.promo_price, pr.name AS rule_name, pr.type AS rule_type, pr.params, pr.start_time, pr.end_time").
-		Joins("JOIN promo_rule AS pr ON pr.id = sp.promo_rule_id AND pr.deleted_at IS NULL").
-		Where("sp.subscribe_id IN ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeIDs, true)
-	if !loggedIn {
-		query = query.Where("pr.type = ?", promoRuleTypeCampaign)
-	}
-	err := query.
-		Order("sp.subscribe_id ASC").
-		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Scan(&candidates).Error
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query subscribe promo candidates failed: %v", err)
-	}
-	return candidates, nil
-}
-
-func (c subscribePromoCandidate) isActive(now time.Time) bool {
-	if c.PromoPrice <= 0 {
-		return false
-	}
-	if c.StartTime != nil && now.Before(*c.StartTime) {
-		return false
-	}
-	if c.EndTime != nil && now.After(*c.EndTime) {
-		return false
-	}
-	return true
-}
-
-type promoEligibilityEvaluator struct {
-	ctx        context.Context
-	db         *gorm.DB
-	userInfo   *user.User
-	lastExpire *time.Time
-}
-
-func (e *promoEligibilityEvaluator) match(candidate subscribePromoCandidate, now time.Time) (bool, time.Time, error) {
-	switch candidate.RuleType {
-	case promoRuleTypeCampaign:
-		return true, candidate.expiresAt(), nil
-	case promoRuleTypeNewUser:
-		if e.userInfo == nil {
-			return false, time.Time{}, nil
-		}
-		params, err := candidate.params()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if params.WindowHours <= 0 || e.userInfo.CreatedAt.IsZero() {
-			return false, time.Time{}, nil
-		}
-		expiresAt := e.userInfo.CreatedAt.Add(time.Duration(params.WindowHours) * time.Hour)
-		return now.Before(expiresAt), expiresAt, nil
-	case promoRuleTypeInactiveUser:
-		if e.userInfo == nil {
-			return false, time.Time{}, nil
-		}
-		params, err := candidate.params()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if params.InactiveMonths <= 0 {
-			return false, time.Time{}, nil
-		}
-		lastExpire, err := e.lastSubscribeExpireAt()
-		if err != nil {
-			return false, time.Time{}, err
-		}
-		if lastExpire.Equal(time.UnixMilli(0)) || lastExpire.After(now) {
-			return false, time.Time{}, nil
-		}
-		if lastExpire.IsZero() {
-			return true, candidate.expiresAt(), nil
-		}
-		threshold := now.AddDate(0, -params.InactiveMonths, 0)
-		return !lastExpire.After(threshold), candidate.expiresAt(), nil
-	default:
-		return false, time.Time{}, nil
-	}
-}
-
-func (e *promoEligibilityEvaluator) lastSubscribeExpireAt() (time.Time, error) {
-	if e.lastExpire != nil {
-		return *e.lastExpire, nil
-	}
-	var item user.Subscribe
-	err := e.db.WithContext(e.ctx).
-		Model(&user.Subscribe{}).
-		Where("user_id = ?", e.userInfo.Id).
-		Where("expire_time != ?", time.UnixMilli(0)).
-		Order("expire_time DESC").
-		Limit(1).
-		Take(&item).Error
-	if err != nil {
-		if stderrors.Is(err, gorm.ErrRecordNotFound) {
-			zero := time.Time{}
-			e.lastExpire = &zero
-			return zero, nil
-		}
-		return time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo user last subscription failed")
-	}
-	e.lastExpire = &item.ExpireTime
-	return item.ExpireTime, nil
-}
-
-func (c subscribePromoCandidate) expiresAt() time.Time {
-	if c.EndTime == nil {
-		return time.Time{}
-	}
-	return *c.EndTime
-}
-
-func (c subscribePromoCandidate) params() (promoRuleParams, error) {
-	if c.Params == "" {
-		return promoRuleParams{}, nil
-	}
-	var params promoRuleParams
-	if err := json.Unmarshal([]byte(c.Params), &params); err != nil {
-		return promoRuleParams{}, errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "parse promo rule params failed")
-	}
-	return params, nil
-}
-
-func unixSeconds(t time.Time) int64 {
-	if t.IsZero() {
-		return 0
-	}
-	return t.Unix()
-}
-
-func isMissingPromoTableError(err error) bool {
-	var mysqlErr *mysql.MySQLError
-	if stderrors.As(err, &mysqlErr) {
-		return mysqlErr.Number == 1146
-	}
-	return strings.Contains(err.Error(), "Error 1146")
-}

internal/logic/public/subscribe/promo_test.go

@@ -1,75 +0,0 @@
-package subscribe
-
-import (
-	"testing"
-	"time"
-
-	"github.com/perfect-panel/server/internal/model/user"
-)
-
-func TestPromoEligibilityEvaluatorMatch(t *testing.T) {
-	now := time.Unix(1710000000, 0)
-	campaignEnd := now.Add(2 * time.Hour)
-
-	campaign := subscribePromoCandidate{
-		RuleName:   "限时活动",
-		RuleType:   promoRuleTypeCampaign,
-		PromoPrice: 99,
-		EndTime:    &campaignEnd,
-	}
-	ok, expiresAt, err := (&promoEligibilityEvaluator{}).match(campaign, now)
-	if err != nil {
-		t.Fatalf("campaign match error: %v", err)
-	}
-	if !ok {
-		t.Fatal("campaign promo should match without login")
-	}
-	if got, want := unixSeconds(expiresAt), campaignEnd.Unix(); got != want {
-		t.Fatalf("campaign expires_at = %d, want %d", got, want)
-	}
-
-	newUser := subscribePromoCandidate{
-		RuleName:   "新客7天优惠",
-		RuleType:   promoRuleTypeNewUser,
-		PromoPrice: 279,
-		Params:     `{"window_hours":168}`,
-	}
-	ok, _, err = (&promoEligibilityEvaluator{}).match(newUser, now)
-	if err != nil {
-		t.Fatalf("anonymous new_user match error: %v", err)
-	}
-	if ok {
-		t.Fatal("new_user promo should not match without login")
-	}
-
-	userInfo := &user.User{Id: 1, CreatedAt: now.Add(-24 * time.Hour)}
-	ok, expiresAt, err = (&promoEligibilityEvaluator{userInfo: userInfo}).match(newUser, now)
-	if err != nil {
-		t.Fatalf("logged-in new_user match error: %v", err)
-	}
-	if !ok {
-		t.Fatal("new_user promo should match inside window")
-	}
-	if got, want := unixSeconds(expiresAt), userInfo.CreatedAt.Add(168*time.Hour).Unix(); got != want {
-		t.Fatalf("new_user expires_at = %d, want %d", got, want)
-	}
-}
-
-func TestSubscribePromoCandidateActiveWindow(t *testing.T) {
-	now := time.Unix(1710000000, 0)
-	start := now.Add(-time.Hour)
-	end := now.Add(time.Hour)
-
-	if !(subscribePromoCandidate{PromoPrice: 1, StartTime: &start, EndTime: &end}).isActive(now) {
-		t.Fatal("candidate inside active window should be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 0, StartTime: &start, EndTime: &end}).isActive(now) {
-		t.Fatal("candidate with zero promo price should not be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 1, StartTime: &end}).isActive(now) {
-		t.Fatal("candidate before start time should not be active")
-	}
-	if (subscribePromoCandidate{PromoPrice: 1, EndTime: &start}).isActive(now) {
-		t.Fatal("candidate after end time should not be active")
-	}
-}

internal/logic/public/subscribe/querySubscribeListLogic.go

@@ -47,11 +47,9 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		Total: total,
 	}
 	list := make([]types.Subscribe, len(data))
-	subscribeIDs := make([]int64, 0, len(data))
 	for i, item := range data {
 		var sub types.Subscribe
 		tool.DeepCopy(&sub, item)
-		subscribeIDs = append(subscribeIDs, sub.Id)
 		if item.Discount != "" {
 			var discount []types.SubscribeDiscount
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
@@ -71,15 +69,6 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		}
 	}
 
-	promos, err := loadSubscribePromoMap(l.ctx, l.svcCtx, subscribeIDs)
-	if err != nil {
-		l.Errorw("[QuerySubscribeListLogic] Query Promo Error", logger.Field("error", err.Error()))
-		return nil, err
-	}
-	for i := range list {
-		list[i].Promo = promos[list[i].Id]
-	}
-
 	resp.List = list
 	resp.Total = int64(len(list))
 	return

internal/logic/public/user/ws/deviceWsConnectLogic.go

@@ -39,14 +39,14 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error {
 		value, _ = c.GetQuery("identifier")
 		if value == nil || value.(string) == "" {
 			l.Errorf("DeviceWsConnectLogic DeviceWsConnect identifier is empty")
-			return errors.Wrap(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty")
+			return errors.Wrapf(xerr.NewErrCode(xerr.InvalidParams), "identifier is empty")
 		}
 	}
 	identifier := value.(string)
 	_, err := l.svcCtx.UserModel.FindOneDeviceByIdentifier(l.ctx, identifier)
 	if err != nil && !sysErr.Is(err, gorm.ErrRecordNotFound) {
 		l.Errorf("DeviceWsConnectLogic DeviceWsConnect FindOneDeviceByIdentifier err: %v", err)
-		return errors.Wrap(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error())
+		return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), err.Error())
 	}
 
 	value = l.ctx.Value(constant.CtxKeyUser)
@@ -67,7 +67,7 @@ func (l *DeviceWsConnectLogic) DeviceWsConnect(c *gin.Context) error {
 		err := l.svcCtx.UserModel.InsertDevice(l.ctx, &device)
 		if err != nil {
 			l.Errorf("DeviceWsConnectLogic DeviceWsConnect InsertDevice err: %v", err)
-			return errors.Wrap(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error())
+			return errors.Wrapf(xerr.NewErrCode(xerr.DatabaseInsertError), err.Error())
 		}
 	}
 	//默认在线设备1

internal/middleware/authMiddleware.go

@@ -22,69 +22,53 @@ import (
 
 func AuthMiddleware(svc *svc.ServiceContext) func(c *gin.Context) {
 	return func(c *gin.Context) {
-		if !authenticateRequest(c, svc, c.GetHeader("Authorization"), true) {
-			return
-		}
-		c.Next()
-	}
-}
-
-func OptionalAuthMiddleware(svc *svc.ServiceContext) func(c *gin.Context) {
-	return func(c *gin.Context) {
-		token := c.GetHeader("Authorization")
-		if token == "" {
-			c.Next()
-			return
-		}
-		if !authenticateRequest(c, svc, token, false) {
-			return
-		}
-		c.Next()
-	}
-}
-
-func authenticateRequest(c *gin.Context, svc *svc.ServiceContext, token string, requireToken bool) bool {
 		ctx := c.Request.Context()
 
+		jwtConfig := svc.Config.JwtAuth
+		// get token from header
+		token := c.GetHeader("Authorization")
 		if token == "" {
-		if requireToken {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Token Empty")
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.ErrorTokenEmpty), "Token Empty"))
 			c.Abort()
+			return
 		}
-		return !requireToken
-	}
-
-	claims, err := jwt.ParseJwtToken(token, svc.Config.JwtAuth.AccessSecret)
+		// parse token
+		claims, err := jwt.ParseJwtToken(token, jwtConfig.AccessSecret)
 		if err != nil {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] ParseJwtToken", logger.Field("error", err.Error()), logger.Field("token", token))
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.ErrorTokenExpire), "Token Invalid"))
 			c.Abort()
-		return false
+			return
 		}
 
 		loginType := parseLoginType(claims)
 		if claims["identifier"] != nil {
 			ctx = context.WithValue(ctx, constant.CtxKeyIdentifier, claims["identifier"].(string))
 		}
+		// get user id from token
 		userId := int64(claims["UserId"].(float64))
+		// get session id from token
 		sessionId := claims["SessionId"].(string)
+		// get session id from redis
 		sessionIdCacheKey := fmt.Sprintf("%v:%v", config.SessionIdKey, sessionId)
 		value, err := svc.Redis.Get(c, sessionIdCacheKey).Result()
 		if err != nil {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Redis Get", logger.Field("error", err.Error()), logger.Field("sessionId", sessionId))
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
 			c.Abort()
-		return false
+			return
 		}
 
+		//verify user id
 		if value != fmt.Sprintf("%v", userId) {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Invalid Access", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
 			c.Abort()
-		return false
+			return
 		}
 
+		// sliding session: refresh TTL on every active request
 		svc.Redis.Expire(c, sessionIdCacheKey, time.Duration(svc.Config.JwtAuth.AccessExpire)*time.Second)
 
 		userInfo, err := svc.UserModel.FindOne(c, userId)
@@ -92,22 +76,23 @@ func authenticateRequest(c *gin.Context, svc *svc.ServiceContext, token string,
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] UserModel FindOne", logger.Field("error", err.Error()), logger.Field("userId", userId))
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Database Query Error"))
 			c.Abort()
-		return false
+			return
 		}
-
+		// admin verify
 		paths := strings.Split(c.Request.URL.Path, "/")
 		if tool.StringSliceContains(paths, "admin") && !*userInfo.IsAdmin {
 			logger.WithContext(c.Request.Context()).Debug("[AuthMiddleware] Not Admin User", logger.Field("userId", userId), logger.Field("sessionId", sessionId))
 			result.HttpResult(c, nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access"))
 			c.Abort()
-		return false
+			return
 		}
 		ctx = context.WithValue(ctx, constant.CtxLoginType, loginType)
 		ctx = context.WithValue(ctx, constant.CtxKeyUser, userInfo)
 		ctx = context.WithValue(ctx, constant.CtxKeySessionID, sessionId)
 
 		c.Request = c.Request.WithContext(ctx)
-	return true
+		c.Next()
+	}
 }
 
 func parseLoginType(claims map[string]interface{}) string {

internal/model/order/model.go

@@ -22,8 +22,6 @@ type Details struct {
 	Price          int64                `gorm:"type:int;not null;default:0;comment:Original price"`
 	Amount         int64                `gorm:"type:int;not null;default:0;comment:Order Amount"`
 	Discount       int64                `gorm:"type:int;not null;default:0;comment:Order Discount"`
-	PromoRuleId    int64                `gorm:"type:bigint unsigned;not null;default:0;comment:Promo Rule ID"`
-	PromoDiscount  int64                `gorm:"type:bigint;not null;default:0;comment:Promo Discount Amount"`
 	Coupon         string               `gorm:"type:varchar(255);default:null;comment:Coupon"`
 	CouponDiscount int64                `gorm:"type:int;not null;default:0;comment:Coupon Discount"`
 	PaymentId      int64                `gorm:"type:bigint;not null;default:0;comment:Payment Id"`

internal/model/order/order.go

@@ -14,8 +14,6 @@ type Order struct {
 	Amount         int64     `gorm:"type:int;not null;default:0;comment:Order Amount"`
 	GiftAmount     int64     `gorm:"type:int;not null;default:0;comment:User Gift Amount"`
 	Discount       int64     `gorm:"type:int;not null;default:0;comment:Discount Amount"`
-	PromoRuleId        int64     `gorm:"type:bigint unsigned;not null;default:0;comment:Promo Rule ID"`
-	PromoDiscount      int64     `gorm:"type:bigint;not null;default:0;comment:Promo Discount Amount"`
 	Coupon         string    `gorm:"type:varchar(255);default:null;comment:Coupon"`
 	CouponDiscount int64     `gorm:"type:int;not null;default:0;comment:Coupon Discount Amount"`
 	Commission     int64     `gorm:"type:int;not null;default:0;comment:Order Commission"`

internal/model/promo/default.go

@@ -0,0 +1,239 @@
+package promo
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/perfect-panel/server/pkg/cache"
+	"github.com/redis/go-redis/v9"
+	"gorm.io/gorm"
+)
+
+const (
+	cachePromoRuleIdPrefix      = "cache:promo_rule:id:"
+	cacheSubscribePromoIdPrefix = "cache:subscribe_promo:id:"
+)
+
+type Model interface {
+	InsertRule(ctx context.Context, data *Rule) error
+	FindRule(ctx context.Context, id int64) (*Rule, error)
+	UpdateRule(ctx context.Context, data *Rule) error
+	DeleteRule(ctx context.Context, id int64) error
+	QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error)
+	UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error
+	FindPrice(ctx context.Context, id int64) (*SubscribePromo, error)
+	DeletePrice(ctx context.Context, id int64) error
+	QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error)
+	QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error)
+	Transaction(ctx context.Context, fn func(db *gorm.DB) error) error
+}
+
+type UsageFilter struct {
+	Page        int
+	Size        int
+	RuleId      int64
+	UserId      int64
+	SubscribeId int64
+	OrderNo     string
+}
+
+type customPromoModel struct {
+	cache.CachedConn
+	table string
+}
+
+func NewModel(db *gorm.DB, c *redis.Client) Model {
+	return &customPromoModel{
+		CachedConn: cache.NewConn(db, c),
+		table:      "`promo_rule`",
+	}
+}
+
+func (m *customPromoModel) ruleCacheKey(id int64) string {
+	return fmt.Sprintf("%s%d", cachePromoRuleIdPrefix, id)
+}
+
+func (m *customPromoModel) priceCacheKey(id int64) string {
+	return fmt.Sprintf("%s%d", cacheSubscribePromoIdPrefix, id)
+}
+
+func (m *customPromoModel) InsertRule(ctx context.Context, data *Rule) error {
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		return conn.Create(data).Error
+	}, m.ruleCacheKey(data.Id))
+}
+
+func (m *customPromoModel) FindRule(ctx context.Context, id int64) (*Rule, error) {
+	var resp Rule
+	err := m.QueryCtx(ctx, &resp, m.ruleCacheKey(id), func(conn *gorm.DB, v interface{}) error {
+		return conn.Model(&Rule{}).Where("id = ?", id).First(v).Error
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+func (m *customPromoModel) UpdateRule(ctx context.Context, data *Rule) error {
+	old, err := m.FindRule(ctx, data.Id)
+	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		return err
+	}
+	keys := []string{m.ruleCacheKey(data.Id)}
+	if old != nil {
+		keys = append(keys, m.ruleCacheKey(old.Id))
+	}
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		return conn.Save(data).Error
+	}, keys...)
+}
+
+func (m *customPromoModel) DeleteRule(ctx context.Context, id int64) error {
+	data, err := m.FindRule(ctx, id)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil
+		}
+		return err
+	}
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		return conn.Delete(&Rule{}, id).Error
+	}, m.ruleCacheKey(data.Id))
+}
+
+func (m *customPromoModel) QueryRuleList(ctx context.Context, page, size int, ruleType string, enabled *bool, search string) (int64, []*Rule, error) {
+	if page <= 0 {
+		page = 1
+	}
+	if size <= 0 {
+		size = 10
+	}
+	var total int64
+	var list []*Rule
+	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
+		db := conn.Model(&Rule{})
+		if ruleType != "" {
+			db = db.Where("type = ?", ruleType)
+		}
+		if enabled != nil {
+			db = db.Where("enabled = ?", *enabled)
+		}
+		if search != "" {
+			db = db.Where("name LIKE ?", "%"+search+"%")
+		}
+		if err := db.Count(&total).Error; err != nil {
+			return err
+		}
+		return db.Order("priority DESC").Order("id DESC").Limit(size).Offset((page - 1) * size).Find(v).Error
+	})
+	return total, list, err
+}
+
+func (m *customPromoModel) UpsertPrices(ctx context.Context, ruleId int64, items []*SubscribePromo) error {
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		for _, item := range items {
+			if item == nil {
+				continue
+			}
+			item.PromoRuleId = ruleId
+			var existing SubscribePromo
+			err := conn.Model(&SubscribePromo{}).
+				Where("subscribe_id = ? AND quantity = ? AND promo_rule_id = ?", item.SubscribeId, item.Quantity, ruleId).
+				First(&existing).Error
+			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+				return err
+			}
+			if errors.Is(err, gorm.ErrRecordNotFound) {
+				if err := conn.Create(item).Error; err != nil {
+					return err
+				}
+				continue
+			}
+			existing.Quantity = item.Quantity
+			existing.PromoPrice = item.PromoPrice
+			if err := conn.Save(&existing).Error; err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
+
+func (m *customPromoModel) FindPrice(ctx context.Context, id int64) (*SubscribePromo, error) {
+	var resp SubscribePromo
+	err := m.QueryCtx(ctx, &resp, m.priceCacheKey(id), func(conn *gorm.DB, v interface{}) error {
+		return conn.Model(&SubscribePromo{}).Where("id = ?", id).First(v).Error
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}
+
+func (m *customPromoModel) DeletePrice(ctx context.Context, id int64) error {
+	data, err := m.FindPrice(ctx, id)
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil
+		}
+		return err
+	}
+	return m.ExecCtx(ctx, func(conn *gorm.DB) error {
+		return conn.Delete(&SubscribePromo{}, id).Error
+	}, m.priceCacheKey(data.Id))
+}
+
+func (m *customPromoModel) QueryPriceList(ctx context.Context, ruleId int64, page, size int) (int64, []*SubscribePromo, error) {
+	if page <= 0 {
+		page = 1
+	}
+	if size <= 0 {
+		size = 10
+	}
+	var total int64
+	var list []*SubscribePromo
+	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
+		db := conn.Model(&SubscribePromo{}).Where("promo_rule_id = ?", ruleId)
+		if err := db.Count(&total).Error; err != nil {
+			return err
+		}
+		return db.Order("id DESC").Limit(size).Offset((page - 1) * size).Find(v).Error
+	})
+	return total, list, err
+}
+
+func (m *customPromoModel) QueryUsageList(ctx context.Context, params UsageFilter) (int64, []*Usage, error) {
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.Size <= 0 {
+		params.Size = 10
+	}
+	var total int64
+	var list []*Usage
+	err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
+		db := conn.Model(&Usage{})
+		if params.RuleId > 0 {
+			db = db.Where("promo_rule_id = ?", params.RuleId)
+		}
+		if params.UserId > 0 {
+			db = db.Where("user_id = ?", params.UserId)
+		}
+		if params.SubscribeId > 0 {
+			db = db.Where("subscribe_id = ?", params.SubscribeId)
+		}
+		if params.OrderNo != "" {
+			db = db.Where("order_no = ?", params.OrderNo)
+		}
+		if err := db.Count(&total).Error; err != nil {
+			return err
+		}
+		return db.Order("id DESC").Limit(params.Size).Offset((params.Page - 1) * params.Size).Find(v).Error
+	})
+	return total, list, err
+}
+
+func (m *customPromoModel) Transaction(ctx context.Context, fn func(db *gorm.DB) error) error {
+	return m.TransactCtx(ctx, fn)
+}

internal/model/promo/model.go

@@ -1,48 +0,0 @@
-package promo
-
-import (
-	"context"
-
-	"github.com/redis/go-redis/v9"
-	"gorm.io/gorm"
-)
-
-type RuleWithPrice struct {
-	Rule
-	PromoPrice int64 `gorm:"column:promo_price"`
-}
-
-type Model interface {
-	QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error)
-	InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error
-}
-
-type defaultPromoModel struct {
-	db *gorm.DB
-}
-
-func NewModel(db *gorm.DB, _ *redis.Client) Model {
-	return &defaultPromoModel{db: db}
-}
-
-func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error) {
-	var list []*RuleWithPrice
-	err := m.db.WithContext(ctx).
-		Table("promo_rule AS pr").
-		Select("pr.*, sp.promo_price").
-		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
-		Where("sp.subscribe_id = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, true).
-		Where("pr.deleted_at IS NULL").
-		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Find(&list).Error
-	return list, err
-}
-
-func (m *defaultPromoModel) InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error {
-	db := m.db.WithContext(ctx)
-	if len(tx) > 0 {
-		db = tx[0].WithContext(ctx)
-	}
-	return db.Model(&Usage{}).Create(data).Error
-}

internal/model/promo/promo.go

@@ -6,19 +6,13 @@ import (
 	"gorm.io/gorm"
 )
 
-const (
-	RuleTypeNewUser      = "new_user"
-	RuleTypeInactiveUser = "inactive_user"
-	RuleTypeCampaign     = "campaign"
-)
-
 type Rule struct {
 	Id        int64          `gorm:"primaryKey"`
-	Name      string         `gorm:"type:varchar(100);not null;default:'';comment:Rule Name"`
-	Type      string         `gorm:"type:varchar(32);not null;default:'';comment:Rule Type"`
+	Name      string         `gorm:"type:varchar(100);not null;default:'';comment:Promo Rule Name"`
+	Type      string         `gorm:"type:varchar(32);not null;default:'';comment:Promo Rule Type"`
 	Params    string         `gorm:"type:json;not null;comment:Rule Params"`
 	Priority  int64          `gorm:"type:int;not null;default:0;comment:Priority"`
-	Enabled   bool           `gorm:"type:tinyint(1);not null;default:1;comment:Enabled"`
+	Enabled   *bool          `gorm:"type:tinyint(1);not null;default:1;comment:Enabled"`
 	StartTime *time.Time     `gorm:"default:null;comment:Start Time"`
 	EndTime   *time.Time     `gorm:"default:null;comment:End Time"`
 	CreatedAt time.Time      `gorm:"<-:create;comment:Create Time"`
@@ -26,33 +20,34 @@ type Rule struct {
 	DeletedAt gorm.DeletedAt `gorm:"index;comment:Delete Time"`
 }
 
-func (Rule) TableName() string {
+func (*Rule) TableName() string {
 	return "promo_rule"
 }
 
 type SubscribePromo struct {
 	Id          int64     `gorm:"primaryKey"`
-	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	PromoRuleId int64     `gorm:"type:bigint unsigned;not null;comment:Promo Rule ID"`
+	SubscribeId int64     `gorm:"not null;index:idx_subscribe_qty_rule,unique;comment:Subscribe ID"`
+	Quantity    int64     `gorm:"not null;default:0;index:idx_subscribe_qty_rule,unique;comment:Quantity"`
+	PromoRuleId int64     `gorm:"not null;index:idx_subscribe_qty_rule,unique;index:idx_promo_rule_id;comment:Promo Rule ID"`
 	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
 	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
 	UpdatedAt   time.Time `gorm:"comment:Update Time"`
 }
 
-func (SubscribePromo) TableName() string {
+func (*SubscribePromo) TableName() string {
 	return "subscribe_promo"
 }
 
 type Usage struct {
 	Id          int64     `gorm:"primaryKey"`
-	UserId      int64     `gorm:"type:bigint unsigned;not null;comment:User ID"`
-	PromoRuleId int64     `gorm:"type:bigint unsigned;not null;comment:Promo Rule ID"`
-	SubscribeId int64     `gorm:"type:bigint unsigned;not null;comment:Subscribe ID"`
-	OrderNo     string    `gorm:"type:varchar(255);not null;default:'';comment:Order No"`
+	UserId      int64     `gorm:"not null;index:idx_user_rule;comment:User ID"`
+	PromoRuleId int64     `gorm:"not null;index:idx_user_rule;comment:Promo Rule ID"`
+	SubscribeId int64     `gorm:"not null;comment:Subscribe ID"`
+	OrderNo     string    `gorm:"type:varchar(255);not null;default:'';index:idx_order_no;comment:Order No"`
 	PromoPrice  int64     `gorm:"type:bigint;not null;default:0;comment:Promo Price"`
 	CreatedAt   time.Time `gorm:"<-:create;comment:Create Time"`
 }
 
-func (Usage) TableName() string {
+func (*Usage) TableName() string {
 	return "promo_usage"
 }

internal/types/types.go

@@ -316,6 +316,45 @@ type ContactRequest struct {
 	Notes        string `json:"notes" validate:"max=2000"`
 }
 
+type PromoPrice struct {
+	Id          int64 `json:"id"`
+	SubscribeId int64 `json:"subscribe_id"`
+	PromoRuleId int64 `json:"promo_rule_id"`
+	Quantity    int64 `json:"quantity"`
+	PromoPrice  int64 `json:"promo_price"`
+	CreatedAt   int64 `json:"created_at"`
+	UpdatedAt   int64 `json:"updated_at"`
+}
+
+type PromoPriceItem struct {
+	SubscribeId int64 `json:"subscribe_id" validate:"required,gt=0"`
+	Quantity    int64 `json:"quantity" validate:"required,gt=0,lte=1000"`
+	PromoPrice  int64 `json:"promo_price" validate:"required,gt=0"`
+}
+
+type PromoRule struct {
+	Id        int64                  `json:"id"`
+	Name      string                 `json:"name"`
+	Type      string                 `json:"type"`
+	Params    map[string]interface{} `json:"params"`
+	Priority  int64                  `json:"priority"`
+	Enabled   bool                   `json:"enabled"`
+	StartTime *int64                 `json:"start_time"`
+	EndTime   *int64                 `json:"end_time"`
+	CreatedAt int64                  `json:"created_at"`
+	UpdatedAt int64                  `json:"updated_at"`
+}
+
+type PromoUsage struct {
+	Id          int64  `json:"id"`
+	UserId      int64  `json:"user_id"`
+	PromoRuleId int64  `json:"promo_rule_id"`
+	SubscribeId int64  `json:"subscribe_id"`
+	OrderNo     string `json:"order_no"`
+	PromoPrice  int64  `json:"promo_price"`
+	CreatedAt   int64  `json:"created_at"`
+}
+
 type Coupon struct {
 	Id         int64   `json:"id"`
 	Name       string  `json:"name"`
@@ -375,6 +414,16 @@ type CreateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }
 
+type CreatePromoRuleRequest struct {
+	Name      string                 `json:"name" validate:"required,max=100"`
+	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
+	Params    map[string]interface{} `json:"params"`
+	Priority  int64                  `json:"priority" validate:"gte=0"`
+	Enabled   *bool                  `json:"enabled"`
+	StartTime *int64                 `json:"start_time"`
+	EndTime   *int64                 `json:"end_time"`
+}
+
 type CreateDocumentRequest struct {
 	Title   string   `json:"title" validate:"required"`
 	Content string   `json:"content" validate:"required"`
@@ -1107,6 +1156,48 @@ type GetCouponListResponse struct {
 	List  []Coupon `json:"list"`
 }
 
+type GetPromoPriceListRequest struct {
+	PromoRuleId int64 `form:"promo_rule_id" validate:"required,gt=0"`
+	Page        int64 `form:"page" validate:"required"`
+	Size        int64 `form:"size" validate:"required"`
+}
+
+type GetPromoPriceListResponse struct {
+	Total int64        `json:"total"`
+	List  []PromoPrice `json:"list"`
+}
+
+type GetPromoRuleDetailRequest struct {
+	Id int64 `uri:"id" validate:"required,gt=0"`
+}
+
+type GetPromoRuleListRequest struct {
+	Page    int64  `form:"page" validate:"required"`
+	Size    int64  `form:"size" validate:"required"`
+	Type    string `form:"type" validate:"omitempty,oneof=new_user inactive_user campaign"`
+	Enabled *bool  `form:"enabled"`
+	Search  string `form:"search,omitempty"`
+}
+
+type GetPromoRuleListResponse struct {
+	Total int64       `json:"total"`
+	List  []PromoRule `json:"list"`
+}
+
+type GetPromoUsageListRequest struct {
+	Page        int64  `form:"page" validate:"required"`
+	Size        int64  `form:"size" validate:"required"`
+	RuleId      int64  `form:"rule_id,omitempty"`
+	UserId      int64  `form:"user_id,omitempty"`
+	SubscribeId int64  `form:"subscribe_id,omitempty"`
+	OrderNo     string `form:"order_no,omitempty"`
+}
+
+type GetPromoUsageListResponse struct {
+	Total int64        `json:"total"`
+	List  []PromoUsage `json:"list"`
+}
+
 type GetDetailRequest struct {
 	Id int64 `form:"id" validate:"required"`
 }
@@ -1868,8 +1959,6 @@ type Order struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -1893,8 +1982,6 @@ type OrderDetail struct {
 	Amount         int64         `json:"amount"`
 	GiftAmount     int64         `json:"gift_amount"`
 	Discount       int64         `json:"discount"`
-	PromoRuleId    int64         `json:"promo_rule_id"`
-	PromoDiscount  int64         `json:"promo_discount"`
 	Coupon         string        `json:"coupon"`
 	CouponDiscount int64         `json:"coupon_discount"`
 	Commission     int64         `json:"commission,omitempty"`
@@ -2016,7 +2103,6 @@ type PreOrderResponse struct {
 	Price          int64  `json:"price"`
 	Amount         int64  `json:"amount"`
 	Discount       int64  `json:"discount"`
-	PromoDiscount  int64  `json:"promo_discount"`
 	GiftAmount     int64  `json:"gift_amount"`
 	Coupon         string `json:"coupon"`
 	CouponDiscount int64  `json:"coupon_discount"`
@@ -2785,13 +2871,6 @@ type StripePayment struct {
 	PublishableKey string `json:"publishable_key"`
 }
 
-type SubscribePromo struct {
-	RuleName   string `json:"rule_name"`
-	RuleType   string `json:"rule_type"`
-	PromoPrice int64  `json:"promo_price"`
-	ExpiresAt  int64  `json:"expires_at"`
-}
-
 type Subscribe struct {
 	Id                int64               `json:"id"`
 	Name              string              `json:"name"`
@@ -2800,7 +2879,6 @@ type Subscribe struct {
 	UnitPrice         int64               `json:"unit_price"`
 	UnitTime          string              `json:"unit_time"`
 	Discount          []SubscribeDiscount `json:"discount"`
-	Promo             *SubscribePromo     `json:"promo"`
 	NodeCount         int64               `json:"node_count"`
 	Replacement       int64               `json:"replacement"`
 	Inventory         int64               `json:"inventory"`
@@ -3141,6 +3219,30 @@ type UpdateCouponRequest struct {
 	Enable     *bool   `json:"enable,omitempty"`
 }
 
+type SetPromoPriceRequest struct {
+	PromoRuleId int64            `json:"promo_rule_id" validate:"required,gt=0"`
+	Items       []PromoPriceItem `json:"items" validate:"required,dive"`
+}
+
+type DeletePromoPriceRequest struct {
+	Id int64 `uri:"id" validate:"required,gt=0"`
+}
+
+type DeletePromoRuleRequest struct {
+	Id int64 `uri:"id" validate:"required,gt=0"`
+}
+
+type UpdatePromoRuleRequest struct {
+	Id        int64                  `uri:"id" validate:"required,gt=0"`
+	Name      string                 `json:"name" validate:"required,max=100"`
+	Type      string                 `json:"type" validate:"required,oneof=new_user inactive_user campaign"`
+	Params    map[string]interface{} `json:"params"`
+	Priority  int64                  `json:"priority" validate:"gte=0"`
+	Enabled   *bool                  `json:"enabled"`
+	StartTime *int64                 `json:"start_time"`
+	EndTime   *int64                 `json:"end_time"`
+}
+
 type UpdateDocumentRequest struct {
 	Id      int64    `json:"id" validate:"required"`
 	Title   string   `json:"title" validate:"required"`

queue/logic/order/activateOrderLogic.go

@@ -19,7 +19,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/hibiken/asynq"
 	"github.com/perfect-panel/server/internal/model/order"
-	"github.com/perfect-panel/server/internal/model/promo"
 	"github.com/perfect-panel/server/internal/model/redemption"
 	"github.com/perfect-panel/server/internal/model/subscribe"
 	"github.com/perfect-panel/server/internal/model/user"
@@ -149,7 +148,6 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 		return err
 	}
 
-	l.recordPromoUsage(ctx, orderInfo)
 	l.finalizeCouponAndOrder(ctx, orderInfo)
 
 	commonLogic.SubscriptionTraceInfo(logger.WithContext(ctx), commonLogic.SubscriptionTraceFlowOrder, "activation_finished",
@@ -159,44 +157,6 @@ func (l *ActivateOrderLogic) ProcessTask(ctx context.Context, task *asynq.Task)
 	return nil
 }
 
-func (l *ActivateOrderLogic) recordPromoUsage(ctx context.Context, orderInfo *order.Order) {
-	if orderInfo == nil || orderInfo.PromoRuleId <= 0 || orderInfo.Quantity <= 0 || orderInfo.SubscribeId <= 0 || orderInfo.OrderNo == "" {
-		return
-	}
-
-	promoPrice := int64(0)
-	if orderInfo.Price > orderInfo.PromoDiscount {
-		promoPrice = (orderInfo.Price - orderInfo.PromoDiscount) / orderInfo.Quantity
-	}
-	if promoPrice <= 0 {
-		return
-	}
-
-	err := l.svc.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		var count int64
-		if e := tx.Model(&promo.Usage{}).Where("order_no = ?", orderInfo.OrderNo).Count(&count).Error; e != nil {
-			return e
-		}
-		if count > 0 {
-			return nil
-		}
-		return l.svc.PromoModel.InsertUsage(ctx, &promo.Usage{
-			UserId:      orderInfo.UserId,
-			PromoRuleId: orderInfo.PromoRuleId,
-			SubscribeId: orderInfo.SubscribeId,
-			OrderNo:     orderInfo.OrderNo,
-			PromoPrice:  promoPrice,
-		}, tx)
-	})
-	if err != nil {
-		logger.WithContext(ctx).Error("Insert promo usage failed",
-			logger.Field("error", err.Error()),
-			logger.Field("order_no", orderInfo.OrderNo),
-			logger.Field("promo_rule_id", orderInfo.PromoRuleId),
-		)
-	}
-}
-
 // parsePayload unMarshals the task payload into a structured format
 func (l *ActivateOrderLogic) parsePayload(ctx context.Context, payload []byte) (*queueTypes.ForthwithActivateOrderPayload, error) {
 	var p queueTypes.ForthwithActivateOrderPayload

scripts/convert_recovery_orders/main.go

@@ -1,5 +1,3 @@
-//go:build ignore
-
 package main
 
 import (

scripts/doc.go

@@ -1,3 +0,0 @@
-// Package scripts keeps standalone maintenance tools out of normal package
-// builds. Run individual tools with go run scripts/<tool>.go.
-package scripts

scripts/reconcile_mihapay_orders/main.go

@@ -1,5 +1,3 @@
-//go:build ignore
-
 package main
 
 import (