Version: 0.9.80.dev.260506
后端： 1. LLM 独立服务与统一计费出口落地：新增 `cmd/llm`、`client/llm` 与 `services/llm/rpc`，补齐 BillingContext、CreditBalanceGuard、价格规则解析、stream usage 归集与 `credit.charge.requested` outbox 发布，active-scheduler / agent / course / memory / gateway fallback 全部改走 llm zrpc，不再各自本地初始化模型。 2. TokenStore 收口为 Credit 权威账本：新增 credit account / ledger / product / order / price-rule / reward-rule 能力与 Redis 快照缓存，扩展 tokenstore rpc/client 支撑余额快照、消耗看板、商品、订单、流水、价格规则和奖励规则，并接入 LLM charge 事件消费完成 Credit 扣费落账。 3. 计费旧链路下线与网关切口切换：`/token-store` 语义整体切到 `/credit-store`，agent chat 移除旧 TokenQuotaGuard，userauth 的 CheckTokenQuota / AdjustTokenUsage 改为废弃，聊天历史落库不再同步旧 token 额度账本，course 图片解析请求补 user_id 进入新计费口径。 前端： 4. 计划广场从 mock 数据切到真实接口：新增 forum api/types，首页支持真实列表、标签、搜索、防抖、点赞、导入和发布计划，详情页补齐帖子详情、评论树、回复和删除评论链路，同时补上“至少一个标签”的前后端约束与默认标签兜底。 5. 商店页切到 Credit 体系并重做展示：顶部改为余额 + Credit/Token 消耗看板，支持 24h/7d/30d/all 周期切换；套餐区展示原价与当前价；历史区改为当前用户 Credit 流水并支持查看更多，整体视觉和交互同步收口。 仓库： 6. 配置与本地启动体系补齐 llm / outbox 编排：`config.example.yaml` 增加 llm rpc 和统一 outbox service 配置，`dev-common.ps1` 把 llm 纳入多服务依赖并自动建 Kafka topic，`docker-compose.yml` 同步初始化 agent/task/memory/active-scheduler/notification/taskclass-forum/llm/token-store 全量 outbox topic。
This commit is contained in:
Losita
240
backend/services/tokenstore/sv/credit_order.go
Normal file
240
backend/services/tokenstore/sv/credit_order.go
Normal file
@@ -0,0 +1,240 @@
|
||||
package sv
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
tokenstoredao "github.com/LoveLosita/smartflow/backend/services/tokenstore/dao"
|
||||
storemodel "github.com/LoveLosita/smartflow/backend/services/tokenstore/model"
|
||||
creditcontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/creditstore"
|
||||
"github.com/LoveLosita/smartflow/backend/shared/respond"
|
||||
)
|
||||
|
||||
// CreateCreditOrder 创建 Credit 商品订单。
|
||||
func (s *Service) CreateCreditOrder(ctx context.Context, req creditcontracts.CreateCreditOrderRequest) (*creditcontracts.CreditOrderView, error) {
|
||||
if err := s.Ready(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if req.ActorUserID == 0 || req.ProductID == 0 {
|
||||
return nil, respond.MissingParam
|
||||
}
|
||||
if req.Quantity < 1 || req.Quantity > 99 {
|
||||
return nil, tokenStoreBadRequest("quantity 仅支持 1 到 99")
|
||||
}
|
||||
|
||||
idempotencyKey := strings.TrimSpace(req.IdempotencyKey)
|
||||
if idempotencyKey != "" {
|
||||
existing, err := s.creditDAO.FindOrderByUserIdempotencyKey(ctx, req.ActorUserID, idempotencyKey)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if existing != nil {
|
||||
return s.creditOrderViewByID(ctx, req.ActorUserID, existing.ID)
|
||||
}
|
||||
}
|
||||
|
||||
product, err := s.creditDAO.FindActiveProductByID(ctx, req.ProductID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if product == nil {
|
||||
return nil, tokenStoreBadRequest("Credit 商品不存在或已下架")
|
||||
}
|
||||
|
||||
snapshot, err := buildCreditProductSnapshot(*product)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
order := storemodel.CreditOrder{
|
||||
OrderNo: newCreditOrderNo(),
|
||||
UserID: req.ActorUserID,
|
||||
ProductID: product.ID,
|
||||
ProductSKU: product.SKU,
|
||||
ProductName: product.Name,
|
||||
ProductSnapshotJSON: snapshot,
|
||||
Quantity: req.Quantity,
|
||||
CreditAmount: product.CreditAmount * int64(req.Quantity),
|
||||
AmountCent: product.PriceCent * int64(req.Quantity),
|
||||
Currency: product.Currency,
|
||||
Status: storemodel.CreditOrderStatusPending,
|
||||
PaymentMode: "mock",
|
||||
IdempotencyKey: stringPtrFromNonEmpty(idempotencyKey),
|
||||
}
|
||||
if err := s.creditDAO.CreateOrder(ctx, &order); err != nil {
|
||||
if idempotencyKey != "" && isDuplicateKeyError(err) {
|
||||
existing, findErr := s.creditDAO.FindOrderByUserIdempotencyKey(ctx, req.ActorUserID, idempotencyKey)
|
||||
if findErr != nil {
|
||||
return nil, findErr
|
||||
}
|
||||
if existing != nil {
|
||||
return s.creditOrderViewByID(ctx, req.ActorUserID, existing.ID)
|
||||
}
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return s.creditOrderViewByID(ctx, req.ActorUserID, order.ID)
|
||||
}
|
||||
|
||||
// ListCreditOrders 按用户分页查询 Credit 订单。
|
||||
func (s *Service) ListCreditOrders(ctx context.Context, req creditcontracts.ListCreditOrdersRequest) ([]creditcontracts.CreditOrderView, creditcontracts.PageResult, error) {
|
||||
if err := s.Ready(); err != nil {
|
||||
return nil, creditcontracts.PageResult{}, err
|
||||
}
|
||||
if req.ActorUserID == 0 {
|
||||
return nil, creditcontracts.PageResult{}, respond.MissingParam
|
||||
}
|
||||
|
||||
page, pageSize := normalizePage(req.Page, req.PageSize)
|
||||
query := tokenstoredao.ListCreditOrdersQuery{
|
||||
UserID: req.ActorUserID,
|
||||
Page: page,
|
||||
PageSize: pageSize,
|
||||
Status: strings.TrimSpace(req.Status),
|
||||
}
|
||||
|
||||
total, err := s.creditDAO.CountOrders(ctx, query)
|
||||
if err != nil {
|
||||
return nil, creditcontracts.PageResult{}, err
|
||||
}
|
||||
orders, err := s.creditDAO.ListOrders(ctx, query)
|
||||
if err != nil {
|
||||
return nil, creditcontracts.PageResult{}, err
|
||||
}
|
||||
if len(orders) == 0 {
|
||||
return []creditcontracts.CreditOrderView{}, creditPageResult(page, pageSize, total), nil
|
||||
}
|
||||
|
||||
result := make([]creditcontracts.CreditOrderView, 0, len(orders))
|
||||
for _, order := range orders {
|
||||
result = append(result, creditOrderViewFromModel(order))
|
||||
}
|
||||
return result, creditPageResult(page, pageSize, total), nil
|
||||
}
|
||||
|
||||
// GetCreditOrder 查询单个 Credit 订单详情。
|
||||
func (s *Service) GetCreditOrder(ctx context.Context, actorUserID uint64, orderID uint64) (*creditcontracts.CreditOrderView, error) {
|
||||
if err := s.Ready(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if actorUserID == 0 || orderID == 0 {
|
||||
return nil, respond.MissingParam
|
||||
}
|
||||
return s.creditOrderViewByID(ctx, actorUserID, orderID)
|
||||
}
|
||||
|
||||
// MockPaidCreditOrder 在同步事务里完成 mock paid 和 Credit 入账。
|
||||
func (s *Service) MockPaidCreditOrder(ctx context.Context, req creditcontracts.MockPaidCreditOrderRequest) (*creditcontracts.CreditOrderView, error) {
|
||||
if err := s.Ready(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if req.ActorUserID == 0 || req.OrderID == 0 {
|
||||
return nil, respond.MissingParam
|
||||
}
|
||||
|
||||
var resultOrder storemodel.CreditOrder
|
||||
err := s.creditDAO.Transaction(ctx, func(txDAO *tokenstoredao.CreditStoreDAO) error {
|
||||
now := time.Now()
|
||||
|
||||
order, err := txDAO.LockOrderByID(ctx, req.OrderID)
|
||||
if err != nil {
|
||||
return normalizeCreditRecordNotFound(err, tokenStoreBadRequest("Credit 订单不存在"))
|
||||
}
|
||||
if order.UserID != req.ActorUserID {
|
||||
return tokenStoreBadRequest("Credit 订单不属于当前用户")
|
||||
}
|
||||
|
||||
switch order.Status {
|
||||
case storemodel.CreditOrderStatusPending, storemodel.CreditOrderStatusPaid, storemodel.CreditOrderStatusCredited:
|
||||
case storemodel.CreditOrderStatusClosed:
|
||||
return tokenStoreBadRequest("Credit 订单已关闭，不能执行 mock paid")
|
||||
default:
|
||||
return tokenStoreBadRequest("Credit 订单状态不支持执行 mock paid")
|
||||
}
|
||||
|
||||
eventID := creditOrderLedgerEventID(order.ID)
|
||||
paymentMode := paymentModeOrDefault(order.PaymentMode, req.MockChannel)
|
||||
ledger, _, err := s.applyCreditLedgerWithDAO(ctx, txDAO, applyCreditLedgerRequest{
|
||||
EventID: eventID,
|
||||
UserID: order.UserID,
|
||||
Source: storemodel.CreditLedgerSourcePurchase,
|
||||
SourceLabel: creditSourceLabel(storemodel.CreditLedgerSourcePurchase, ""),
|
||||
Direction: storemodel.CreditLedgerDirectionIncome,
|
||||
OrderID: &order.ID,
|
||||
Amount: order.CreditAmount,
|
||||
Status: storemodel.CreditLedgerStatusApplied,
|
||||
Description: creditPurchaseDescription(order.ProductName),
|
||||
MetadataJSON: creditMetadataJSON(map[string]any{"order_no": order.OrderNo, "payment_mode": paymentMode}),
|
||||
CreatedAt: now,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
paidAt := order.PaidAt
|
||||
if paidAt == nil || paidAt.IsZero() {
|
||||
paidAt = &now
|
||||
}
|
||||
creditedAt := order.CreditedAt
|
||||
if creditedAt == nil || creditedAt.IsZero() {
|
||||
ledgerCreatedAt := ledger.CreatedAt
|
||||
if ledgerCreatedAt.IsZero() {
|
||||
ledgerCreatedAt = now
|
||||
}
|
||||
creditedAt = &ledgerCreatedAt
|
||||
}
|
||||
|
||||
if err := txDAO.UpdateOrderState(ctx, order.ID, storemodel.CreditOrderStatusCredited, paidAt, creditedAt, paymentMode); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
order.Status = storemodel.CreditOrderStatusCredited
|
||||
order.PaidAt = paidAt
|
||||
order.CreditedAt = creditedAt
|
||||
order.PaymentMode = paymentMode
|
||||
resultOrder = *order
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
s.syncCreditCacheBestEffort(ctx, req.ActorUserID, nil, nil)
|
||||
view := creditOrderViewFromModel(resultOrder)
|
||||
return &view, nil
|
||||
}
|
||||
|
||||
func (s *Service) creditOrderViewByID(ctx context.Context, actorUserID uint64, orderID uint64) (*creditcontracts.CreditOrderView, error) {
|
||||
order, err := s.creditDAO.FindOrderByID(ctx, orderID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if order == nil {
|
||||
return nil, tokenStoreBadRequest("Credit 订单不存在")
|
||||
}
|
||||
if order.UserID != actorUserID {
|
||||
return nil, tokenStoreBadRequest("Credit 订单不属于当前用户")
|
||||
}
|
||||
view := creditOrderViewFromModel(*order)
|
||||
return &view, nil
|
||||
}
|
||||
|
||||
func creditPurchaseDescription(productName string) string {
|
||||
trimmed := strings.TrimSpace(productName)
|
||||
if trimmed == "" {
|
||||
return "购买 Credit 商品"
|
||||
}
|
||||
return "购买" + trimmed
|
||||
}
|
||||
|
||||
func paymentModeOrDefault(current string, fallback string) string {
|
||||
if trimmed := strings.TrimSpace(current); trimmed != "" {
|
||||
return trimmed
|
||||
}
|
||||
if trimmed := strings.TrimSpace(fallback); trimmed != "" {
|
||||
return trimmed
|
||||
}
|
||||
return "mock"
|
||||
}
|
||||
Reference in New Issue
Block a user