fix(tenant): 收紧双站运营提号与录单边界
This commit is contained in:
@@ -18,6 +18,7 @@ import (
|
||||
"hfb_sys/backend/internal/modules/notification"
|
||||
"hfb_sys/backend/internal/modules/rentergrowth"
|
||||
"hfb_sys/backend/internal/modules/wallet"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
"hfb_sys/backend/internal/timeutil"
|
||||
"hfb_sys/backend/pkg/money"
|
||||
|
||||
@@ -34,6 +35,10 @@ func NewRepository(db *gorm.DB) *Repository {
|
||||
return &Repository{db: db}
|
||||
}
|
||||
|
||||
func pickupTenantScope(ctx context.Context, db *gorm.DB, column string) *gorm.DB {
|
||||
return db.Where(column+" = ?", tenancy.IDFromContext(ctx))
|
||||
}
|
||||
|
||||
// Create 创建提号订单(状态:提号中)。
|
||||
// 与正常订单支付成功一致:listing 置 rented + in_transaction,从商品管理「已上架」中移出。
|
||||
// 不结算、不动钱包。
|
||||
@@ -92,8 +97,15 @@ func (r *Repository) Create(ctx context.Context, req CreateRequest, adminID uint
|
||||
}
|
||||
}
|
||||
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
sourceTenantID := listing.SourceTenantID
|
||||
if sourceTenantID == 0 {
|
||||
sourceTenantID = tenantID
|
||||
}
|
||||
pickup := model.AdminPickup{
|
||||
PickupNo: pickupNo,
|
||||
TenantID: tenantID,
|
||||
SourceTenantID: sourceTenantID,
|
||||
ListingID: listing.ID,
|
||||
AccountID: listing.AccountID,
|
||||
OwnerID: listing.OwnerID,
|
||||
@@ -122,6 +134,8 @@ func (r *Repository) Create(ctx context.Context, req CreateRequest, adminID uint
|
||||
return err
|
||||
}
|
||||
if err := appendPickupEvent(tx, pickup, "pickup_created", adminID, "管理员创建线下提号。", pickup.Remark, map[string]any{
|
||||
"tenant_id": pickup.TenantID,
|
||||
"source_tenant_id": pickup.SourceTenantID,
|
||||
"listing_price_cent": pickup.ListingPriceCent,
|
||||
"order_amount_cent": pickup.OrderAmountCent,
|
||||
"deposit_amount_cent": pickup.DepositAmountCent,
|
||||
@@ -180,6 +194,8 @@ func (r *Repository) Create(ctx context.Context, req CreateRequest, adminID uint
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"pickup_no": pickupNo,
|
||||
"tenant_id": pickup.TenantID,
|
||||
"source_tenant_id": pickup.SourceTenantID,
|
||||
"listing_id": listing.ID,
|
||||
"platform": pickup.Platform,
|
||||
"third_party_order_no": pickup.ThirdPartyOrderNo,
|
||||
@@ -212,7 +228,8 @@ func (r *Repository) Complete(ctx context.Context, pickupID uint64, req Complete
|
||||
}
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -382,7 +399,8 @@ func (r *Repository) MarkOfflineSettlement(ctx context.Context, pickupID uint64,
|
||||
}
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -462,7 +480,8 @@ func (r *Repository) UpdateProfit(ctx context.Context, pickupID uint64, req Upda
|
||||
}
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -517,7 +536,8 @@ func (r *Repository) UpdateThirdPartyOrderNo(ctx context.Context, pickupID uint6
|
||||
}
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -568,7 +588,8 @@ func (r *Repository) CreateFinancialAdjustment(ctx context.Context, pickupID uin
|
||||
}
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -607,6 +628,7 @@ func (r *Repository) CreateFinancialAdjustment(ctx context.Context, pickupID uin
|
||||
}
|
||||
}
|
||||
adjustment := model.AdminPickupFinancialAdjustment{
|
||||
TenantID: pickup.TenantID,
|
||||
PickupID: pickup.ID,
|
||||
ProfitDeltaCent: profitDeltaCent,
|
||||
SettleDeltaCent: settleDeltaCent,
|
||||
@@ -672,14 +694,15 @@ func (r *Repository) ListFinancialAdjustments(ctx context.Context, pickupID uint
|
||||
return nil, ErrDependencyUnavailable
|
||||
}
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.AdminPickup{}).Where("id = ?", pickupID).Count(&count).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.AdminPickup{}), "tenant_id").
|
||||
Where("id = ?", pickupID).Count(&count).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count == 0 {
|
||||
return nil, ErrPickupNotFound
|
||||
}
|
||||
items := make([]FinancialAdjustmentDTO, 0)
|
||||
if err := r.db.WithContext(ctx).Model(&model.AdminPickupFinancialAdjustment{}).
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.AdminPickupFinancialAdjustment{}), "tenant_id").
|
||||
Where("pickup_id = ?", pickupID).
|
||||
Order("id DESC").
|
||||
Find(&items).Error; err != nil {
|
||||
@@ -695,7 +718,8 @@ func (r *Repository) SettleFinancialAdjustment(ctx context.Context, adjustmentID
|
||||
}
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var adjustment model.AdminPickupFinancialAdjustment
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&adjustment, adjustmentID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&adjustment, adjustmentID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrFinancialAdjustmentNotFound
|
||||
}
|
||||
@@ -714,7 +738,7 @@ func (r *Repository) SettleFinancialAdjustment(ctx context.Context, adjustmentID
|
||||
return err
|
||||
}
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.First(&pickup, adjustment.PickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").First(&pickup, adjustment.PickupID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := appendPickupEvent(tx, pickup, "pickup_adjustment_settled", adminID, "确认提号财务调整已处理。", adjustment.SettlementRemark, map[string]any{
|
||||
@@ -751,7 +775,8 @@ func (r *Repository) Cancel(ctx context.Context, pickupID uint64, reason string,
|
||||
}
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var pickup model.AdminPickup
|
||||
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Clauses(clause.Locking{Strength: "UPDATE"}).First(&pickup, pickupID).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupNotFound
|
||||
}
|
||||
@@ -827,7 +852,7 @@ func (r *Repository) FindByID(ctx context.Context, id uint64) (*PickupDTO, error
|
||||
return nil, ErrDependencyUnavailable
|
||||
}
|
||||
var row pickupRow
|
||||
if err := r.baseQuery(ctx).Where("p.id = ?", id).First(&row).Error; err != nil {
|
||||
if err := r.adminBaseQuery(ctx).Where("p.id = ?", id).First(&row).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrPickupNotFound
|
||||
}
|
||||
@@ -870,8 +895,11 @@ func applyAdminPickupFilters(db *gorm.DB, query AdminPickupQuery) *gorm.DB {
|
||||
if kw := strings.TrimSpace(query.Keyword); kw != "" {
|
||||
upper := strings.ToUpper(kw)
|
||||
if isPhoneKeyword(kw) {
|
||||
// 先由 users(phone) 唯一索引解析用户,再让 admin_pickups(owner_id) 索引驱动。
|
||||
db = db.Where("p.owner_id = (SELECT id FROM users WHERE phone = ?)", kw)
|
||||
// 同手机号可同时存在于多个经营站点,必须按提号单已关联的 owner_id 精确匹配。
|
||||
db = db.Where(
|
||||
"EXISTS (SELECT 1 FROM users AS pickup_owner WHERE pickup_owner.id = p.owner_id AND pickup_owner.phone = ?)",
|
||||
kw,
|
||||
)
|
||||
} else if strings.HasPrefix(upper, "PK") || strings.HasPrefix(upper, "P") {
|
||||
// 提号编号:命中 admin_pickups(pickup_no) 唯一索引
|
||||
db = db.Where("p.pickup_no = ?", kw)
|
||||
@@ -898,25 +926,26 @@ func applyAdminPickupFilters(db *gorm.DB, query AdminPickupQuery) *gorm.DB {
|
||||
}
|
||||
|
||||
func (r *Repository) adminPickupCountQuery(ctx context.Context, query AdminPickupQuery) *gorm.DB {
|
||||
base := pickupTenantScope(ctx, r.db.WithContext(ctx).Table("admin_pickups AS p"), "p.tenant_id")
|
||||
kw := strings.TrimSpace(query.Keyword)
|
||||
if kw == "" {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p")
|
||||
return base
|
||||
}
|
||||
upper := strings.ToUpper(kw)
|
||||
if strings.HasPrefix(upper, "PK") || strings.HasPrefix(upper, "P") {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p")
|
||||
return base
|
||||
}
|
||||
if id, err := strconv.ParseUint(kw, 10, 64); err == nil && id > 0 && kw[0] != '0' && id < 100000000 {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p")
|
||||
return base
|
||||
}
|
||||
if isPhoneKeyword(kw) {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p")
|
||||
return base
|
||||
}
|
||||
if strings.HasPrefix(upper, "L") || (len(kw) >= 12 && isAllDigits(kw)) {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p").
|
||||
return base.
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id")
|
||||
}
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p").
|
||||
return base.
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Joins("JOIN game_accounts AS a ON a.id = p.account_id").
|
||||
Joins("JOIN users AS owner ON owner.id = p.owner_id")
|
||||
@@ -930,7 +959,7 @@ func (r *Repository) ListAdmin(ctx context.Context, query AdminPickupQuery) (*Pa
|
||||
offset := (page - 1) * pageSize
|
||||
|
||||
var rows []pickupRow
|
||||
db := applyAdminPickupFilters(r.baseQuery(ctx), query)
|
||||
db := applyAdminPickupFilters(r.adminBaseQuery(ctx), query)
|
||||
if err := db.Order("p.id DESC").Offset(offset).Limit(pageSize).Scan(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -966,7 +995,8 @@ func (r *Repository) ListShopNames(ctx context.Context, platform string) ([]stri
|
||||
seen := make(map[string]struct{})
|
||||
|
||||
// 1. 查询店铺配置表中的 active 店铺
|
||||
shopDB := r.db.WithContext(ctx).Model(&model.PickupShop{}).Where("status = ?", PickupShopStatusActive)
|
||||
shopDB := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShop{}), "tenant_id").
|
||||
Where("status = ?", PickupShopStatusActive)
|
||||
if val := strings.TrimSpace(platform); val != "" {
|
||||
shopDB = shopDB.Where("platform = ? OR platform = ''", val)
|
||||
}
|
||||
@@ -984,7 +1014,8 @@ func (r *Repository) ListShopNames(ctx context.Context, platform string) ([]stri
|
||||
}
|
||||
|
||||
// 2. 查询 admin_pickups 中的历史店铺作为补充
|
||||
historyDB := r.db.WithContext(ctx).Model(&model.AdminPickup{}).Where("shop_name <> ''")
|
||||
historyDB := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.AdminPickup{}), "tenant_id").
|
||||
Where("shop_name <> ''")
|
||||
if val := strings.TrimSpace(platform); val != "" {
|
||||
historyDB = historyDB.Where("platform = ?", val)
|
||||
}
|
||||
@@ -1010,7 +1041,7 @@ func (r *Repository) ListShops(ctx context.Context, query PickupShopQuery) ([]Pi
|
||||
if r == nil || r.db == nil {
|
||||
return nil, ErrDependencyUnavailable
|
||||
}
|
||||
db := r.db.WithContext(ctx).Model(&model.PickupShop{})
|
||||
db := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShop{}), "tenant_id")
|
||||
if kw := strings.TrimSpace(query.Keyword); kw != "" {
|
||||
like := "%" + kw + "%"
|
||||
db = db.Where("name LIKE ? OR remark LIKE ?", like, like)
|
||||
@@ -1051,7 +1082,9 @@ func (r *Repository) CreateShop(ctx context.Context, req CreatePickupShopRequest
|
||||
return nil, ErrInvalidAmount
|
||||
}
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.PickupShop{}).Where("name = ?", name).Count(&count).Error; err != nil {
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShop{}), "tenant_id").
|
||||
Where("name = ?", name).Count(&count).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count > 0 {
|
||||
@@ -1063,6 +1096,7 @@ func (r *Repository) CreateShop(ctx context.Context, req CreatePickupShopRequest
|
||||
}
|
||||
now := time.Now()
|
||||
shop := model.PickupShop{
|
||||
TenantID: tenantID,
|
||||
Name: name,
|
||||
Platform: strings.TrimSpace(req.Platform),
|
||||
Status: status,
|
||||
@@ -1083,10 +1117,11 @@ func (r *Repository) CreateShop(ctx context.Context, req CreatePickupShopRequest
|
||||
BizID: &bid,
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
"platform": shop.Platform,
|
||||
"status": shop.Status,
|
||||
"tenant_id": tenantID,
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
"platform": shop.Platform,
|
||||
"status": shop.Status,
|
||||
},
|
||||
})
|
||||
return &PickupShopDTO{
|
||||
@@ -1111,14 +1146,15 @@ func (r *Repository) UpdateShop(ctx context.Context, id uint64, req UpdatePickup
|
||||
return nil, ErrInvalidAmount
|
||||
}
|
||||
var shop model.PickupShop
|
||||
if err := r.db.WithContext(ctx).First(&shop, id).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx), "tenant_id").First(&shop, id).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrPickupShopNotFound
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.PickupShop{}).Where("name = ? AND id <> ?", name, id).Count(&count).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShop{}), "tenant_id").
|
||||
Where("name = ? AND id <> ?", name, id).Count(&count).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if count > 0 {
|
||||
@@ -1142,10 +1178,11 @@ func (r *Repository) UpdateShop(ctx context.Context, id uint64, req UpdatePickup
|
||||
BizID: &bid,
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
"platform": shop.Platform,
|
||||
"status": shop.Status,
|
||||
"tenant_id": shop.TenantID,
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
"platform": shop.Platform,
|
||||
"status": shop.Status,
|
||||
},
|
||||
})
|
||||
return &PickupShopDTO{
|
||||
@@ -1166,7 +1203,7 @@ func (r *Repository) DeleteShop(ctx context.Context, id uint64, adminID uint64,
|
||||
return ErrDependencyUnavailable
|
||||
}
|
||||
var shop model.PickupShop
|
||||
if err := r.db.WithContext(ctx).First(&shop, id).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx), "tenant_id").First(&shop, id).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrPickupShopNotFound
|
||||
}
|
||||
@@ -1184,8 +1221,9 @@ func (r *Repository) DeleteShop(ctx context.Context, id uint64, adminID uint64,
|
||||
BizID: &bid,
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
"tenant_id": shop.TenantID,
|
||||
"shop_id": shop.ID,
|
||||
"name": shop.Name,
|
||||
},
|
||||
})
|
||||
return nil
|
||||
@@ -1202,7 +1240,7 @@ func (r *Repository) GetHistoricalShopStats(ctx context.Context) (*PickupShopHis
|
||||
Cnt int64 `gorm:"column:cnt"`
|
||||
}
|
||||
var rows []rawCountRow
|
||||
err := r.db.WithContext(ctx).Model(&model.AdminPickup{}).
|
||||
err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.AdminPickup{}), "tenant_id").
|
||||
Select("CASE WHEN raw_shop_name <> '' THEN raw_shop_name ELSE shop_name END AS source_name, COUNT(*) AS cnt").
|
||||
Group("source_name").
|
||||
Order("cnt DESC, source_name ASC").
|
||||
@@ -1212,7 +1250,8 @@ func (r *Repository) GetHistoricalShopStats(ctx context.Context) (*PickupShopHis
|
||||
}
|
||||
|
||||
var standardShops []model.PickupShop
|
||||
if err := r.db.WithContext(ctx).Model(&model.PickupShop{}).Find(&standardShops).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShop{}), "tenant_id").
|
||||
Find(&standardShops).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
standardMap := make(map[string]model.PickupShop)
|
||||
@@ -1221,7 +1260,8 @@ func (r *Repository) GetHistoricalShopStats(ctx context.Context) (*PickupShopHis
|
||||
}
|
||||
|
||||
var mappings []model.PickupShopMapping
|
||||
if err := r.db.WithContext(ctx).Model(&model.PickupShopMapping{}).Find(&mappings).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, r.db.WithContext(ctx).Model(&model.PickupShopMapping{}), "tenant_id").
|
||||
Find(&mappings).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mappingMap := make(map[string]model.PickupShopMapping)
|
||||
@@ -1314,16 +1354,18 @@ func (r *Repository) MapHistoricalShops(ctx context.Context, req MapHistoricalSh
|
||||
|
||||
var result MapHistoricalShopsResultDTO
|
||||
result.TargetShopName = targetName
|
||||
tenantID := tenancy.IDFromContext(ctx)
|
||||
|
||||
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var targetShop model.PickupShop
|
||||
findErr := tx.Where("name = ?", targetName).First(&targetShop).Error
|
||||
findErr := pickupTenantScope(ctx, tx, "tenant_id").Where("name = ?", targetName).First(&targetShop).Error
|
||||
if errors.Is(findErr, gorm.ErrRecordNotFound) {
|
||||
if !req.CreateTargetMissing {
|
||||
return ErrPickupShopNotFound
|
||||
}
|
||||
now := time.Now()
|
||||
targetShop = model.PickupShop{
|
||||
TenantID: tenantID,
|
||||
Name: targetName,
|
||||
Platform: strings.TrimSpace(req.TargetPlatform),
|
||||
Status: PickupShopStatusActive,
|
||||
@@ -1345,12 +1387,13 @@ func (r *Repository) MapHistoricalShops(ctx context.Context, req MapHistoricalSh
|
||||
if err := tx.Exec(`UPDATE admin_pickups
|
||||
SET raw_shop_name = shop_name
|
||||
WHERE (raw_shop_name = '' OR raw_shop_name IS NULL)
|
||||
AND (shop_name IN ? OR (shop_name = '' AND '' IN ?))`, fromNames, fromNames).Error; err != nil {
|
||||
AND tenant_id = ?
|
||||
AND (shop_name IN ? OR (shop_name = '' AND '' IN ?))`, tenantID, fromNames, fromNames).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 批量更新 admin_pickups 的 shop_name
|
||||
res := tx.Model(&model.AdminPickup{}).
|
||||
res := pickupTenantScope(ctx, tx.Model(&model.AdminPickup{}), "tenant_id").
|
||||
Where("raw_shop_name IN ?", fromNames).
|
||||
Update("shop_name", targetName)
|
||||
if res.Error != nil {
|
||||
@@ -1364,11 +1407,14 @@ func (r *Repository) MapHistoricalShops(ctx context.Context, req MapHistoricalSh
|
||||
continue
|
||||
}
|
||||
var mappedCount int64
|
||||
tx.Model(&model.AdminPickup{}).Where("raw_shop_name = ?", fromName).Count(&mappedCount)
|
||||
pickupTenantScope(ctx, tx.Model(&model.AdminPickup{}), "tenant_id").
|
||||
Where("raw_shop_name = ?", fromName).Count(&mappedCount)
|
||||
|
||||
var existing model.PickupShopMapping
|
||||
if err := tx.Where("source_name = ?", fromName).First(&existing).Error; errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Where("source_name = ?", fromName).First(&existing).Error; errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
newMapping := model.PickupShopMapping{
|
||||
TenantID: tenantID,
|
||||
SourceName: fromName,
|
||||
TargetShopID: targetShop.ID,
|
||||
TargetShopName: targetName,
|
||||
@@ -1405,6 +1451,7 @@ func (r *Repository) MapHistoricalShops(ctx context.Context, req MapHistoricalSh
|
||||
BizID: &bid,
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"tenant_id": tenantID,
|
||||
"target_shop_id": targetShop.ID,
|
||||
"target_shop_name": targetName,
|
||||
"from_shop_names": fromNames,
|
||||
@@ -1428,13 +1475,14 @@ func (r *Repository) DeleteShopMapping(ctx context.Context, sourceName string, a
|
||||
}
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var mapping model.PickupShopMapping
|
||||
if err := tx.Where("source_name = ?", sourceName).First(&mapping).Error; err != nil {
|
||||
if err := pickupTenantScope(ctx, tx, "tenant_id").
|
||||
Where("source_name = ?", sourceName).First(&mapping).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
if err := tx.Model(&model.AdminPickup{}).
|
||||
if err := pickupTenantScope(ctx, tx.Model(&model.AdminPickup{}), "tenant_id").
|
||||
Where("raw_shop_name = ?", sourceName).
|
||||
Update("shop_name", sourceName).Error; err != nil {
|
||||
return err
|
||||
@@ -1451,6 +1499,7 @@ func (r *Repository) DeleteShopMapping(ctx context.Context, sourceName string, a
|
||||
BizID: &bid,
|
||||
Meta: meta,
|
||||
Detail: map[string]any{
|
||||
"tenant_id": mapping.TenantID,
|
||||
"source_name": sourceName,
|
||||
"target_shop_name": mapping.TargetShopName,
|
||||
},
|
||||
@@ -1517,9 +1566,11 @@ func (r *Repository) ListAvailableListings(ctx context.Context, query AvailableL
|
||||
q := r.db.WithContext(ctx).Table("rental_listings AS l").
|
||||
Joins("JOIN game_accounts AS a ON a.id = l.account_id").
|
||||
Joins("JOIN users AS owner ON owner.id = l.owner_id").
|
||||
Joins("LEFT JOIN tenants AS source_tenant ON source_tenant.id = l.source_tenant_id").
|
||||
Joins("LEFT JOIN (?) AS latest_upload ON latest_upload.listing_id = l.id", latestUploads).
|
||||
Joins("LEFT JOIN listing_uploads AS lu ON lu.id = latest_upload.upload_id").
|
||||
Where("l.status = ? AND l.review_status = ? AND l.in_transaction = ?", "published", "approved", false)
|
||||
Where("l.status = ? AND l.review_status = ? AND l.in_transaction = ?", "published", "approved", false).
|
||||
Where("(l.distribution_site_id IS NULL OR l.distribution_site_id = 0)")
|
||||
if kw := strings.TrimSpace(query.Keyword); kw != "" {
|
||||
upper := strings.ToUpper(kw)
|
||||
if strings.HasPrefix(upper, "L") || (len(kw) >= 12 && isAllDigits(kw)) {
|
||||
@@ -1540,7 +1591,10 @@ func (r *Repository) ListAvailableListings(ctx context.Context, query AvailableL
|
||||
|
||||
page, pageSize := normalizePaging(query.Page, query.PageSize)
|
||||
var rows []availableListingRow
|
||||
if err := buildQuery().Select(`l.id, l.listing_no, l.account_id, l.owner_id, l.price_cent AS listing_price_cent,
|
||||
if err := buildQuery().Select(`l.id, l.source_tenant_id,
|
||||
COALESCE(source_tenant.code, '') AS source_tenant_code,
|
||||
COALESCE(source_tenant.name, '') AS source_tenant_name,
|
||||
l.listing_no, l.account_id, l.owner_id, l.price_cent AS listing_price_cent,
|
||||
a.title AS account_title, a.server_region, a.login_platform, a.haf_coin_amount, a.asset_summary,
|
||||
owner.phone AS owner_phone, l.handoff_mode, l.settlement_mode,
|
||||
CASE WHEN lu.id IS NULL THEN 0 ELSE 1 END AS is_external_upload,
|
||||
@@ -1557,8 +1611,11 @@ func (r *Repository) ListAvailableListings(ctx context.Context, query AvailableL
|
||||
}
|
||||
}
|
||||
items := make([]AvailableListingDTO, 0, len(rows))
|
||||
currentTenantID := tenancy.IDFromContext(ctx)
|
||||
for _, row := range rows {
|
||||
items = append(items, row.toDTO())
|
||||
item := row.toDTO()
|
||||
item.IsCrossTenant = currentTenantID > 0 && item.SourceTenantID > 0 && item.SourceTenantID != currentTenantID
|
||||
items = append(items, item)
|
||||
}
|
||||
return &AvailableListingsResult{Items: items, Total: total, Page: page, PageSize: pageSize}, nil
|
||||
}
|
||||
@@ -1566,15 +1623,29 @@ func (r *Repository) ListAvailableListings(ctx context.Context, query AvailableL
|
||||
func (r *Repository) baseQuery(ctx context.Context) *gorm.DB {
|
||||
return r.db.WithContext(ctx).Table("admin_pickups AS p").
|
||||
Select(`p.*, l.listing_no, a.title AS account_title, a.server_region, a.login_platform, owner.phone AS owner_phone,
|
||||
COALESCE(pickup_tenant.code, '') AS tenant_code,
|
||||
COALESCE(pickup_tenant.name, '') AS tenant_name,
|
||||
COALESCE(source_tenant.code, '') AS source_tenant_code,
|
||||
COALESCE(source_tenant.name, '') AS source_tenant_name,
|
||||
COALESCE((SELECT SUM(fa.profit_delta_cent) FROM admin_pickup_financial_adjustments AS fa WHERE fa.pickup_id = p.id), 0) AS profit_adjustment_cent,
|
||||
COALESCE((SELECT SUM(fa.settle_delta_cent) FROM admin_pickup_financial_adjustments AS fa WHERE fa.pickup_id = p.id), 0) AS settle_adjustment_cent`).
|
||||
Joins("JOIN rental_listings AS l ON l.id = p.listing_id").
|
||||
Joins("JOIN game_accounts AS a ON a.id = p.account_id").
|
||||
Joins("JOIN users AS owner ON owner.id = p.owner_id")
|
||||
Joins("JOIN users AS owner ON owner.id = p.owner_id").
|
||||
Joins("LEFT JOIN tenants AS pickup_tenant ON pickup_tenant.id = p.tenant_id").
|
||||
Joins("LEFT JOIN tenants AS source_tenant ON source_tenant.id = p.source_tenant_id")
|
||||
}
|
||||
|
||||
func (r *Repository) adminBaseQuery(ctx context.Context) *gorm.DB {
|
||||
return pickupTenantScope(ctx, r.baseQuery(ctx), "p.tenant_id")
|
||||
}
|
||||
|
||||
type pickupRow struct {
|
||||
model.AdminPickup
|
||||
TenantCode string
|
||||
TenantName string
|
||||
SourceTenantCode string
|
||||
SourceTenantName string
|
||||
ListingNo string
|
||||
AccountTitle string
|
||||
ServerRegion string
|
||||
@@ -1587,6 +1658,13 @@ type pickupRow struct {
|
||||
func (row pickupRow) toDTO() PickupDTO {
|
||||
return PickupDTO{
|
||||
ID: row.ID,
|
||||
TenantID: row.TenantID,
|
||||
TenantCode: row.TenantCode,
|
||||
TenantName: row.TenantName,
|
||||
SourceTenantID: row.SourceTenantID,
|
||||
SourceTenantCode: row.SourceTenantCode,
|
||||
SourceTenantName: row.SourceTenantName,
|
||||
IsCrossTenant: row.TenantID > 0 && row.SourceTenantID > 0 && row.TenantID != row.SourceTenantID,
|
||||
PickupNo: row.PickupNo,
|
||||
ListingID: row.ListingID,
|
||||
ListingNo: row.ListingNo,
|
||||
@@ -1675,6 +1753,9 @@ func pickupRequiresOfflineSettlement(pickup model.AdminPickup) bool {
|
||||
|
||||
type availableListingRow struct {
|
||||
ID uint64
|
||||
SourceTenantID uint64
|
||||
SourceTenantCode string
|
||||
SourceTenantName string
|
||||
ListingNo string
|
||||
AccountID uint64
|
||||
AccountTitle string
|
||||
@@ -1702,6 +1783,9 @@ func (row availableListingRow) toDTO() AvailableListingDTO {
|
||||
}
|
||||
return AvailableListingDTO{
|
||||
ID: row.ID,
|
||||
SourceTenantID: row.SourceTenantID,
|
||||
SourceTenantCode: row.SourceTenantCode,
|
||||
SourceTenantName: row.SourceTenantName,
|
||||
ListingNo: row.ListingNo,
|
||||
AccountID: row.AccountID,
|
||||
AccountTitle: row.AccountTitle,
|
||||
|
||||
Reference in New Issue
Block a user