sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/logic/iot/cardpackage/renew.go

@@ -187,6 +187,7 @@ func (s *Service) RenewCurrentPackage(ctx context.Context, tx gdb.TX, in *RenewC
 		latestBind := latestBindsByIccid[iccid]
 		periodBegin := renewPeriodBeginAt(renewBaseExpireTime(card, latestBind), in.PackageBeginTime)
 		periodEnd := addMonths(periodBegin, durationMonths+giftDurationMonths)
+		_, effectiveStatus := calcPackageStatuses(now, periodBegin, periodEnd)
 		subscriptionNo, err := batchimport.NextRandomNo(subscriptionNoPrefix)
 		if err != nil {
 			return nil, err
@@ -201,7 +202,7 @@ func (s *Service) RenewCurrentPackage(ctx context.Context, tx gdb.TX, in *RenewC
 			PackageCode:         pkg.PackageCode,
 			PreviousPackageCode: currentPackageCode,
 			BusinessType:        consts.PackageBusinessTypeRenew,
-			EffectiveStatus:     consts.EffectiveStatusPending,
+			EffectiveStatus:     effectiveStatus,
 			HandleTime:          now,
 			EffectiveTime:       periodBegin,
 			ExpectedExpireTime:  periodEnd,
@@ -227,7 +228,7 @@ func (s *Service) RenewCurrentPackage(ctx context.Context, tx gdb.TX, in *RenewC
 			PackageCode:         pkg.PackageCode,
 			PreviousPackageCode: currentPackageCode,
 			BusinessType:        consts.PackageBusinessTypeRenew,
-			EffectiveStatus:     consts.EffectiveStatusPending,
+			EffectiveStatus:     effectiveStatus,
 			HandleTime:          now,
 			EffectiveTime:       periodBegin,
 			ExpectedExpireTime:  periodEnd,