作者 tangxvhui

添加 新的统计方法

... ... @@ -2,12 +2,13 @@ package dividend
import (
"fmt"
"time"
"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"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/log"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/protocol"
"time"
)
// 分红统计
... ... @@ -25,7 +26,13 @@ func Statistics(header *protocol.RequestHeader, request *protocol.DividendStatis
}()
// 事业分红统计-查询订单
_, orderAll, e := OrderBaseResponsitory.Find(utils.ObjectJsonToMap(domain.OrderQueryOption{PartnerId: request.PartnerId, EndTime: utils.GetDayEnd(), SortBySalesTime: domain.DESC, OrderTypes: domain.UserOrderTypes(domain.Career)}))
_, orderAll, e := OrderBaseResponsitory.Find(utils.ObjectJsonToMap(
domain.OrderQueryOption{
PartnerId: request.PartnerId,
EndTime: utils.GetDayEnd(),
SortBySalesTime: domain.DESC,
OrderTypes: domain.UserOrderTypes(domain.Career),
}))
if e != nil {
log.Error(e)
}
... ... @@ -122,8 +129,8 @@ func AllBonusStatics(orders []*domain.OrderBase, action int) (bonus protocol.Bon
}
// 订单-季度分红统计
func QuartersBonusStatics(orders []*domain.OrderBase, action int) (bonus []protocol.Bonus) {
bonus = make([]protocol.Bonus, 4)
func QuartersBonusStatics(orders []*domain.OrderBase, action int) (bonus [4]protocol.Bonus) {
bonus = [4]protocol.Bonus{}
for i := range orders {
o := orders[i]
quarter := quarter(o.SaleDate)
... ...
package dividend
import (
"fmt"
"time"
"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"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/log"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/protocol"
)
// 分红统计
func StatisticsV2(header *protocol.RequestHeader, request *protocol.DividendStatisticsRequest) (rsp *protocol.DividendStatisticsV2Response, err error) {
var (
transactionContext, _ = factory.CreateTransactionContext(nil)
OrderBaseResponsitory, _ = factory.CreateOrderBaseRepository(transactionContext)
)
if err = transactionContext.StartTransaction(); err != nil {
return nil, err
}
defer func() {
transactionContext.RollbackTransaction()
}()
// 事业分红统计-查询订单
_, orderAll, e := OrderBaseResponsitory.Find(utils.ObjectJsonToMap(
domain.OrderQueryOption{
PartnerId: request.PartnerId,
EndTime: utils.GetDayEnd(),
SortBySalesTime: domain.DESC,
OrderTypes: domain.UserOrderTypes(domain.Career),
}))
if e != nil {
log.Error(e)
}
err = transactionContext.CommitTransaction()
if e != nil {
return nil, err
}
//获取营销年
t := time.Now()
var last time.Time
var first time.Time
boundDate := time.Date(t.Year(), time.March, 31, 23, 59, 59, 0, time.Local) // 营销年界限
fmt.Println("营销年界限:", boundDate)
if t.Before(boundDate) || t.Equal(boundDate) {
first = time.Date(t.Year()-1, time.April, 1, 0, 0, 0, 0, time.Local)
last = time.Date(t.Year(), time.March, 31, 23, 59, 59, 0, time.Local)
} else if t.After(boundDate) {
first = time.Date(t.Year(), time.April, 1, 0, 0, 0, 0, time.Local)
last = time.Date(t.Year()+1, time.March, 31, 23, 59, 59, 0, time.Local)
}
fmt.Println("当前营销年起始:", first, last)
// 请求开始时间和结束时间都为0时,默认从营销年开始统计
if request.StartTime == 0 && request.EndTime == 0 {
request.StartTime = first.Unix() * 1000
request.EndTime = last.Unix() * 1000
} else if request.StartTime > 0 && request.EndTime > 0 { // 判断结束时间是否超过今天,超过今天的结束时间到今天为止
currentDayEnd := utils.GetDayEnd().Unix() * 1000
if request.EndTime >= currentDayEnd {
request.EndTime = currentDayEnd
}
}
fmt.Println("StartTime: ", request.StartTime)
fmt.Println("EndTime: ", request.EndTime)
var orderBetween []*domain.OrderBase
for i := range orderAll {
if orderAll[i].SaleDate.Unix() >= (request.StartTime/1000) && orderAll[i].SaleDate.Unix() < (request.EndTime/1000) {
orderBetween = append(orderBetween, orderAll[i])
}
}
//0:全部分类,
//Career int = 1 //事业
//Business int = 2 //业务
//Develop int = 3 //研发
//App int = 4 //业务产品-应用
//累计分红
var (
bonusAll protocol.Bonus
bonusAllCareer protocol.Bonus
bonusAllBusiness protocol.Bonus
bonusAllDevelop protocol.Bonus
bonusAllApp protocol.Bonus
)
for _, val := range orderAll {
static := val.OrderBonusStatic()
bonusAll.Received = utils.Decimal(bonusAll.Received + static.OrderBonusReceive())
bonusAll.Outstanding = utils.Decimal(bonusAll.Outstanding + static.OrderBonusWait())
bonusAll.Receivable = utils.Decimal(bonusAll.Receivable + static.OrderTotalReceivable())
if val.PartnerCategory == nil {
continue
}
switch val.PartnerCategory.Id {
case int64(domain.Career):
bonusAllCareer.Received = utils.Decimal(bonusAllCareer.Received + static.OrderBonusReceive())
bonusAllCareer.Outstanding = utils.Decimal(bonusAllCareer.Outstanding + static.OrderBonusWait())
bonusAllCareer.Receivable = utils.Decimal(bonusAllCareer.Receivable + static.OrderTotalReceivable())
case int64(domain.Business):
bonusAllBusiness.Received = utils.Decimal(bonusAllBusiness.Received + static.OrderBonusReceive())
bonusAllBusiness.Outstanding = utils.Decimal(bonusAllBusiness.Outstanding + static.OrderBonusWait())
bonusAllBusiness.Receivable = utils.Decimal(bonusAllBusiness.Receivable + static.OrderTotalReceivable())
case int64(domain.App):
bonusAllApp.Received = utils.Decimal(bonusAllApp.Received + static.OrderBonusReceive())
bonusAllApp.Outstanding = utils.Decimal(bonusAllApp.Outstanding + static.OrderBonusWait())
bonusAllApp.Receivable = utils.Decimal(bonusAllApp.Receivable + static.OrderTotalReceivable())
case int64(domain.Develop):
bonusAllDevelop.Received = utils.Decimal(bonusAllDevelop.Received + static.OrderBonusReceive())
bonusAllDevelop.Outstanding = utils.Decimal(bonusAllDevelop.Outstanding + static.OrderBonusWait())
bonusAllDevelop.Receivable = utils.Decimal(bonusAllDevelop.Receivable + static.OrderTotalReceivable())
}
}
//0:全部分类,
//Career int = 1 //事业
//Business int = 2 //业务
//Develop int = 3 //研发
//App int = 4 //业务产品-应用
//季度分红
var (
bonusQuarters = [4]protocol.Bonus{}
bonusQuartersCareer = [4]protocol.Bonus{}
bonusQuartersBusiness = [4]protocol.Bonus{}
bonusQuartersDevelop = [4]protocol.Bonus{}
bonusQuartersApp = [4]protocol.Bonus{}
)
//月度分红
var (
bonusMonths = [12]protocol.Bonus{}
bonusMonthsCareer = [12]protocol.Bonus{}
bonusMonthsBusiness = [12]protocol.Bonus{}
bonusMonthsDevelop = [12]protocol.Bonus{}
bonusMonthsApp = [12]protocol.Bonus{}
)
var (
quarterNum int // 对应季度在数组中的位置
monthNum int //对应月份在数组中的位置
)
for _, val := range orderBetween {
quarterNum = quarter(val.SaleDate)
monthNum = int(val.SaleDate.Month()) - 1
static := val.OrderBonusStatic()
bonusQuarters[quarterNum].Receivable = utils.Decimal(bonusQuarters[quarterNum].Receivable + static.OrderTotalReceivable())
bonusQuarters[quarterNum].Received = utils.Decimal(bonusQuarters[quarterNum].Received + static.OrderBonusReceive())
bonusQuarters[quarterNum].Outstanding = utils.Decimal(bonusQuarters[quarterNum].Outstanding + static.OrderBonusWait())
bonusMonths[monthNum].Receivable = utils.Decimal(bonusMonths[monthNum].Receivable + static.OrderTotalReceivable())
bonusMonths[monthNum].Received = utils.Decimal(bonusMonths[monthNum].Received + static.OrderBonusReceive())
bonusMonths[monthNum].Outstanding = utils.Decimal(bonusMonths[monthNum].Outstanding + static.OrderBonusWait())
if val.PartnerCategory == nil {
continue
}
// 分类合并计数
switch val.PartnerCategory.Id {
case int64(domain.Career):
bonusQuartersCareer[quarterNum].Receivable = utils.Decimal(bonusQuartersCareer[quarterNum].Receivable + static.OrderTotalReceivable())
bonusQuartersCareer[quarterNum].Received = utils.Decimal(bonusQuartersCareer[quarterNum].Received + static.OrderBonusReceive())
bonusQuartersCareer[quarterNum].Outstanding = utils.Decimal(bonusQuartersCareer[quarterNum].Outstanding + static.OrderBonusWait())
bonusMonthsCareer[monthNum].Receivable = utils.Decimal(bonusMonthsCareer[monthNum].Receivable + static.OrderTotalReceivable())
bonusMonthsCareer[monthNum].Received = utils.Decimal(bonusMonthsCareer[monthNum].Received + static.OrderBonusReceive())
bonusMonthsCareer[monthNum].Outstanding = utils.Decimal(bonusMonthsCareer[monthNum].Outstanding + static.OrderBonusWait())
case int64(domain.Business):
bonusQuartersBusiness[quarterNum].Receivable = utils.Decimal(bonusQuartersBusiness[quarterNum].Receivable + static.OrderTotalReceivable())
bonusQuartersBusiness[quarterNum].Received = utils.Decimal(bonusQuartersBusiness[quarterNum].Received + static.OrderBonusReceive())
bonusQuartersBusiness[quarterNum].Outstanding = utils.Decimal(bonusQuartersBusiness[quarterNum].Outstanding + static.OrderBonusWait())
bonusMonthsBusiness[monthNum].Receivable = utils.Decimal(bonusMonthsBusiness[monthNum].Receivable + static.OrderTotalReceivable())
bonusMonthsBusiness[monthNum].Received = utils.Decimal(bonusMonthsBusiness[monthNum].Received + static.OrderBonusReceive())
bonusMonthsBusiness[monthNum].Outstanding = utils.Decimal(bonusMonthsBusiness[monthNum].Outstanding + static.OrderBonusWait())
case int64(domain.App):
bonusQuartersApp[quarterNum].Receivable = utils.Decimal(bonusQuartersApp[quarterNum].Receivable + static.OrderTotalReceivable())
bonusQuartersApp[quarterNum].Received = utils.Decimal(bonusQuartersApp[quarterNum].Received + static.OrderBonusReceive())
bonusQuartersApp[quarterNum].Outstanding = utils.Decimal(bonusQuartersApp[quarterNum].Outstanding + static.OrderBonusWait())
bonusMonthsApp[monthNum].Receivable = utils.Decimal(bonusMonthsApp[monthNum].Receivable + static.OrderTotalReceivable())
bonusMonthsApp[monthNum].Received = utils.Decimal(bonusMonthsApp[monthNum].Received + static.OrderBonusReceive())
bonusMonthsApp[monthNum].Outstanding = utils.Decimal(bonusMonthsApp[monthNum].Outstanding + static.OrderBonusWait())
case int64(domain.Develop):
bonusQuartersDevelop[quarterNum].Receivable = utils.Decimal(bonusQuartersDevelop[quarterNum].Receivable + static.OrderTotalReceivable())
bonusQuartersDevelop[quarterNum].Received = utils.Decimal(bonusQuartersDevelop[quarterNum].Received + static.OrderBonusReceive())
bonusQuartersDevelop[quarterNum].Outstanding = utils.Decimal(bonusQuartersDevelop[quarterNum].Outstanding + static.OrderBonusWait())
bonusMonthsDevelop[monthNum].Receivable = utils.Decimal(bonusMonthsDevelop[monthNum].Receivable + static.OrderTotalReceivable())
bonusMonthsDevelop[monthNum].Received = utils.Decimal(bonusMonthsDevelop[monthNum].Received + static.OrderBonusReceive())
bonusMonthsDevelop[monthNum].Outstanding = utils.Decimal(bonusMonthsDevelop[monthNum].Outstanding + static.OrderBonusWait())
}
}
// 整理输出数据
rsp = &protocol.DividendStatisticsV2Response{
Statistics: protocol.DividendStatistics{
Received: bonusAll.Received,
Outstanding: bonusAll.Outstanding,
Receivable: bonusAll.Receivable,
Quarters: bonusQuarters,
Months: bonusMonths,
},
StatisticsCareer: protocol.DividendStatistics{
Received: bonusAllCareer.Receivable,
Outstanding: bonusAllCareer.Outstanding,
Receivable: bonusAllCareer.Receivable,
Quarters: bonusQuartersCareer,
Months: bonusMonthsCareer,
},
StatisticsBusiness: protocol.DividendStatistics{
Received: bonusAllBusiness.Receivable,
Outstanding: bonusAllBusiness.Outstanding,
Receivable: bonusAllBusiness.Receivable,
Quarters: bonusQuartersBusiness,
Months: bonusMonthsBusiness,
},
StatisticsDevelop: protocol.DividendStatistics{
Received: bonusAllDevelop.Received,
Outstanding: bonusAllDevelop.Outstanding,
Receivable: bonusAllDevelop.Receivable,
Quarters: bonusQuartersDevelop,
Months: bonusMonthsDevelop,
},
StatisticsApp: protocol.DividendStatistics{
Received: bonusAllApp.Received,
Outstanding: bonusAllApp.Outstanding,
Receivable: bonusAllApp.Receivable,
Quarters: bonusQuartersApp,
Months: bonusMonthsApp,
},
Timestamp: 0,
}
rsp.Timestamp = time.Now().Unix() * 1000
return
}
... ...
... ... @@ -25,8 +25,8 @@ func (m *PartnerCategoryInfo) Identify() interface{} {
}
const (
Career = iota + 1
Business
Develop
App
Career int = 1 //事业
Business int = 2 //业务
Develop int = 3 //研发
App int = 4 //业务产品-应用
)
... ...
package controllers
import (
"time"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/application/order"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/domain"
"gitlab.fjmaimaimai.com/mmm-go/partner/pkg/protocol"
"time"
)
type OrderController struct {
BaseController
}
//OrderStatistics 订单统计
// OrderStatistics 订单统计
// @router /statistics [post]
func (this *OrderController) Statistics() {
var msg *protocol.ResponseMessage
... ... @@ -31,7 +32,7 @@ func (this *OrderController) Statistics() {
msg = protocol.NewReturnResponse(order.Statistics(header, request))
}
//OrderStatistics 订单统计
// OrderStatistics 订单统计
// @router /statistics [post]
func (this *OrderController) StatisticsV2() {
var msg *protocol.ResponseMessage
... ... @@ -54,7 +55,7 @@ func (this *OrderController) StatisticsV2() {
msg = protocol.NewReturnResponse(order.StatisticsV2(header, request))
}
//OrderDetail 订单详情
// OrderDetail 订单详情
// @router /orderDetail [post]
func (this *OrderController) OrderDetail() {
var msg *protocol.ResponseMessage
... ... @@ -74,7 +75,7 @@ func (this *OrderController) OrderDetail() {
msg = protocol.NewReturnResponse(order.Detail(header, request))
}
//OrderList
// OrderList
func (this *OrderController) OrderList() {
var msg *protocol.ResponseMessage
defer func() {
... ... @@ -97,7 +98,7 @@ func (this *OrderController) OrderList() {
msg = protocol.NewReturnResponse(order.List(header, request))
}
//OrderList
// OrderList
func (this *OrderController) Intentions() {
var msg *protocol.ResponseMessage
defer func() {
... ...
... ... @@ -9,8 +9,8 @@ const (
/*DividendStatistics 分红统计*/
type DividendStatisticsRequest struct {
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
StartTime int64 `json:"startTime"` // 单位毫秒
EndTime int64 `json:"endTime"` // 单位毫秒
//分红类型(0累计分红、1分红支出)
//DividendAction int `json:"dividendAction"`
PartnerId int64 `json:"partnerId"`
... ... @@ -20,11 +20,25 @@ type DividendStatisticsResponse struct {
Timestamp int64 `json:"timestamp"`
}
// Career int = 1 //事业
// Business int = 2 //业务
// Develop int = 3 //研发
// App int = 4 //业务产品-应用
type DividendStatisticsV2Response struct {
Statistics DividendStatistics `json:"statistics"` // 全部
StatisticsCareer DividendStatistics `json:"statisticsCareer"` // 事业分类
StatisticsBusiness DividendStatistics `json:"statisticsBusiness"` // 业务分类
StatisticsDevelop DividendStatistics `json:"statisticsDevelop"` // 研发a分类
StatisticsApp DividendStatistics `json:"statisticsApp"` // 业务产品-应用
Timestamp int64 `json:"timestamp"`
}
type DividendStatistics struct {
Received float64 `json:"received"` //总已收分红
Outstanding float64 `json:"outstanding"` //总未收分红/分红支出
Receivable float64 `json:"receivable"` //总应收分红
Quarters []Bonus `json:"quarters"`
Quarters [4]Bonus `json:"quarters"` //4个季度分红
Months [12]Bonus `json:"months"` //12个月度分红
}
type Bonus struct {
... ...