重构增加模型枚举值定义

web/handlers/resource.go

@@ -4,6 +4,8 @@ import (
 	"platform/pkg/u"
 	"platform/web/auth"
 	"platform/web/core"
+	resource2 "platform/web/domains/resource"
+	trade2 "platform/web/domains/trade"
 	q "platform/web/queries"
 	s "platform/web/services"
 	"time"
@@ -115,10 +117,10 @@ func AllResource(c *fiber.Ctx) error {
 			q.Resource.UserID.Eq(authContext.Payload.Id),
 			q.Resource.Active.Is(true),
 			q.Resource.Where(
-				pss.Type.Eq(1),
+				pss.Type.Eq(int32(resource2.PssTypeTime)),
 				pss.Expire.Gte(core.LocalDateTime(time.Now())),
 			).Or(
-				pss.Type.Eq(2),
+				pss.Type.Eq(int32(resource2.PssTypeCount)),
 				pss.Quota.GtCol(pss.Used),
 			),
 			q.Resource.Where(
@@ -174,7 +176,7 @@ func PrepareResourceByAlipay(c *fiber.Ctx) error {
 		c.Context(),
 		&req.CreateResourceData,
 		authContext.Payload.Id,
-		s.TransactionMethodAlipay,
+		trade2.MethodAlipay,
 	)
 	if err != nil {
 		return err
@@ -206,7 +208,7 @@ func PrepareResourceByWechat(c *fiber.Ctx) error {
 		c.Context(),
 		&req.CreateResourceData,
 		authContext.Payload.Id,
-		s.TransactionMethodWeChat,
+		trade2.MethodWeChat,
 	)
 	if err != nil {
 		return err
@@ -235,7 +237,7 @@ func CreateResourceByAlipay(c *fiber.Ctx) error {
 	// 验证支付结果
 	result, err := s.Transaction.VerifyTransaction(c.Context(), &s.TransactionVerifyData{
 		TradeNo: req.TradeNo,
-		Method:  s.TransactionMethodAlipay,
+		Method:  trade2.MethodAlipay,
 	})
 	if err != nil {
 		return err
@@ -266,7 +268,7 @@ func CreateResourceByWechat(c *fiber.Ctx) error {
 	// 验证支付结果
 	result, err := s.Transaction.VerifyTransaction(c.Context(), &s.TransactionVerifyData{
 		TradeNo: req.TradeNo,
-		Method:  s.TransactionMethodWeChat,
+		Method:  trade2.MethodWeChat,
 	})
 	if err != nil {
 		return err