ZiHangQin/electricity_bill_calc_service
1
0
Fork 0
forked from free-lancers/electricity_bill_calc_service
Code Pull Requests Activity

enhance(charge):完成用户服务延期功能的测试。

Browse Source
This commit is contained in:
徐涛
2022-08-15 16:56:56 +08:00
parent f033691aa4
commit 224ae9b07d
4 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repository/charge.go
View File

@@ -17,49 +17,61 @@ var ChargeRepo _ChargeRepository
func (_ChargeRepository) ListPagedChargeRecord(keyword, beginDate, endDate string, page int) ([]model.ChargeWithName, int64, error) {
var cond = builder.NewCond()
if len(keyword) != 0 {
cond.And(builder.Like{"u.name", keyword})
cond = cond.And(builder.Like{"d.name", keyword}.Or(builder.Like{"d.abbr", keyword}))
}
if len(beginDate) != 0 {
beginTime, err := time.Parse("2006-01-02", beginDate)
beginTime, err := time.ParseInLocation("2006-01-02", beginDate, time.Local)
beginTime = utils.VeryBeginOfDate(beginTime)
if err != nil {
return make([]model.ChargeWithName, 0), 0, err
}
cond.And(builder.Gte{"c.created_at": beginTime})
cond = cond.And(builder.Gte{"c.created_at": beginTime})
}
if len(endDate) != 0 {
endTime, err := time.Parse("2006-01-02", endDate)
endTime, err := time.ParseInLocation("2006-01-02", endDate, time.Local)
endTime = utils.VeryEndOfDate(endTime)
if err != nil {
return make([]model.ChargeWithName, 0), 0, err
}
cond.And(builder.Lte{"c.created_at": endTime})
cond = cond.And(builder.Lte{"c.created_at": endTime})
}
startItem := (page - 1) * config.ServiceSettings.ItemsPageSize
total, err := global.DBConn.
Table("user_charge").Alias("c").
Join("INNER", []string{"user_detail", "d"}, "c.user_id=d.id").
Alias("d").
Join("INNER", []string{"user_charge", "c"}, "c.user_id=d.id").
Where(cond).
NoAutoCondition().
Count(&model.ChargeWithName{})
if err != nil {
return nil, -1, err
}
charges := make([]model.ChargeWithName, 0)
err = global.DBConn.
Table("user_charge").Alias("c").
Join("INNER", []string{"user_detail", "d"}, "c.user_id=d.id").
Alias("d").
Join("INNER", []string{"user_charge", "c"}, "c.user_id=d.id").
Where(cond).
Limit(config.ServiceSettings.ItemsPageSize, startItem).
NoAutoCondition().
Find(&charges)
return charges, total, err
}
func (_ChargeRepository) LastValidChargeTo(uid string) (time.Time, error) {
veryBlankTime, _ := time.Parse("2006-01-02 15:04:05", "0001-01-01 00:00:00")
var records = make([]time.Time, 0)
err := global.DBConn.Where(builder.Eq{"settled": true, "cancelled": false, "refunded": false}).Cols("charged_to").Find(&records)
var records []string
err := global.DBConn.
Table(&model.UserCharge{}).
Where(builder.Eq{"settled": true, "cancelled": false, "refunded": false, "user_id": uid}).
Cols("charge_to").
Find(&records)
if err != nil {
return veryBlankTime, nil
}
lastValid := utils.Reduce(records, veryBlankTime, func(acc, elem time.Time) time.Time {
mappedRecords := utils.Map(records, func(elem string) time.Time {
t, _ := time.Parse(time.RFC3339, elem)
return utils.VeryBeginOfDate(t)
})
lastValid := utils.Reduce(mappedRecords, veryBlankTime, func(acc, elem time.Time) time.Time {
if elem.After(acc) {
return elem
} else {