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

Updata:更新新建余量信息

Browse Source
This commit is contained in:
jiaji.H 2026-02-05 15:04:20 +08:00
parent 94990cadbc
commit 85bceb0af9
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/dao/bundleExtend.go
View File

@ -177,6 +177,14 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (data mod
return return
} }
func GetBundleBalanceByOrderUuid(orderUuid string) (data model.BundleBalance, err error) {
err = app.ModuleClients.BundleDB.Model(&model.BundleBalance{}).Where("order_uuid = ?", orderUuid).First(&data).Error
if err != nil {
return data, err
}
return
}
func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err error) { func AddBundleBalanceByUserId(data model.BundleBalanceUsePo) (usedType int, err error) {
err = app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) (err error) { err = app.ModuleClients.BundleDB.Transaction(func(tx *gorm.DB) (err error) {
ba := model.BundleActivate{} ba := model.BundleActivate{}

24
internal/logic/bundleExtendLogic.go
View File

@ -315,8 +315,7 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
var data model.BundleBalance var data model.BundleBalance
orderReq := &bundle.OrderRecordsDetailRequest{} orderReq := &bundle.OrderRecordsDetailRequest{}
var addValues []model.BundleOrderValueAdd var addValues []model.BundleOrderValueAdd
var oldValues []model.BundleOrderValueAdd var oldValues model.BundleBalance
var oldAccountInfo model.RenewalInfo
fmt.Println("开始创建套餐OrderUuid:", req.OrderUUID) fmt.Println("开始创建套餐OrderUuid:", req.OrderUUID)
orderReq.Uuid = req.OrderUUID orderReq.Uuid = req.OrderUUID
orderInfo, err := dao.OrderRecordDetail(orderReq) orderInfo, err := dao.OrderRecordDetail(orderReq)
@ -336,18 +335,9 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
if err != nil || len(addValues) == 0 { if err != nil || len(addValues) == 0 {
return nil, errors.New("获取增值服务失败") return nil, errors.New("获取增值服务失败")
} }
oldValues, err = dao.GetValueAddByOrderUUID(orderInfo.RenewalOrderUUID) oldValues, err = dao.GetBundleBalanceByOrderUuid(orderInfo.RenewalOrderUUID)
if err != nil || len(addValues) == 0 { if err != nil || len(addValues) == 0 {
return nil, errors.New("获取增值服务失败") return nil, errors.New("获取旧套餐数据失败失败")
}
for _, od := range oldValues {
if od.ServiceType == 4 {
if od.EquityType == 1 { // 套餐权益
oldAccountInfo.AccountBundleNumber += int(od.Num)
} else {
oldAccountInfo.AccountIncreaseNumber += int(od.Num)
}
}
} }
} }
@ -446,16 +436,16 @@ func CreateBundleBalance(req *bundle.CreateBundleBalanceReq) (*bundle.CreateBund
//续费 //续费
if v.EquityType == 1 { // 套餐权益 if v.EquityType == 1 { // 套餐权益
data.BundleAccountNumber += int(v.Num) data.BundleAccountNumber += int(v.Num)
if int(v.Num) >= oldAccountInfo.AccountBundleNumber { if int(v.Num) >= oldValues.BundleAccountConsumptionNumber {
data.BundleAccountConsumptionNumber += oldAccountInfo.AccountBundleNumber data.BundleAccountConsumptionNumber += oldValues.BundleAccountConsumptionNumber
} else { } else {
data.BundleAccountConsumptionNumber += int(v.Num) data.BundleAccountConsumptionNumber += int(v.Num)
} }
} else { } else {
data.IncreaseAccountNumber += int(v.Num) data.IncreaseAccountNumber += int(v.Num)
if int(v.Num) >= oldAccountInfo.AccountIncreaseNumber { if int(v.Num) >= oldValues.IncreaseAccountConsumptionNumber {
data.IncreaseAccountConsumptionNumber += oldAccountInfo.AccountIncreaseNumber data.IncreaseAccountConsumptionNumber += oldValues.IncreaseAccountConsumptionNumber
} else { } else {
data.IncreaseAccountConsumptionNumber += int(v.Num) data.IncreaseAccountConsumptionNumber += int(v.Num)
} }