作者 陈志颖

fix:分红默认时间戳设置

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