fix(wallet): enforce consistent withdrawal accounting

This commit is contained in:
david
2026-07-31 09:54:17 +08:00
parent 36a5ced1c0
commit 42a2322c8e
23 changed files with 1405 additions and 250 deletions

View File

@@ -7,8 +7,7 @@ import (
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/heqiapp/platforms/backend/api/internal/impl"
clientcommon "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/client/common"
base "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
common "git.apinb.com/heqiapp/platforms/backend/api/internal/logic/common"
"git.apinb.com/heqiapp/platforms/backend/api/internal/models"
"github.com/gin-gonic/gin"
)
@@ -16,31 +15,31 @@ import (
// PublicGasStations 提供注册页所需的最小启用气站数据。
func PublicGasStations(ctx *gin.Context) {
var list []models.GasBasic
if err := impl.DBService.Select("identity", "name", "address").Where("status = ?", base.StatusEnable).Order("name").Find(&list).Error; err != nil {
if err := impl.DBService.Select("identity", "name", "address").Where("status = ?", common.StatusEnable).Order("name").Find(&list).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, base.ResourceResponse(list))
infra.Response.Success(ctx, common.ResourceResponse(list))
}
// PublicDeliveryPoints 提供指定气站下的启用配送点。
func PublicDeliveryPoints(ctx *gin.Context) {
var gas models.GasBasic
if impl.DBService.Where("identity = ? AND status = ?", ctx.Query("gas_identity"), base.StatusEnable).First(&gas).Error != nil {
if impl.DBService.Where("identity = ? AND status = ?", ctx.Query("gas_identity"), common.StatusEnable).First(&gas).Error != nil {
infra.Response.Error(ctx, errcode.ErrRecordNotFound)
return
}
var list []models.DeliveryBasic
if err := impl.DBService.Select("identity", "name", "address").Where("gas_basic_id = ? AND status = ?", gas.ID, base.StatusEnable).Order("name").Find(&list).Error; err != nil {
if err := impl.DBService.Select("identity", "name", "address").Where("gas_basic_id = ? AND status = ?", gas.ID, common.StatusEnable).Order("name").Find(&list).Error; err != nil {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, base.ResourceResponse(list))
infra.Response.Success(ctx, common.ResourceResponse(list))
}
// PublicContents 返回已发布内容,支持内容类型筛选。
func PublicContents(ctx *gin.Context) {
query := impl.DBService.Where("status = ? AND publish_status = ?", base.StatusEnable, "published")
query := impl.DBService.Where("status = ? AND publish_status = ?", common.StatusEnable, "published")
if contentType := strings.TrimSpace(ctx.Query("content_type")); contentType != "" {
query = query.Where("content_type = ?", contentType)
}
@@ -49,12 +48,12 @@ func PublicContents(ctx *gin.Context) {
infra.Response.Error(ctx, err)
return
}
infra.Response.Success(ctx, base.ResourceResponse(list))
infra.Response.Success(ctx, common.ResourceResponse(list))
}
// ConfirmContentRead 记录用户对特定内容版本的确认,幂等号全局唯一。
func ConfirmContentRead(ctx *gin.Context) {
account, ok := clientcommon.UserAccount(ctx)
account, ok := common.UserAccount(ctx)
if !ok {
return
}
@@ -74,7 +73,7 @@ func ConfirmContentRead(ctx *gin.Context) {
return
}
record := models.CmsContentRead{
Entity: base.NewEntity(base.StatusEnable), UserAccountID: account.ID, CmsContentID: content.ID,
Entity: common.NewEntity(common.StatusEnable), UserAccountID: account.ID, CmsContentID: content.ID,
VersionNo: content.VersionNo, ShownAt: time.Now(), ConfirmedAt: timePointer(time.Now()),
ClientVersion: request.ClientVersion, DeviceIdentity: request.DeviceIdentity, RequestNo: request.RequestNo,
}