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

Update:更新余量列表获取

Browse Source
This commit is contained in:
jiaji.H 2026-06-09 10:39:23 +08:00
parent 6a313329e8
commit 375998a746
6 changed files with 1380 additions and 1237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/dao/bundleExtend.go
View File

@ -120,6 +120,9 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun
if req.Bought == 1 { if req.Bought == 1 {
session = session.Where("bb.user_id IS NULL") session = session.Where("bb.user_id IS NULL")
} }
if req.BundleType != 0 {
session = session.Where("bb.bundle_type = ?", req.BundleType)
}
t := time.Now() t := time.Now()
if req.StatusType != 0 { if req.StatusType != 0 {
if req.ExpiredTimeStart > time.Now().UnixMilli() { if req.ExpiredTimeStart > time.Now().UnixMilli() {
@ -181,14 +184,19 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (data mod
return return
} }
func GetBundleOrderListByUserId(userId int32) (orderList []string, err error) { func GetBundleOrderListByUserId(userId int32) (orderItemList []model.BundleOrderItem, err error) {
currentMonth := time.Now().Format("2006-01") currentMonth := time.Now().Format("2006-01")
timeNow := time.Now().Format("2006-01-02 15:04:05") timeNow := time.Now().Format("2006-01-02 15:04:05")
err = app.ModuleClients.BundleDB.Table("bundle_balance").Where("user_id = ? and expired_at >= ?", userId, timeNow).Where("month = ?", currentMonth).Where("deleted_at is null").Select("order_uuid").Find(&orderList).Error err = app.ModuleClients.BundleDB.Table("bundle_balance").
Select("bundle_balance.order_uuid,bundle_balance.bundle_type,bor.purchase_type").
Joins("INNER JOIN bundle_order_records as bor ON bundle_balance.order_uuid = bor.uuid").
Where("user_id = ? and expired_at >= ?", userId, timeNow).
Where("month = ?", currentMonth).Where("deleted_at is null").
Find(&orderItemList).Error
if err != nil { if err != nil {
return nil, err return nil, err
} }
return orderList, nil return orderItemList, nil
} }
func GetBundleBalanceByOrderUuid(orderUuid string) (data model.BundleBalance, err error) { func GetBundleBalanceByOrderUuid(orderUuid string) (data model.BundleBalance, err error) {

11
internal/logic/bundleExtendLogic.go
View File

@ -96,6 +96,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (*bundle.GetBundl
PayTime: m.PayTime, PayTime: m.PayTime,
StartTime: m.StartAt.UnixMilli(), StartTime: m.StartAt.UnixMilli(),
Status: int32(m.Status), Status: int32(m.Status),
BundleType: int64(m.BundleType),
BundleName: m.BundleName, BundleName: m.BundleName,
Month: m.Month, Month: m.Month,
ExpiredTime: m.ExpiredAt.UnixMilli(), ExpiredTime: m.ExpiredAt.UnixMilli(),
@ -263,14 +264,18 @@ func GetBundleBalanceByUserId(req *bundle.GetBundleBalanceByUserIdReq) (*bundle.
} }
func GetBundleOrderListByUserId(req *bundle.GetBundleOrderListByUserIdReq) (*bundle.GetBundleOrderListByUserIdResp, error) { func GetBundleOrderListByUserId(req *bundle.GetBundleOrderListByUserIdReq) (*bundle.GetBundleOrderListByUserIdResp, error) {
orderList, err := dao.GetBundleOrderListByUserId(req.UserId) orderItemList, err := dao.GetBundleOrderListByUserId(req.UserId)
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
return nil, errors.New("查询订单列表失败") return nil, errors.New("查询订单列表失败")
} }
resp := &bundle.GetBundleOrderListByUserIdResp{} resp := &bundle.GetBundleOrderListByUserIdResp{}
resp.OrderUuid = lo.Map(orderList, func(m string, _ int) string { resp.OrderItem = lo.Map(orderItemList, func(m model.BundleOrderItem, _ int) *bundle.BalanceOrderItem {
return m return &bundle.BalanceOrderItem{
OrderUuid: m.OrderUUID,
BundleType: m.BundleType,
PurchaseType: m.PurchaseType,
}
}) })
return resp, nil return resp, nil
} }

6
internal/model/bundle.go
View File

@ -186,6 +186,12 @@ type UserBundleBalancePo struct {
BundleBalance BundleBalance
} }
type BundleOrderItem struct {
OrderUUID string `json:"orderUUID" gorm:"column:order_uuid"`
PurchaseType string `json:"purchaseType" gorm:"column:purchase_type"`
BundleType string `json:"bundleType" gorm:"column:bundle_type"`
}
type BundleBalance struct { type BundleBalance struct {
gorm.Model gorm.Model
UserId int `gorm:"column:user_id;not null"` UserId int `gorm:"column:user_id;not null"`

176
pb/bundle.proto
View File

@ -800,6 +800,7 @@ message GetBundleBalanceListReq{
int32 pageSize = 10; int32 pageSize = 10;
repeated string month = 11; repeated string month = 11;
int32 statusType = 12; int32 statusType = 12;
int32 bundleType = 13;
} }
message GetBundleBalanceReq{ message GetBundleBalanceReq{
@ -824,101 +825,102 @@ message BundleBalanceItem {
string payTime = 8; // 下单时间 string payTime = 8; // 下单时间
int64 startTime = 9; // 开始有效时间 int64 startTime = 9; // 开始有效时间
int64 expiredTime = 10; // 过期时间 int64 expiredTime = 10; // 过期时间
string month = 11; // 所属月份 int64 bundleType = 11;//套餐类型
int32 bought = 12; // 购买状态 string month = 12; // 所属月份
int32 bought = 13; // 购买状态
// 套餐账号数 // 套餐账号数
int32 bundleAccountNumber = 13; // 当前可用套餐账号数 int32 bundleAccountNumber = 14; // 当前可用套餐账号数
int32 increaseAccountNumber = 14; // 当前可用增值账号数 int32 increaseAccountNumber = 15; // 当前可用增值账号数
int32 bundleAccountConsumptionNumber = 15; // 当前已用套餐账号数 int32 bundleAccountConsumptionNumber = 16; // 当前已用套餐账号数
int32 increaseAccountConsumptionNumber = 16; // 当前已用增值账号数 int32 increaseAccountConsumptionNumber = 17; // 当前已用增值账号数
// 视频类统计 // 视频类统计
int32 bundleVideoNumber = 17; // 当前可用套餐视频数 int32 bundleVideoNumber = 18; // 当前可用套餐视频数
int32 increaseVideoNumber = 18; // 当前可用增值视频数 int32 increaseVideoNumber = 19; // 当前可用增值视频数
int32 bundleVideoConsumptionNumber = 19; // 当前已用套餐视频数 int32 bundleVideoConsumptionNumber = 20; // 当前已用套餐视频数
int32 increaseVideoConsumptionNumber = 20; // 当前已用增值视频数 int32 increaseVideoConsumptionNumber = 21; // 当前已用增值视频数
int32 invalidBundleVideoNumber = 21; // 当前作废套餐视频数 int32 invalidBundleVideoNumber = 22; // 当前作废套餐视频数
int32 invalidIncreaseVideoNumber = 22; // 当前作废增值视频数 int32 invalidIncreaseVideoNumber = 23; // 当前作废增值视频数
int32 monthlyNewBundleVideoNumber = 23; // 当月新增套餐视频数 int32 monthlyNewBundleVideoNumber = 24; // 当月新增套餐视频数
int32 monthlyNewIncreaseVideoNumber = 24; // 当月新增增值视频数 int32 monthlyNewIncreaseVideoNumber = 25; // 当月新增增值视频数
int32 monthlyBundleVideoNumber = 25; // 当月可用套餐视频数 int32 monthlyBundleVideoNumber = 26; // 当月可用套餐视频数
int32 monthlyIncreaseVideoNumber = 26; // 当月可用增值视频数 int32 monthlyIncreaseVideoNumber = 27; // 当月可用增值视频数
int32 monthBundleVideoConsumptionNumber = 27; // 当月使用套餐视频数 int32 monthBundleVideoConsumptionNumber = 28; // 当月使用套餐视频数
int32 monthIncreaseVideoConsumptionNumber = 28; // 当月使用增值视频数 int32 monthIncreaseVideoConsumptionNumber = 29; // 当月使用增值视频数
int32 monthlyInvalidBundleVideoNumber = 29; // 当月作废套餐视频数 int32 monthlyInvalidBundleVideoNumber = 30; // 当月作废套餐视频数
int32 monthlyInvalidIncreaseVideoNumber = 30; // 当月作废增值视频数 int32 monthlyInvalidIncreaseVideoNumber = 31; // 当月作废增值视频数
// 图文类统计 // 图文类统计
int32 bundleImageNumber = 31; // 当前可用套餐图文数 int32 bundleImageNumber = 32; // 当前可用套餐图文数
int32 increaseImageNumber = 32; // 当前可用增值图文数 int32 increaseImageNumber = 33; // 当前可用增值图文数
int32 bundleImageConsumptionNumber = 33; // 当前已用套餐图文数 int32 bundleImageConsumptionNumber = 34; // 当前已用套餐图文数
int32 increaseImageConsumptionNumber = 34; // 当前已用增值图文数 int32 increaseImageConsumptionNumber = 35; // 当前已用增值图文数
int32 invalidBundleImageNumber = 35; // 当前作废套餐图文数 int32 invalidBundleImageNumber = 36; // 当前作废套餐图文数
int32 invalidIncreaseImageNumber = 36; // 当前作废增值图文数 int32 invalidIncreaseImageNumber = 37; // 当前作废增值图文数
int32 monthlyNewBundleImageNumber = 37; // 当月新增套餐图文数 int32 monthlyNewBundleImageNumber = 38; // 当月新增套餐图文数
int32 monthlyNewIncreaseImageNumber = 38; // 当月新增增值图文数 int32 monthlyNewIncreaseImageNumber = 39; // 当月新增增值图文数
int32 monthlyBundleImageNumber = 39; // 当月可用套餐图文数 int32 monthlyBundleImageNumber = 40; // 当月可用套餐图文数
int32 monthlyIncreaseImageNumber = 40; // 当月可用增值图文数 int32 monthlyIncreaseImageNumber = 41; // 当月可用增值图文数
int32 monthBundleImageConsumptionNumber = 41; // 当月使用套餐图文数 int32 monthBundleImageConsumptionNumber = 42; // 当月使用套餐图文数
int32 monthIncreaseImageConsumptionNumber = 42; // 当月使用增值图文数 int32 monthIncreaseImageConsumptionNumber = 43; // 当月使用增值图文数
int32 monthlyInvalidBundleImageNumber = 43; // 当月作废套餐图文数 int32 monthlyInvalidBundleImageNumber = 44; // 当月作废套餐图文数
int32 monthlyInvalidIncreaseImageNumber = 44; // 当月作废增值图文数 int32 monthlyInvalidIncreaseImageNumber = 45; // 当月作废增值图文数
// 数据分析类统计 // 数据分析类统计
int32 bundleDataAnalysisNumber = 45; // 当前可用套餐数据数 int32 bundleDataAnalysisNumber = 46; // 当前可用套餐数据数
int32 increaseDataAnalysisNumber = 46; // 当前可用增值数据数 int32 increaseDataAnalysisNumber = 47; // 当前可用增值数据数
int32 bundleDataAnalysisConsumptionNumber = 47; // 当前已用套餐数据数 int32 bundleDataAnalysisConsumptionNumber = 48; // 当前已用套餐数据数
int32 increaseDataAnalysisConsumptionNumber = 48; // 当前已用增值数据数 int32 increaseDataAnalysisConsumptionNumber = 49; // 当前已用增值数据数
int32 invalidBundleDataAnalysisNumber = 49; // 当前作废套餐数据数 int32 invalidBundleDataAnalysisNumber = 50; // 当前作废套餐数据数
int32 invalidIncreaseDataAnalysisNumber = 50; // 当前作废增值数据数 int32 invalidIncreaseDataAnalysisNumber = 51; // 当前作废增值数据数
int32 monthlyNewBundleDataAnalysisNumber = 51; // 当月新增套餐数据数 int32 monthlyNewBundleDataAnalysisNumber = 52; // 当月新增套餐数据数
int32 monthlyNewIncreaseDataAnalysisNumber = 52; // 当月新增增值数据数 int32 monthlyNewIncreaseDataAnalysisNumber = 53; // 当月新增增值数据数
int32 monthlyBundleDataAnalysisNumber = 53; // 当月可用套餐数据分析数 int32 monthlyBundleDataAnalysisNumber = 54; // 当月可用套餐数据分析数
int32 monthlyIncreaseDataAnalysisNumber = 54; // 当月可用增值数据分析数 int32 monthlyIncreaseDataAnalysisNumber = 55; // 当月可用增值数据分析数
int32 monthBundleDataAnalysisConsumptionNumber = 55; // 当月使用套餐数据数 int32 monthBundleDataAnalysisConsumptionNumber = 56; // 当月使用套餐数据数
int32 monthIncreaseDataAnalysisConsumptionNumber = 56; // 当月使用增值数据数 int32 monthIncreaseDataAnalysisConsumptionNumber = 57; // 当月使用增值数据数
int32 monthlyInvalidBundleDataAnalysisNumber = 57; // 当月作废套餐数据数 int32 monthlyInvalidBundleDataAnalysisNumber = 58; // 当月作废套餐数据数
int32 monthlyInvalidIncreaseDataAnalysisNumber = 58; // 当月作废增值数据数 int32 monthlyInvalidIncreaseDataAnalysisNumber = 59; // 当月作废增值数据数
// 竞品数 // 竞品数
int32 bundleCompetitiveNumber = 59; // 当前可用套餐竞品数 int32 bundleCompetitiveNumber = 60; // 当前可用套餐竞品数
int32 increaseCompetitiveNumber = 60; // 当前可用增值竞品数 int32 increaseCompetitiveNumber = 61; // 当前可用增值竞品数
int32 bundleCompetitiveConsumptionNumber = 61; // 当前已用套餐竞品数 int32 bundleCompetitiveConsumptionNumber = 62; // 当前已用套餐竞品数
int32 increaseCompetitiveConsumptionNumber = 62; // 当前已用增值竞品数 int32 increaseCompetitiveConsumptionNumber = 63; // 当前已用增值竞品数
int32 invalidBundleCompetitiveNumber = 63; // 当前作废套餐竞品数 int32 invalidBundleCompetitiveNumber = 64; // 当前作废套餐竞品数
int32 invalidIncreaseCompetitiveNumber = 64; // 当前作废增值竞品数 int32 invalidIncreaseCompetitiveNumber = 65; // 当前作废增值竞品数
int32 monthlyNewBundleCompetitiveNumber = 65; // 当月新增套餐竞品数 int32 monthlyNewBundleCompetitiveNumber = 66; // 当月新增套餐竞品数
int32 monthlyNewIncreaseCompetitiveNumber = 66; // 当月新增增值竞品数 int32 monthlyNewIncreaseCompetitiveNumber = 67; // 当月新增增值竞品数
int32 monthlyBundleCompetitiveNumber = 67; // 当月可用套餐竞品数 int32 monthlyBundleCompetitiveNumber = 68; // 当月可用套餐竞品数
int32 monthlyIncreaseCompetitiveNumber = 68; // 当月可用增值竞品数 int32 monthlyIncreaseCompetitiveNumber = 69; // 当月可用增值竞品数
int32 monthBundleCompetitiveConsumptionNumber = 69; // 当月使用套餐竞品数 int32 monthBundleCompetitiveConsumptionNumber = 70; // 当月使用套餐竞品数
int32 monthIncreaseCompetitiveConsumptionNumber = 70; // 当月使用增值竞品数 int32 monthIncreaseCompetitiveConsumptionNumber = 71; // 当月使用增值竞品数
int32 monthlyInvalidBundleCompetitiveNumber = 71; // 当月作废套餐竞品数 int32 monthlyInvalidBundleCompetitiveNumber = 72; // 当月作废套餐竞品数
int32 monthlyInvalidIncreaseCompetitiveNumber = 72; // 当月作废增值竞品数 int32 monthlyInvalidIncreaseCompetitiveNumber = 73; // 当月作废增值竞品数
// 手动扩展数据 // 手动扩展数据
int32 monthlyNewManualAccountNumber = 73; // 当月新增手动扩展账号数 int32 monthlyNewManualAccountNumber = 74; // 当月新增手动扩展账号数
int32 monthlyNewManualVideoNumber = 74; // 当月新增手动扩展视频数 int32 monthlyNewManualVideoNumber = 75; // 当月新增手动扩展视频数
int32 monthlyNewManualImageNumber = 75; // 当月新增手动扩展图文数 int32 monthlyNewManualImageNumber = 76; // 当月新增手动扩展图文数
int32 monthlyNewManualDataAnalysisNumber = 76; // 当月新增手动扩展数据数 int32 monthlyNewManualDataAnalysisNumber = 77; // 当月新增手动扩展数据数
int32 monthlyNewManualCompetitiveNumber = 77; // 当月新增手动扩展竞品数 int32 monthlyNewManualCompetitiveNumber = 78; // 当月新增手动扩展竞品数
int32 monthlyNewDurationNumber = 78; // 当月新增手动扩展时长(日) int32 monthlyNewDurationNumber = 79; // 当月新增手动扩展时长(日)
int32 monthlyManualAccountConsumptionNumber = 79; // 当月已用手动扩展账号数 int32 monthlyManualAccountConsumptionNumber = 80; // 当月已用手动扩展账号数
int32 monthlyManualVideoConsumptionNumber = 80; // 当月已用手动扩展视频数 int32 monthlyManualVideoConsumptionNumber = 81; // 当月已用手动扩展视频数
int32 monthlyManualImageConsumptionNumber = 81; // 当月已用手动扩展图文数 int32 monthlyManualImageConsumptionNumber = 82; // 当月已用手动扩展图文数
int32 monthlyManualDataAnalysisConsumptionNumber = 82; // 当月已用手动扩展数据数 int32 monthlyManualDataAnalysisConsumptionNumber = 83; // 当月已用手动扩展数据数
int32 monthlyManualCompetitiveConsumptionNumber = 83; // 当月已用手动扩展竞品数 int32 monthlyManualCompetitiveConsumptionNumber = 84; // 当月已用手动扩展竞品数
int32 manualAccountConsumptionNumber = 84; // 已用手动扩展账号数 int32 manualAccountConsumptionNumber = 85; // 已用手动扩展账号数
int32 manualVideoConsumptionNumber = 85; // 已用手动扩展视频数 int32 manualVideoConsumptionNumber = 86; // 已用手动扩展视频数
int32 manualImageConsumptionNumber = 86; // 已用手动扩展图文数 int32 manualImageConsumptionNumber = 87; // 已用手动扩展图文数
int32 manualDataAnalysisConsumptionNumber = 87; // 已用手动扩展数据数 int32 manualDataAnalysisConsumptionNumber = 88; // 已用手动扩展数据数
int32 manualCompetitiveConsumptionNumber = 88; // 已用手动扩展竞品数 int32 manualCompetitiveConsumptionNumber = 89; // 已用手动扩展竞品数
int32 manualAccountNumber = 89; // 可用手动扩展账号数 int32 manualAccountNumber = 90; // 可用手动扩展账号数
int32 manualVideoNumber = 90; // 可用手动扩展视频数 int32 manualVideoNumber = 91; // 可用手动扩展视频数
int32 manualImageNumber = 91; // 可用手动扩展图文数 int32 manualImageNumber = 92; // 可用手动扩展图文数
int32 manualDataAnalysisNumber = 92; // 可用手动扩展数据数 int32 manualDataAnalysisNumber = 93; // 可用手动扩展数据数
int32 manualCompetitiveNumber = 93; // 可用手动扩展竞品数 int32 manualCompetitiveNumber = 94; // 可用手动扩展竞品数
} }
@ -1223,8 +1225,14 @@ message GetBundleOrderListByUserIdReq{
int32 userId = 1; int32 userId = 1;
} }
message BalanceOrderItem{
string orderUuid = 1;
string purchaseType = 2;
string bundleType = 3;
}
message GetBundleOrderListByUserIdResp{ message GetBundleOrderListByUserIdResp{
repeated string orderUuid = 1; repeated BalanceOrderItem orderItem = 1;
} }
message GetBundleBalanceByOrderUUIDReq{ message GetBundleBalanceByOrderUUIDReq{

2400
pb/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

10
pb/bundle/bundle.validator.pb.go
View File

@ -496,7 +496,17 @@ func (this *GetBundleBalanceByUserIdResp) Validate() error {
func (this *GetBundleOrderListByUserIdReq) Validate() error { func (this *GetBundleOrderListByUserIdReq) Validate() error {
return nil return nil
} }
func (this *BalanceOrderItem) Validate() error {
return nil
}
func (this *GetBundleOrderListByUserIdResp) Validate() error { func (this *GetBundleOrderListByUserIdResp) Validate() error {
for _, item := range this.OrderItem {
if item != nil {
if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
return github_com_mwitkow_go_proto_validators.FieldError("OrderItem", err)
}
}
}
return nil return nil
} }
func (this *GetBundleBalanceByOrderUUIDReq) Validate() error { func (this *GetBundleBalanceByOrderUUIDReq) Validate() error {