internal/logic/valueAddBundleLogic.go

@@ -340,15 +340,14 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
 		return res, errors.New("查询增值服务列表失败")
 	}
 	for _, valueAddService := range list {
+		var quotaInfo string
+		var isExpired bool
 		serviceInfo := &bundle.ValueAddService{
 			Uuid:        valueAddService.UUID,
 			ServiceName: valueAddService.ServiceName,
 			ServiceType: valueAddService.ServiceType,
 		}
 		for _, serviceLang := range valueAddService.ValueAddServiceLang {
-			if serviceLang.QuotaType == 0 && serviceInfo.ServiceType != 5 && serviceInfo.ServiceType != 4 {
-				serviceLang.QuotaType = 1
-			}
 			serviceLangInfo := &bundle.ValueAddServiceLang{
 				Uuid:          valueAddService.UUID,
 				ServiceName:   serviceLang.ServiceName,
@@ -364,10 +363,24 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
 				QuotaValue:    serviceLang.QuotaValue,
 				IsExpired:     serviceLang.IsExpired,
 			}
-			if serviceLangInfo.Language == "zh-CN" && serviceInfo.ServiceType != 5 && serviceInfo.ServiceType != 4 {
+			if serviceLangInfo.Language == "zh-CN" {
-				serviceInfo.QuotaType = serviceLangInfo.QuotaType
+				switch serviceLangInfo.QuotaType {
-				serviceInfo.QuotaValue = serviceLangInfo.QuotaValue
+				case 0:
-				serviceInfo.IsExpired = serviceLangInfo.IsExpired
+					quotaInfo = "不限额度"
+				case 1:
+					quotaInfo = fmt.Sprintf("每天%d个", serviceLangInfo.QuotaValue)
+				case 2:
+					quotaInfo = fmt.Sprintf("每月%d个", serviceLangInfo.QuotaValue)
+				case 3:
+					quotaInfo = fmt.Sprintf("每季度%d个", serviceLangInfo.QuotaValue)
+				case 4:
+					quotaInfo = fmt.Sprintf("每半年%d个", serviceLangInfo.QuotaValue)
+				case 5:
+					quotaInfo = fmt.Sprintf("每年%d个", serviceLangInfo.QuotaValue)
+				default:
+					quotaInfo = ""
+				}
+				isExpired = serviceLangInfo.IsExpired
 			}
 			if len(serviceLang.Options) > 0 {
 				var options []*bundle.ValueAddPriceOptions
@@ -397,6 +410,10 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
 				serviceLangInfo.Options = options
 			}
 			serviceInfo.ServiceLang = append(serviceInfo.ServiceLang, serviceLangInfo)
+			if quotaInfo != "" && serviceInfo.ServiceType != 5 {
+				serviceInfo.ServiceQuota = quotaInfo
+				serviceInfo.IsExpired = isExpired
+			}
 		}
 		res.ValueAddServiceList = append(res.ValueAddServiceList, serviceInfo)
 	}

pb/bundle.proto

@@ -514,9 +514,8 @@ message ValueAddService {
   string serviceName = 2 [json_name = "serviceName"]; //服务名称
   int32 serviceType = 3 [json_name = "serviceType"]; //服务类型
   repeated ValueAddServiceLang serviceLang = 4 [json_name = "serviceLang"]; //不太语言的服务详细
-  int32 quotaType = 5 [json_name = "quotaType"];//额度类型
+  string serviceQuota = 5 [json_name = "serviceQuota"];//服务额度
-  int32 quotaValue = 6 [json_name = "quotaValue"];//额度值
+  bool isExpired = 6 [json_name = "isExpired"];//是否过期作废
-  bool isExpired = 7 [json_name = "isExpired"];//是否过期作废
 }
 message ValueAddServiceLang {
   string uuid = 1 [json_name = "uuid"];

pb/bundle/bundle.validator.pb.go

@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )