pkg/service/bundle/logic/bundleOrder.go

@@ -94,7 +94,6 @@ func BuildServiceRecords(req *bundle.OrderCreateRecord, bundleDetail *bundle.Bun
 		expirationDay    string
 		addUidService    = make(map[string]bool)
 		bundleUidService = make(map[string]bool)
-		foundExpiration  = false
 	)
 
 	// 分类权益
@@ -150,15 +149,12 @@ func BuildServiceRecords(req *bundle.OrderCreateRecord, bundleDetail *bundle.Bun
 		addRecords = append(addRecords, buildAddRecord(addService, uid, 0, num, 1))
 
 		// 计算到期时间
-		if !foundExpiration && addService.ServiceType == 5 {
+		if addService.ServiceType == 5 {
 			expirationDay = calculateExpirationDate(time.Now(), num, addService.Unit)
-			foundExpiration = true
+		} else {
+			expirationDay = time.Now().AddDate(0, 0, 7).Format("2006-01-02")
 		}
 	}
-	// 如果没有找到服务类型为5的，使用默认值
-	if !foundExpiration {
-		expirationDay = time.Now().AddDate(0, 0, 7).Format("2006-01-02")
-	}
 
 	return addRecords, addTotalPrice, expirationDay, nil
 }