作者 yangfu

共创统计

@@ -66,7 +66,7 @@ func (ptr *CooperationStatisticsService) cooperationCompanyStatistics(userBaseId @@ -66,7 +66,7 @@ func (ptr *CooperationStatisticsService) cooperationCompanyStatistics(userBaseId
66 Paid float64 `json:"paid"` 66 Paid float64 `json:"paid"`
67 } 67 }
68 creditAccountDao, _ := dao.NewCreditAccountDao(ptr.transactionContext) 68 creditAccountDao, _ := dao.NewCreditAccountDao(ptr.transactionContext)
69 - var allDividends = &response{} 69 + var allDividends = &CreditAccountStatisticsResponse{}
70 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{"userBaseId": userBaseId, "orgId": orgId}, allDividends); err != nil { 70 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{"userBaseId": userBaseId, "orgId": orgId}, allDividends); err != nil {
71 return nil, err 71 return nil, err
72 } 72 }
@@ -334,13 +334,13 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st @@ -334,13 +334,13 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st
334 } 334 }
335 creditAccountDao, _ := dao.NewCreditAccountDao(ptr.transactionContext) 335 creditAccountDao, _ := dao.NewCreditAccountDao(ptr.transactionContext)
336 336
337 - var allDividends = &response{} 337 + var allDividends = &CreditAccountStatisticsResponse{}
338 if err := creditAccountDao.DividendsStatistics(queryOptions, allDividends); err != nil { 338 if err := creditAccountDao.DividendsStatistics(queryOptions, allDividends); err != nil {
339 return nil, err 339 return nil, err
340 } 340 }
341 allDividends.Accounting = allDividends.Total - allDividends.Accounted 341 allDividends.Accounting = allDividends.Total - allDividends.Accounted
342 342
343 - var annualDividends = &response{} 343 + var annualDividends = &CreditAccountStatisticsResponse{}
344 queryOptions["beginTime"] = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Local) 344 queryOptions["beginTime"] = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Local)
345 queryOptions["endTime"] = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Local).AddDate(1, 0, 0) 345 queryOptions["endTime"] = time.Date(time.Now().Year(), 1, 1, 0, 0, 0, 0, time.Local).AddDate(1, 0, 0)
346 if err := creditAccountDao.DividendsStatistics(queryOptions, annualDividends); err != nil { 346 if err := creditAccountDao.DividendsStatistics(queryOptions, annualDividends); err != nil {
@@ -348,7 +348,7 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st @@ -348,7 +348,7 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st
348 } 348 }
349 annualDividends.Accounting = annualDividends.Total - annualDividends.Accounted 349 annualDividends.Accounting = annualDividends.Total - annualDividends.Accounted
350 350
351 - var quarterDividends = &response{} 351 + var quarterDividends = &CreditAccountStatisticsResponse{}
352 queryOptions["beginTime"], queryOptions["endTime"] = quarterBeginEnd() 352 queryOptions["beginTime"], queryOptions["endTime"] = quarterBeginEnd()
353 if err := creditAccountDao.DividendsStatistics(queryOptions, quarterDividends); err != nil { 353 if err := creditAccountDao.DividendsStatistics(queryOptions, quarterDividends); err != nil {
354 return nil, err 354 return nil, err