fiee/micro-bundle
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-packageManage#A116' into dev

Browse Source
This commit is contained in:
jiaji.H 2025-10-11 13:29:23 +08:00
commit 06bf3e2bc8
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/logic/valueAddBundleLogic.go
View File

@ -380,8 +380,8 @@ func ValueAddServiceList(req *bundle.ValueAddServiceListRequest) (res *bundle.Va
ServiceType: valueAddService.ServiceType, ServiceType: valueAddService.ServiceType,
} }
for _, serviceLang := range valueAddService.ValueAddServiceLang { for _, serviceLang := range valueAddService.ValueAddServiceLang {
if serviceLang.QuotaType == 0 && serviceInfo.ServiceType != 5 && serviceInfo.ServiceType != 4 { if serviceLang.QuotaType == 0 && serviceInfo.ServiceType != msg.AccountService && serviceInfo.ServiceType != msg.AvailableTimeService {
serviceLang.QuotaType = 1 serviceLang.QuotaType = msg.UnlimitedQuota
} }
serviceLangInfo := &bundle.ValueAddServiceLang{ serviceLangInfo := &bundle.ValueAddServiceLang{
Uuid: valueAddService.UUID, Uuid: valueAddService.UUID,
@ -472,6 +472,9 @@ func ValueAddServiceDetail(req *bundle.ValueAddServiceDetailRequest) (res *bundl
valueAddService.ServiceName = detail.ServiceName valueAddService.ServiceName = detail.ServiceName
valueAddService.ServiceType = detail.ServiceType valueAddService.ServiceType = detail.ServiceType
for _, serviceLang := range detail.ValueAddServiceLang { for _, serviceLang := range detail.ValueAddServiceLang {
if serviceLang.QuotaType == 0 && valueAddService.ServiceType != msg.AccountService && valueAddService.ServiceType != msg.AvailableTimeService {
serviceLang.QuotaType = msg.UnlimitedQuota
}
langOptions := []*bundle.ValueAddPriceOptions{} langOptions := []*bundle.ValueAddPriceOptions{}
if len(serviceLang.Options) > 0 { if len(serviceLang.Options) > 0 {
for _, opt := range serviceLang.Options { for _, opt := range serviceLang.Options {

15
pkg/msg/msg.go
View File

@ -105,3 +105,18 @@ const (
ErrorValueServicePriceModeEmpty = "增值服务价格模式不能为空" ErrorValueServicePriceModeEmpty = "增值服务价格模式不能为空"
ErrorValueServiceOptionsEmpty = "增值服务选项不能为空" ErrorValueServiceOptionsEmpty = "增值服务选项不能为空"
) )
// 服务额度信息
const (
UnlimitedQuota = 1 //不限额度
LimitedQuota = 2 //限制额度
)
// 服务类型
const (
VideoService = 1 //视频
TextService = 2 //图文
DataReportService = 3 //数据报表
AccountService = 4 //账号数
AvailableTimeService = 5 //可用时长
)