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

Merge branch 'dev-lzh-0905' into dev

Browse Source
This commit is contained in:
lzh 2025-10-21 10:02:30 +08:00
commit 54b5668049
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/dao/bundleExtend.go
View File

@ -94,6 +94,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
Where("rn.name IS NOT NULL"). Where("rn.name IS NOT NULL").
Where("u.deleted_at = 0"). Where("u.deleted_at = 0").
Where("bb.month = ?", req.Month). Where("bb.month = ?", req.Month).
Where("bor.deleted_at IS NULL").
Order("bor.expiration_time desc") Order("bor.expiration_time desc")
if req.UserName != "" { if req.UserName != "" {
if utils.IsPhoneNumber(req.UserName) { if utils.IsPhoneNumber(req.UserName) {
@ -366,9 +367,14 @@ func ExtendBundleBalanceByUserId(data model.BundleBalanceExtendPo) error {
if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", data.UserId).Order("created_at desc").First(&oldData).Error; err != nil { if err := tx.Model(&model.BundleBalance{}).Where("user_id = ?", data.UserId).Order("created_at desc").First(&oldData).Error; err != nil {
return errors.New("用户还没有套餐信息") return errors.New("用户还没有套餐信息")
} }
oldData.ManualAccountNumber += data.AccountNumber
oldData.MonthlyNewAccountNumber += data.AccountNumber
oldData.ManualImageNumber += data.ImageNumber oldData.ManualImageNumber += data.ImageNumber
oldData.MonthlyNewManualImageNumber += data.ImageNumber
oldData.ManualDataAnalysisNumber += data.DataAnalysisNumber oldData.ManualDataAnalysisNumber += data.DataAnalysisNumber
oldData.MonthlyNewManualDataAnalysisNumber += data.DataAnalysisNumber
oldData.ManualVideoNumber += data.VideoNumber oldData.ManualVideoNumber += data.VideoNumber
oldData.MonthlyNewManualVideoNumber += data.VideoNumber
oldData.MonthlyNewDurationNumber += data.DurationNumber // 记录本月新增手动扩展时长 oldData.MonthlyNewDurationNumber += data.DurationNumber // 记录本月新增手动扩展时长
oldData.ExpiredAt.Add(time.Hour * 24 * time.Duration(data.DurationNumber)) oldData.ExpiredAt.Add(time.Hour * 24 * time.Duration(data.DurationNumber))
return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&oldData).Error return tx.Model(&model.BundleBalance{}).Where("id = ?", oldData.ID).Save(&oldData).Error