...
|
...
|
@@ -235,7 +235,13 @@ func (ptr *CooperationStatisticsService) CompanyDividendsStatistics(queryOptions |
|
|
queryOptions["paymentStatus"] = 2
|
|
|
var dividends = &CreditAccountStatisticsResponse{}
|
|
|
orderGoodDao, _ := dao.NewCreditAccountDao(ptr.transactionContext)
|
|
|
if err := orderGoodDao.DividendsStatistics(queryOptions, dividends); err != nil {
|
|
|
if err := orderGoodDao.DividendsStatistics(map[string]interface{}{
|
|
|
"paymentBeginTime": beginTime,
|
|
|
"paymentEndTime": endTime,
|
|
|
"paymentStatus": 2,
|
|
|
"orgId": request.OrgId,
|
|
|
"companyId": request.CompanyId,
|
|
|
}, dividends); err != nil {
|
|
|
return nil, err
|
|
|
}
|
|
|
orderAmount := ptr.CalculateOrderAmount(queryOptions)
|
...
|
...
|
@@ -600,7 +606,7 @@ func (ptr *CooperationStatisticsService) CompanyPaymentHistoryStatistics(queryOp |
|
|
|
|
|
// 按关联相关人过滤
|
|
|
var retMap = make([]interface{}, 0)
|
|
|
contractNumbers, err := ptr.getUnderTakerContracts(map[string]interface{}{"userId": request.UserId})
|
|
|
contractNumbers, err := ptr.getRelevantContracts(map[string]interface{}{"userId": request.UserId})
|
|
|
if len(contractNumbers) == 0 {
|
|
|
return retMap, nil
|
|
|
}
|
...
|
...
|
|