修复(#130): 统一家庭成员促销资格口径
Build docker and publish / build (20.15.1) (push) Failing after 22m15s
Build docker and publish / build (20.15.1) (pull_request) Failing after 18m6s

Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
2026-05-30 01:58:15 -07:00
parent 3644e9ce3f
commit c2d1b5a0d8
2 changed files with 68 additions and 4 deletions
+9 -4
View File
@@ -41,6 +41,15 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
}
userInfo, _ := ctx.Value(constant.CtxKeyUser).(*user.User)
userID := int64(0)
if userInfo != nil {
entitlement, err := commonLogic.ResolveEntitlementUser(ctx, svcCtx.DB, userInfo.Id)
if err != nil {
return nil, err
}
userID = entitlement.EffectiveUserID
}
candidates, err := querySubscribePromoCandidates(ctx, svcCtx, subscribeIDs, userInfo != nil)
if err != nil {
if isMissingPromoTableError(err) {
@@ -49,10 +58,6 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
return nil, err
}
userID := int64(0)
if userInfo != nil {
userID = userInfo.Id
}
for _, candidate := range candidates {
if candidate.Quantity <= 0 {
continue