allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 yangfu
提交 e8052e3821005c4a4ef8e97a2abbc6b683ff4d0c 1 个父辈 75842568

合约分红统计修改

内嵌 并排对比
正在显示 1 个修改的文件 包含 16 行增加 和 13 行删除
@@ -425,9 +425,10 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st @@ -425,9 +425,10 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st
425 return nil, err 425 return nil, err
426 } 426 }
427 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{ 427 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{
428 - "companyId": request.CompanyId,  
429 - "orgId": request.OrgId,  
430 - "userBaseId": request.UserBaseId, 428 + "companyId": request.CompanyId,
  429 + "orgId": request.OrgId,
  430 + "userBaseId": request.UserBaseId,
  431 + "cooperationContractNumbers": contractNumbers,
431 }, allDividends); err != nil { 432 }, allDividends); err != nil {
432 return nil, err 433 return nil, err
433 } 434 }
@@ -439,11 +440,12 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st @@ -439,11 +440,12 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st
439 return nil, err 440 return nil, err
440 } 441 }
441 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{ 442 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{
442 - "companyId": request.CompanyId,  
443 - "orgId": request.OrgId,  
444 - "userBaseId": request.UserBaseId,  
445 - "paymentBeginTime": queryOptions["beginTime"],  
446 - "paymentEndTime": queryOptions["endTime"], 443 + "companyId": request.CompanyId,
  444 + "orgId": request.OrgId,
  445 + "userBaseId": request.UserBaseId,
  446 + "paymentBeginTime": queryOptions["beginTime"],
  447 + "paymentEndTime": queryOptions["endTime"],
  448 + "cooperationContractNumbers": contractNumbers,
447 }, annualDividends); err != nil { 449 }, annualDividends); err != nil {
448 return nil, err 450 return nil, err
449 } 451 }
@@ -454,11 +456,12 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st @@ -454,11 +456,12 @@ func (ptr *CooperationStatisticsService) DividendsStatistics(queryOptions map[st
454 return nil, err 456 return nil, err
455 } 457 }
456 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{ 458 if err := creditAccountDao.DividendsStatistics(map[string]interface{}{
457 - "companyId": request.CompanyId,  
458 - "orgId": request.OrgId,  
459 - "userBaseId": request.UserBaseId,  
460 - "paymentBeginTime": queryOptions["beginTime"],  
461 - "paymentEndTime": queryOptions["endTime"], 459 + "companyId": request.CompanyId,
  460 + "orgId": request.OrgId,
  461 + "userBaseId": request.UserBaseId,
  462 + "paymentBeginTime": queryOptions["beginTime"],
  463 + "paymentEndTime": queryOptions["endTime"],
  464 + "cooperationContractNumbers": contractNumbers,
462 }, quarterDividends); err != nil { 465 }, quarterDividends); err != nil {
463 return nil, err 466 return nil, err
464 } 467 }