|
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) {
|
|
@@ -59,9 +71,8 @@ func Statistics(header *protocol.RequestHeader, request *protocol.DividendStatis |
|
@@ -59,9 +71,8 @@ func Statistics(header *protocol.RequestHeader, request *protocol.DividendStatis |
|
59
|
Receivable: bonusAll.Receivable,
|
71
|
Receivable: bonusAll.Receivable,
|
|
60
|
Quarters: bonusQuarters,
|
72
|
Quarters: bonusQuarters,
|
|
61
|
}
|
73
|
}
|
|
62
|
- if request.PageIndex == 0 {
|
74
|
+
|
|
63
|
rsp.Timestamp = time.Now().Unix() * 1000
|
75
|
rsp.Timestamp = time.Now().Unix() * 1000
|
|
64
|
- }
|
|
|
|
65
|
|
76
|
|
|
66
|
err = transactionContext.CommitTransaction()
|
77
|
err = transactionContext.CommitTransaction()
|
|
67
|
return
|
78
|
return
|
