作者 陈志颖

fix:去除分红预算项目状态判断

@@ -359,6 +359,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec @@ -359,6 +359,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
359 undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3) 359 undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3)
360 } 360 }
361 361
  362 + // TODO 优化
362 // 判断项目关联的合约承接人类型 363 // 判断项目关联的合约承接人类型
363 undertakers := make([]*domain.Undertaker, 0) 364 undertakers := make([]*domain.Undertaker, 0)
364 if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{ 365 if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
@@ -98,24 +98,24 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -98,24 +98,24 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
98 } 98 }
99 99
100 // 判断共创项目是否存在 100 // 判断共创项目是否存在
101 - if _, ok := cooperationProjectsMap[cooperationContract.CooperationProjectNumber]; !ok {  
102 - var orderNumber string  
103 - if orderGood.DividendsOrderNumber != "" {  
104 - orderNumber = orderGood.DividendsOrderNumber  
105 - } else {  
106 - orderNumber = orderGood.DividendsReturnedOrderNumber  
107 - }  
108 - dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{  
109 - DividendsUser: nil,  
110 - DividendsParticipateType: 0,  
111 - DividendsStage: 0,  
112 - DividendsAmount: 0,  
113 - OrderOrReturnedOrderNumber: orderNumber,  
114 - IsSuccessfully: false,  
115 - Reason: "共创项目" + cooperationContract.CooperationProjectNumber + "已结束或不存在",  
116 - })  
117 - continue  
118 - } 101 + //if _, ok := cooperationProjectsMap[cooperationContract.CooperationProjectNumber]; !ok {
  102 + // var orderNumber string
  103 + // if orderGood.DividendsOrderNumber != "" {
  104 + // orderNumber = orderGood.DividendsOrderNumber
  105 + // } else {
  106 + // orderNumber = orderGood.DividendsReturnedOrderNumber
  107 + // }
  108 + // dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
  109 + // DividendsUser: nil,
  110 + // DividendsParticipateType: 0,
  111 + // DividendsStage: 0,
  112 + // DividendsAmount: 0,
  113 + // OrderOrReturnedOrderNumber: orderNumber,
  114 + // IsSuccessfully: false,
  115 + // Reason: "共创项目" + cooperationContract.CooperationProjectNumber + "已结束或不存在",
  116 + // })
  117 + // continue
  118 + //}
119 119
120 if orderGood.DividendsOrderNumber != "" { // 获取分红订单 120 if orderGood.DividendsOrderNumber != "" { // 获取分红订单
121 // 获取分红订单 121 // 获取分红订单