fix(order): 修复分销收号商品在主站租用后报订单不存在的问题

This commit is contained in:
yml2213
2026-09-09 15:24:56 +08:00
parent f6ad7c34ee
commit 02d091434e
7 changed files with 85 additions and 31 deletions
+16 -10
View File
@@ -7,6 +7,7 @@ import (
"time"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/distribution"
"gorm.io/gorm"
)
@@ -21,11 +22,13 @@ func (r *Repository) ListForUser(ctx context.Context, userID uint64, page, pageS
code = strings.TrimSpace(siteCode[0])
}
if code != "" {
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code)
countBase = countBase.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code)
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code).
Where("o.distribution_mode != ?", distribution.ModeTwoPartyDistributorReceive)
countBase = countBase.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code).
Where("o.distribution_mode != ?", distribution.ModeTwoPartyDistributorReceive)
} else {
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0")
countBase = countBase.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0")
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0 OR o.distribution_mode = ?", distribution.ModeTwoPartyDistributorReceive)
countBase = countBase.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0 OR o.distribution_mode = ?", distribution.ModeTwoPartyDistributorReceive)
}
var total int64
@@ -64,9 +67,10 @@ func (r *Repository) ListSellerHandoffs(ctx context.Context, userID uint64, quer
base = base.Where("o.status = ?", query.Status)
}
if query.SiteCode != "" {
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", query.SiteCode)
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", query.SiteCode).
Where("o.distribution_mode != ?", distribution.ModeTwoPartyDistributorReceive)
} else {
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0")
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0 OR o.distribution_mode = ?", distribution.ModeTwoPartyDistributorReceive)
}
var total int64
@@ -98,9 +102,10 @@ func (r *Repository) ListSellerHandoffs(ctx context.Context, userID uint64, quer
func (r *Repository) sellerHandoffMetrics(ctx context.Context, userID uint64, siteCode ...string) (SellerHandoffMetrics, error) {
base := r.db.WithContext(ctx).Table("rental_orders AS o").Where("o.owner_id = ?", userID)
if len(siteCode) > 0 && siteCode[0] != "" {
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", siteCode[0])
base = base.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", siteCode[0]).
Where("o.distribution_mode != ?", distribution.ModeTwoPartyDistributorReceive)
} else if len(siteCode) > 0 {
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0")
base = base.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0 OR o.distribution_mode = ?", distribution.ModeTwoPartyDistributorReceive)
}
var metrics SellerHandoffMetrics
if err := base.Session(&gorm.Session{}).Where("o.status = ? AND o.handoff_status = ?", orderStatusPendingHandoff, handoffStatusPendingOwner).Count(&metrics.PendingHandoff).Error; err != nil {
@@ -340,9 +345,10 @@ func (r *Repository) FindForUser(ctx context.Context, userID uint64, orderID uin
code = strings.TrimSpace(siteCode[0])
}
if code != "" {
query = query.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code)
query = query.Joins("INNER JOIN distribution_sites AS ds ON ds.id = o.distribution_site_id AND ds.site_code = ?", code).
Where("o.distribution_mode != ?", distribution.ModeTwoPartyDistributorReceive)
} else if len(siteCode) > 0 {
query = query.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0")
query = query.Where("o.distribution_site_id IS NULL OR o.distribution_site_id = 0 OR o.distribution_mode = ?", distribution.ModeTwoPartyDistributorReceive)
}
if err := query.First(&row).Error; err != nil {