作者 陈志颖

fix:分红默认时间戳设置

package dividend
import (
"fmt"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/application/factory"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/domain"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/infrastructure/utils"
... ... @@ -28,6 +29,17 @@ func Statistics(header *protocol.RequestHeader, request *protocol.DividendStatis
if e != nil {
log.Error(e)
}
t := time.Now()
last := time.Date(t.Year(), time.December, 31, 23, 59, 59, 0, time.Local)
first := time.Date(t.Year(), time.January, 1, 0, 0, 0, 0, time.Local)
fmt.Print("First:", first, "\n")
fmt.Print("Last:", last, "\n")
if request.StartTime == 0 {
request.StartTime = first.Unix() * 1000
}
if request.EndTime == 0 {
request.EndTime = last.Unix() * 1000
}
var orderBetween []*domain.OrderBase
for i := range orderAll {
if orderAll[i].SaleDate.Unix() >= (request.StartTime/1000) && orderAll[i].SaleDate.Unix() < (request.EndTime/1000) {
... ...
... ... @@ -5,6 +5,7 @@ import (
. "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/log"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/appsvr/middleware"
_ "gitlab.fjmaimaimai.com/mmm-go/partner/pkg/port/appsvr/routers"
"time"
)
func init() {
... ... @@ -15,4 +16,8 @@ func init() {
beego.InsertFilter("/*", beego.BeforeExec, middleware.CreateRequstLogFilter(Logger))
beego.InsertFilter("/*", beego.AfterExec, middleware.CreateResponseLogFilter(Logger), false)
// 默认时区设置
timeLocal, _ := time.LoadLocation("Asia/Chongqing")
time.Local = timeLocal
}
... ...
... ... @@ -9,8 +9,8 @@ const (
/*DividendStatistics 分红统计*/
type DividendStatisticsRequest struct {
StartTime int64 `json:"startTime" valid:"Required"`
EndTime int64 `json:"endTime" valid:"Required"`
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
//分红类型(0累计分红、1分红支出)
//DividendAction int `json:"dividendAction"`
PartnerId int64 `json:"partnerId"`
... ...