合并分支 'dev' 到 'test'

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



查看合并请求 !67

@@ -359,6 +359,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
 			undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3)
 			undertakerTypesUncheckedAvailable = append(undertakerTypesUncheckedAvailable, 3)
 		}
 		}
 
 
+		// TODO 优化
 		// 判断项目关联的合约承接人类型
 		// 判断项目关联的合约承接人类型
 		undertakers := make([]*domain.Undertaker, 0)
 		undertakers := make([]*domain.Undertaker, 0)
 		if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{
 		if countContracts, cooperationContracts, err := cooperationContractRepository.Find(map[string]interface{}{

@@ -98,24 +98,24 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 		}
 		}
 
 
 		// 判断共创项目是否存在
 		// 判断共创项目是否存在
-		if _, ok := cooperationProjectsMap[cooperationContract.CooperationProjectNumber]; !ok {
-			var orderNumber string
-			if orderGood.DividendsOrderNumber != "" {
-				orderNumber = orderGood.DividendsOrderNumber
-			} else {
-				orderNumber = orderGood.DividendsReturnedOrderNumber
-			}
-			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
-				DividendsUser:              nil,
-				DividendsParticipateType:   0,
-				DividendsStage:             0,
-				DividendsAmount:            0,
-				OrderOrReturnedOrderNumber: orderNumber,
-				IsSuccessfully:             false,
-				Reason:                     "共创项目" + cooperationContract.CooperationProjectNumber + "已结束或不存在",
-			})
-			continue
-		}
+		//if _, ok := cooperationProjectsMap[cooperationContract.CooperationProjectNumber]; !ok {
+		//	var orderNumber string
+		//	if orderGood.DividendsOrderNumber != "" {
+		//		orderNumber = orderGood.DividendsOrderNumber
+		//	} else {
+		//		orderNumber = orderGood.DividendsReturnedOrderNumber
+		//	}
+		//	dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
+		//		DividendsUser:              nil,
+		//		DividendsParticipateType:   0,
+		//		DividendsStage:             0,
+		//		DividendsAmount:            0,
+		//		OrderOrReturnedOrderNumber: orderNumber,
+		//		IsSuccessfully:             false,
+		//		Reason:                     "共创项目" + cooperationContract.CooperationProjectNumber + "已结束或不存在",
+		//	})
+		//	continue
+		//}
 
 
 		if orderGood.DividendsOrderNumber != "" { // 获取分红订单
 		if orderGood.DividendsOrderNumber != "" { // 获取分红订单
 			// 获取分红订单
 			// 获取分红订单