优化日志输出信息，调整 Docker Compose 配置，新增 Vector 日志收集配置

web/services/resource.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"platform/pkg/u"
+	"platform/web/core"
 	bill2 "platform/web/domains/bill"
 	resource2 "platform/web/domains/resource"
 	trade2 "platform/web/domains/trade"
@@ -124,7 +125,7 @@ func (s *resourceService) PrepareResource(uid int32, now time.Time, ser *Prepare
 			return err
 		}
 
-		err = g.Redis.Set(context.Background(), result.TradeNo, &PrepareResourceCache{
+		err = g.Redis.Set(context.Background(), resPrepareKey(result.TradeNo), &PrepareResourceCache{
 			Uid:                 uid,
 			TradeId:             result.Trade.ID,
 			BillId:              result.Bill.ID,
@@ -146,9 +147,9 @@ func (s *resourceService) PrepareResource(uid int32, now time.Time, ser *Prepare
 func (s *resourceService) CompleteResource(tradeNo string, now time.Time, opResult ...*TradeSuccessResult) error {
 
 	// 获取请求缓存
-	reqStr, err := g.Redis.Get(context.Background(), tradeNo).Result()
+	reqStr, err := g.Redis.Get(context.Background(), resPrepareKey(tradeNo)).Result()
 	if err != nil {
-		return err
+		return core.NewBizErr("交易不存在或已过期")
 	}
 	cache := new(PrepareResourceCache)
 	if err := json.Unmarshal([]byte(reqStr), cache); err != nil {
@@ -293,6 +294,10 @@ func createResource(q *q.Query, uid int32, now time.Time, data CreateTypeResourc
 	return &resource, nil
 }
 
+func resPrepareKey(tradeNo string) string {
+	return fmt.Sprintf("resource:prepare:%s", tradeNo)
+}
+
 type CreateTypeResourceDataInter interface {
 	GetName() string
 	GetPrice() decimal.Decimal