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

model/user_charges.go

@@ -8,7 +8,7 @@ import (
 
 type UserCharge struct {
 	Created     `xorm:"extends"`
-	Seq         int64               `xorm:"bigint pk not null autoincr" json:"seq"`
+	Seq         int64               `xorm:"bigint pk not null" json:"seq"`
 	UserId      string              `xorm:"varchar(120) not null" json:"userId"`
 	Fee         decimal.NullDecimal `xorm:"numeric(12,2)" json:"fee"`
 	Discount    decimal.NullDecimal `xorm:"numeric(5,4)" json:"discount"`
@@ -32,5 +32,5 @@ type ChargeWithName struct {
 }
 
 func (ChargeWithName) TableName() string {
-	return "user_charge"
+	return "user_detail"
 }

repository/charge.go

@@ -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").
+		Alias("d").
-		Join("INNER", []string{"user_detail", "d"}, "c.user_id=d.id").
+		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").
+		Alias("d").
-		Join("INNER", []string{"user_detail", "d"}, "c.user_id=d.id").
+		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)
+	var records []string
-	err := global.DBConn.Where(builder.Eq{"settled": true, "cancelled": false, "refunded": false}).Cols("charged_to").Find(&records)
+	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 {

service/charge.go

@@ -5,6 +5,7 @@ import (
 	"electricity_bill_calc/global"
 	"electricity_bill_calc/model"
 	"electricity_bill_calc/repository"
+	"electricity_bill_calc/utils"
 	"time"
 
 	"xorm.io/builder"
@@ -16,12 +17,25 @@ type _ChargeService struct{}
 var ChargeService _ChargeService
 
 func (c _ChargeService) CreateChargeRecord(charge *model.UserCharge, extendWithIgnoreSettle bool) error {
+	var seqs = make([]int64, 0)
+	err := global.DBConn.Table(&model.UserCharge{}).Cols("seq").Find(&seqs)
+	if err != nil {
+		return err
+	}
+	maxSeq := utils.Reduce(seqs, 0, func(acc, elem int64) int64 {
+		if elem > acc {
+			return elem
+		} else {
+			return acc
+		}
+	})
 	tx := global.DBConn.NewSession()
 	defer tx.Close()
 	if err := tx.Begin(); err != nil {
 		return err
 	}
-	_, err := tx.Insert(charge)
+	charge.Seq = maxSeq + 1
+	_, err = tx.Insert(charge)
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -121,9 +135,18 @@ func (c _ChargeService) CancelCharge(seq int64, uid string) error {
 		tx.Rollback()
 		return exceptions.NewNotFoundError("未找到匹配指定条件的计费记录。")
 	}
-	lastValidExpriation, err := repository.ChargeRepo.LastValidChargeTo(uid)
+	err = tx.Commit()
 	if err != nil {
 		tx.Rollback()
+		return err
+	}
+	tx = global.DBConn.NewSession()
+	defer tx.Close()
+	if err := tx.Begin(); err != nil {
+		return err
+	}
+	lastValidExpriation, err := repository.ChargeRepo.LastValidChargeTo(uid)
+	if err != nil {
 		return exceptions.NewNotFoundError("未找到最后合法的计费时间。")
 	}
 	err = c.updateUserExpiration(tx, uid, lastValidExpriation)

utils/time.go

@@ -0,0 +1,11 @@
+package utils
+
+import "time"
+
+func VeryBeginOfDate(date time.Time) time.Time {
+	return time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
+}
+
+func VeryEndOfDate(date time.Time) time.Time {
+	return time.Date(date.Year(), date.Month(), date.Day(), 23, 59, 59, 999999999, date.Location())
+}