Merge branch 'feat-hjj-packageManage#A116' into dev
This commit is contained in:
commit
06bf3e2bc8
@ -380,8 +380,8 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
|
||||
ServiceType: valueAddService.ServiceType,
|
||||
}
|
||||
for _, serviceLang := range valueAddService.ValueAddServiceLang {
|
||||
if serviceLang.QuotaType == 0 && serviceInfo.ServiceType != 5 && serviceInfo.ServiceType != 4 {
|
||||
serviceLang.QuotaType = 1
|
||||
if serviceLang.QuotaType == 0 && serviceInfo.ServiceType != msg.AccountService && serviceInfo.ServiceType != msg.AvailableTimeService {
|
||||
serviceLang.QuotaType = msg.UnlimitedQuota
|
||||
}
|
||||
serviceLangInfo := &bundle.ValueAddServiceLang{
|
||||
Uuid: valueAddService.UUID,
|
||||
@ -472,6 +472,9 @@ func ValueAddServiceDetail(req *bundle.ValueAddServiceDetailRequest) (res *bundl
|
||||
valueAddService.ServiceName = detail.ServiceName
|
||||
valueAddService.ServiceType = detail.ServiceType
|
||||
for _, serviceLang := range detail.ValueAddServiceLang {
|
||||
if serviceLang.QuotaType == 0 && valueAddService.ServiceType != msg.AccountService && valueAddService.ServiceType != msg.AvailableTimeService {
|
||||
serviceLang.QuotaType = msg.UnlimitedQuota
|
||||
}
|
||||
langOptions := []*bundle.ValueAddPriceOptions{}
|
||||
if len(serviceLang.Options) > 0 {
|
||||
for _, opt := range serviceLang.Options {
|
||||
|
@ -105,3 +105,18 @@ const (
|
||||
ErrorValueServicePriceModeEmpty = "增值服务价格模式不能为空"
|
||||
ErrorValueServiceOptionsEmpty = "增值服务选项不能为空"
|
||||
)
|
||||
|
||||
// 服务额度信息
|
||||
const (
|
||||
UnlimitedQuota = 1 //不限额度
|
||||
LimitedQuota = 2 //限制额度
|
||||
)
|
||||
|
||||
// 服务类型
|
||||
const (
|
||||
VideoService = 1 //视频
|
||||
TextService = 2 //图文
|
||||
DataReportService = 3 //数据报表
|
||||
AccountService = 4 //账号数
|
||||
AvailableTimeService = 5 //可用时长
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user