TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-25 08:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

实现带宽计费套餐

Browse Source
This commit is contained in:
GoEdgeLab
2022-01-23 19:16:52 +08:00
parent 6054e65c88
commit 9f129a2795
26 changed files with 752 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/rpc/services/service_user_bill.go
View File

@@ -74,7 +74,7 @@ func (this *UserBillService) ListUserBills(ctx context.Context, req *pb.ListUser
}
result := []*pb.UserBill{}
for _, bill := range bills {
user, err := models.SharedUserDAO.FindEnabledBasicUser(tx, int64(bill.UserId))
user, err := models.SharedUserDAO.FindBasicUserWithoutState(tx, int64(bill.UserId))
if err != nil {
return nil, err
}
@@ -85,15 +85,17 @@ func (this *UserBillService) ListUserBills(ctx context.Context, req *pb.ListUser
result = append(result, &pb.UserBill{
Id: int64(bill.Id),
User: &pb.User{
Id: int64(bill.UserId),
Fullname: user.Fullname,
Username: user.Username,
Id: int64(bill.UserId),
Fullname: user.Fullname,
Username: user.Username,
IsDeleted: user.State == models.UserStateDisabled,
},
Type: bill.Type,
TypeName: models.SharedUserBillDAO.BillTypeName(bill.Type),
Description: bill.Description,
Amount: float32(bill.Amount),
Month: bill.Month,
CanPay: bill.CanPay == 1,
IsPaid: bill.IsPaid == 1,
PaidAt: int64(bill.PaidAt),
Code: bill.Code,
@@ -151,6 +153,7 @@ func (this *UserBillService) FindUserBill(ctx context.Context, req *pb.FindUserB
Description: bill.Description,
Amount: float32(bill.Amount),
Month: bill.Month,
CanPay: bill.CanPay == 1,
IsPaid: bill.IsPaid == 1,
PaidAt: int64(bill.PaidAt),
Code: bill.Code,
@@ -194,6 +197,10 @@ func (this *UserBillService) PayUserBill(ctx context.Context, req *pb.PayUserBil
return models.SharedUserBillDAO.UpdateUserBillIsPaid(tx, req.UserBillId, true)
}
if bill.CanPay == 0 {
return errors.New("can not pay now")
}
// 余额是否足够
account, err := accounts.SharedUserAccountDAO.FindUserAccountWithUserId(tx, userId)
if err != nil {