合并分支 'dev' 到 'test'

Dev 查看合并请求 !13

合并分支 'dev' 到 'test'
Dev 查看合并请求 !13
陈志颖
pkg/application/cooperationProject/service/cooperation_project.go
pkg/application/dividendsEstimate/service/dividends_estimate.go
pkg/application/dividendsOrder/service/dividends_order.go
pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
pkg/infrastructure/dao/pg_cooperation_project_dao.go
pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
pkg/infrastructure/domain_service/pg_confirm_money_incentives_estimate_service.go
pkg/infrastructure/repository/pg_dividends_estimate_repository.go
--- a/pkg/application/cooperationProject/service/cooperation_project.go
查看文件 @dc7574d
+++ b/pkg/application/cooperationProject/service/cooperation_project.go
查看文件 @dc7574d
@@ -138,6 +138,26 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro
 		department = data
 	}
+	// 共创项目仓储初始化
+	var cooperationProjectRepository domain.CooperationProjectRepository
+	if value, err := factory.CreateCooperationProjectRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		cooperationProjectRepository = value
+	}
+
+	// 共创项目DAO初始化
+	var cooperationProjectDao *dao.CooperationProjectDao
+	if value, err := factory.CreateCooperationProjectDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		cooperationProjectDao = value
+	}
+
 	// 查找共创模式
 	var cooperationModeRepository domain.CooperationModeRepository
 	if value, err := factory.CreateCooperationModeRepository(map[string]interface{}{
@@ -147,22 +167,17 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro
 	} else {
 		cooperationModeRepository = value
 	}
-	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeNumber": createCooperationProjectCommand.CooperationModeNumber})
+	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{
+		"companyId":             createCooperationProjectCommand.CompanyId,
+		"orgId":                 createCooperationProjectCommand.OrgId,
+		"cooperationModeNumber": createCooperationProjectCommand.CooperationModeNumber,
+	})
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
 	}
 	if cooperationMode == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createCooperationProjectCommand.CooperationModeNumber))
 	} else {
-		// 共创项目DAO初始化
-		var cooperationProjectDao *dao.CooperationProjectDao
-		if value, err := factory.CreateCooperationProjectDao(map[string]interface{}{
-			"transactionContext": transactionContext,
-		}); err != nil {
-			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
-		} else {
-			cooperationProjectDao = value
-		}
 		// 生成共创项目编号
 		projectNumber, err2 := cooperationProjectDao.GenerateProjectNumber(map[string]interface{}{
 			"companyId": createCooperationProjectCommand.CompanyId,
@@ -172,21 +187,27 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro
 		}
 		// 校验共创项目编号是否唯一
-		numberAvailable, _ := cooperationProjectDao.CheckProjectNumberAvailable(map[string]interface{}{
+		numberAvailable, err := cooperationProjectDao.CheckProjectNumberAvailable(map[string]interface{}{
 			"companyId":                createCooperationProjectCommand.CompanyId,
 			"orgId":                    createCooperationProjectCommand.OrgId,
 			"cooperationProjectNumber": projectNumber,
 		})
+		if err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
 		if !numberAvailable {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, "新增共创项目异常")
 		}
 		// 校验共创项目名称是否唯一
-		nameAvailable, _ := cooperationProjectDao.CheckProjectNameAvailable(map[string]interface{}{
+		nameAvailable, err := cooperationProjectDao.CheckProjectNameAvailable(map[string]interface{}{
 			"companyId":              createCooperationProjectCommand.CompanyId,
 			"orgId":                  createCooperationProjectCommand.OrgId,
 			"cooperationProjectName": createCooperationProjectCommand.CooperationProjectName,
 		})
+		if err != nil {
+			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+		}
 		if !nameAvailable {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, "共创项目名称重复")
 		}
@@ -212,14 +233,7 @@ func (cooperationProjectService *CooperationProjectService) CreateCooperationPro
 			CreatedAt:                         time.Now(),
 			ApplicantCount:                    0,
 		}
-		var cooperationProjectRepository domain.CooperationProjectRepository
-		if value, err := factory.CreateCooperationProjectRepository(map[string]interface{}{
-			"transactionContext": transactionContext,
-		}); err != nil {
-			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
-		} else {
-			cooperationProjectRepository = value
-		}
+
 		if cooperationProject, err := cooperationProjectRepository.Save(newCooperationProject); err != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		} else {
--- a/pkg/application/dividendsEstimate/service/dividends_estimate.go
查看文件 @dc7574d
+++ b/pkg/application/dividendsEstimate/service/dividends_estimate.go
查看文件 @dc7574d
@@ -1364,9 +1364,22 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 		cooperationContractRepository = value
 	}
-	// TODO 阶段承接人列表
+	// 分红预算仓储初始化
+	var dividendsEstimateRepository domain.DividendsEstimateRepository
+	if value, err := factory.CreateDividendsEstimateRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		dividendsEstimateRepository = value
+	}
+
+	// 阶段承接人列表
 	stageAndUndertaker := make([]*dto.StageAndUndertaker, 0)
+	// 阶段承接人map
+	stageUndertakerMap := make(map[int32][]*domain.Undertaker)
+
 	// 查找共创合约
 	searchMoneyIncentivesEstimateQuery.IncentivesType = 2
 	if count, cooperationContracts, err := cooperationContractRepository.Find(tool_funs.SimpleStructToMap(searchMoneyIncentivesEstimateQuery)); err != nil {
@@ -1374,10 +1387,39 @@ func (dividendsEstimateService *DividendsEstimateService) SearchMoneyIncentivesE
 	} else {
 		var moneyIncentivesEstimateDtos []*dto.MoneyIncentivesEstimateDto
 		for _, cooperationContract := range cooperationContracts {
-			// TODO 判断承接人是否已分红
-			//for _, undertaker := range cooperationContract.Undertakers {
-			//
-			//}
+			for _, rule := range cooperationContract.MoneyIncentivesRules {
+				stageUndertakerMap[rule.MoneyIncentivesStage] = make([]*domain.Undertaker, 0)
+			}
+			for _, undertaker := range cooperationContract.Undertakers {
+				//	 查询承接人分红预算单
+				if countDividendsEstimates, dividendsEstimates, err := dividendsEstimateRepository.Find(map[string]interface{}{
+					"cooperationContractNumber": cooperationContract.CooperationContractNumber,
+					"companyId":                 cooperationContract.Company.CompanyId,
+					"orgId":                     cooperationContract.Org.OrgId,
+					"dividendsUserId":           undertaker.UserId,
+				}); err != nil {
+					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				} else {
+					if countDividendsEstimates > 0 {
+						for _, dividendsEstimate := range dividendsEstimates {
+							if dividendsEstimate.DividendsAccountStatus == 1 || dividendsEstimate.IsCanceled { // 分红预算单状态为待结算或已取消
+								stageUndertakerMap[dividendsEstimate.DividendsStage] = append(stageUndertakerMap[dividendsEstimate.DividendsStage], undertaker)
+							}
+						}
+					} else if countDividendsEstimates == 0 { // 未分红，可以加入任意阶段进行金额激励
+						for i, _ := range stageUndertakerMap {
+							stageUndertakerMap[i] = append(stageUndertakerMap[i], undertaker)
+						}
+					}
+				}
+			}
+
+			for k, v := range stageUndertakerMap {
+				stageAndUndertaker = append(stageAndUndertaker, &dto.StageAndUndertaker{
+					Stage:       k,
+					Undertakers: v,
+				})
+			}
 			moneyIncentivesEstimateDto := &dto.MoneyIncentivesEstimateDto{}
 			if err := moneyIncentivesEstimateDto.LoadDto(cooperationContract, stageAndUndertaker); err != nil {
--- a/pkg/application/dividendsOrder/service/dividends_order.go
查看文件 @dc7574d
+++ b/pkg/application/dividendsOrder/service/dividends_order.go
查看文件 @dc7574d
@@ -169,7 +169,8 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
 			// 校验产品关联合约的激励规则是否匹配订单时间
 			if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
 				for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
-					if (orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) && (orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
+					if !((orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) &&
+						(orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd))) {
 						ruleMatchedFlag = true
 						break
 					}
@@ -754,7 +755,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
 				// 校验产品关联合约的激励规则是否匹配订单时间
 				if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
 					for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
-						if (orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) && (orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
+						if !((orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) &&
+							(orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd))) {
 							ruleMatchedFlag = true
 							break
 						}
@@ -1205,7 +1207,8 @@ func (dividendsOrderService *DividendsOrderService) UpdateDividendsOrder(updateD
 			// 校验产品关联合约的激励规则是否匹配订单时间
 			if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
 				for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
-					if (orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) && (orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
+					if !((orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) &&
+						(orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd))) {
 						ruleMatchedFlag = true
 						break
 					}
--- a/pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @dc7574d
+++ b/pkg/application/dividendsReturnedOrder/service/dividends_returned_order.go
查看文件 @dc7574d
@@ -176,7 +176,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
 			// 校验产品关联合约的激励规则是否匹配订单时间
 			if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
 				for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
-					if (orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) && (orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
+					if !(orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) &&
+						(orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
 						ruleMatchedFlag = true
 						break
 					}
@@ -795,6 +796,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
 					orderGoodErrMap[dividendsReturnedOrder.OrderGoods[i].LineNumber] = application.ThrowError(application.INTERNAL_SERVER_ERROR, "退货单产品不能关联金额激励规则")
 				}
 			}
+
 			orderGoods = append(orderGoods, &domain.OrderGood{
 				OrderGoodId:                  0,
 				OrderGoodAmount:              orderGoodAmount,
@@ -1177,7 +1179,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
 			// 校验产品关联合约的激励规则是否匹配订单时间
 			if cooperationContractsMap[orderGood.CooperationContractNumber] != nil {
 				for _, incentivesRule := range cooperationContractsMap[orderGood.CooperationContractNumber].DividendsIncentivesRules {
-					if (orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) && (orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd)) {
+					if !((orderTime.After(incentivesRule.DividendsIncentivesStageStart) || orderTime.Equal(incentivesRule.DividendsIncentivesStageStart)) &&
+						(orderTime.Before(incentivesRule.DividendsIncentivesStageEnd) || orderTime.Equal(incentivesRule.DividendsIncentivesStageEnd))) {
 						ruleMatchedFlag = true
 						break
 					}
--- a/pkg/infrastructure/dao/pg_cooperation_project_dao.go
查看文件 @dc7574d
+++ b/pkg/infrastructure/dao/pg_cooperation_project_dao.go
查看文件 @dc7574d
@@ -118,7 +118,7 @@ func (dao *CooperationProjectDao) CheckProjectNameAvailable(queryOptions map[str
 	if orgId, ok := queryOptions["orgId"]; ok && orgId.(int64) != 0 {
 		query = query.Where(`cooperation_project.org @> '{"orgId":"?"}'`, orgId)
 	}
-	query.Where("cooperation_project.status = ？", 1)
+	query.Where("cooperation_project.status = ?", 1)
 	ok, err := query.Exists()
 	return !ok, err
 }
--- a/pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
查看文件 @dc7574d
+++ b/pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
查看文件 @dc7574d
@@ -172,7 +172,8 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			// 匹配分红规则
 			var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule
 			for _, dividendsIncentivesRule := range cooperationContract.DividendsIncentivesRules {
-				if dividendsOrder.OrderTime.After(dividendsIncentivesRule.DividendsIncentivesStageStart) && dividendsOrder.OrderTime.Before(dividendsIncentivesRule.DividendsIncentivesStageEnd) {
+				if (dividendsOrder.OrderTime.After(dividendsIncentivesRule.DividendsIncentivesStageStart) || dividendsOrder.OrderTime.Equal(dividendsIncentivesRule.DividendsIncentivesStageStart)) &&
+					(dividendsOrder.OrderTime.Before(dividendsIncentivesRule.DividendsIncentivesStageEnd) || dividendsOrder.OrderTime.Equal(dividendsIncentivesRule.DividendsIncentivesStageEnd)) {
 					dividendsIncentivesRuleMatched = dividendsIncentivesRule
 					break
 				}
@@ -302,7 +303,8 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 			// 匹配分红规则
 			var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule
 			for _, dividendsIncentivesRule := range cooperationContract.DividendsIncentivesRules {
-				if dividendsReturnedOrder.OrderTime.After(dividendsIncentivesRule.DividendsIncentivesStageStart) && dividendsReturnedOrder.OrderTime.Before(dividendsIncentivesRule.DividendsIncentivesStageEnd) {
+				if (dividendsReturnedOrder.OrderTime.After(dividendsIncentivesRule.DividendsIncentivesStageStart) || dividendsReturnedOrder.OrderTime.Equal(dividendsIncentivesRule.DividendsIncentivesStageStart)) &&
+					(dividendsReturnedOrder.OrderTime.Before(dividendsIncentivesRule.DividendsIncentivesStageEnd) || dividendsReturnedOrder.OrderTime.Equal(dividendsIncentivesRule.DividendsIncentivesStageEnd)) {
 					dividendsIncentivesRuleMatched = dividendsIncentivesRule
 					break
 				}
--- a/pkg/infrastructure/domain_service/pg_confirm_money_incentives_estimate_service.go
查看文件 @dc7574d
+++ b/pkg/infrastructure/domain_service/pg_confirm_money_incentives_estimate_service.go
查看文件 @dc7574d
@@ -43,7 +43,7 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
 	// 判断金额激励阶段是否合法
 	currentTime := time.Now()
-	if moneyIncentivesRuleMatched.MoneyIncentivesStageStart.After(currentTime) {
+	if currentTime.Before(moneyIncentivesRuleMatched.MoneyIncentivesStageStart) {
 		return nil, fmt.Errorf("还未到分红时间")
 	}
--- a/pkg/infrastructure/repository/pg_dividends_estimate_repository.go
查看文件 @dc7574d
+++ b/pkg/infrastructure/repository/pg_dividends_estimate_repository.go
查看文件 @dc7574d
@@ -308,6 +308,9 @@ func (repository *DividendsEstimateRepository) Find(queryOptions map[string]inte
 	if v, ok := queryOptions["cooperationContractNumbers"]; ok && len(v.([]string)) > 0 {
 		query.Where("cooperation_contract_number in (?)", pg.In(v))
 	}
+	if dividendsUserId, ok := queryOptions["dividendsUserId"]; ok && dividendsUserId.(int64) != 0 {
+		query.Where(`dividends_user @> '{"uid":"?"}'`, dividendsUserId)
+	}
 	if companyId, ok := queryOptions["companyId"]; ok && companyId.(int64) != 0 {
 		query.Where("company->>'companyId' = '?'", companyId)
 	}