作者 yangfu

支付统计修改

@@ -235,7 +235,13 @@ func (ptr *CooperationStatisticsService) CompanyDividendsStatistics(queryOptions @@ -235,7 +235,13 @@ func (ptr *CooperationStatisticsService) CompanyDividendsStatistics(queryOptions
235 queryOptions["paymentStatus"] = 2 235 queryOptions["paymentStatus"] = 2
236 var dividends = &CreditAccountStatisticsResponse{} 236 var dividends = &CreditAccountStatisticsResponse{}
237 orderGoodDao, _ := dao.NewCreditAccountDao(ptr.transactionContext) 237 orderGoodDao, _ := dao.NewCreditAccountDao(ptr.transactionContext)
238 - if err := orderGoodDao.DividendsStatistics(queryOptions, dividends); err != nil { 238 + if err := orderGoodDao.DividendsStatistics(map[string]interface{}{
  239 + "paymentBeginTime": beginTime,
  240 + "paymentEndTime": endTime,
  241 + "paymentStatus": 2,
  242 + "orgId": request.OrgId,
  243 + "companyId": request.CompanyId,
  244 + }, dividends); err != nil {
239 return nil, err 245 return nil, err
240 } 246 }
241 orderAmount := ptr.CalculateOrderAmount(queryOptions) 247 orderAmount := ptr.CalculateOrderAmount(queryOptions)
@@ -600,7 +606,7 @@ func (ptr *CooperationStatisticsService) CompanyPaymentHistoryStatistics(queryOp @@ -600,7 +606,7 @@ func (ptr *CooperationStatisticsService) CompanyPaymentHistoryStatistics(queryOp
600 606
601 // 按关联相关人过滤 607 // 按关联相关人过滤
602 var retMap = make([]interface{}, 0) 608 var retMap = make([]interface{}, 0)
603 - contractNumbers, err := ptr.getUnderTakerContracts(map[string]interface{}{"userId": request.UserId}) 609 + contractNumbers, err := ptr.getRelevantContracts(map[string]interface{}{"userId": request.UserId})
604 if len(contractNumbers) == 0 { 610 if len(contractNumbers) == 0 {
605 return retMap, nil 611 return retMap, nil
606 } 612 }