合并分支 'dev' 到 'test'

Dev



查看合并请求 !75

@@ -521,7 +521,6 @@ func (dividendsEstimateService *DividendsEstimateService) CreateDividendsEstimat
 
 
 // ConfirmDividendsIncentivesEstimate 确定业绩激励分红预算
 // ConfirmDividendsIncentivesEstimate 确定业绩激励分红预算
 func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncentivesEstimate(confirmDividendsIncentivesEstimateCommand *command.ConfirmDividendsIncentivesEstimateCommand) (interface{}, error) {
 func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncentivesEstimate(confirmDividendsIncentivesEstimateCommand *command.ConfirmDividendsIncentivesEstimateCommand) (interface{}, error) {
-	start := time.Now() // 获取当前时间
 	if err := confirmDividendsIncentivesEstimateCommand.ValidateCommand(); err != nil {
 	if err := confirmDividendsIncentivesEstimateCommand.ValidateCommand(); err != nil {
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
@@ -715,10 +714,12 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 			cooperationContractNumbers = append(cooperationContractNumbers, orderGood.CooperationContractNumber)
 			cooperationContractNumbers = append(cooperationContractNumbers, orderGood.CooperationContractNumber)
 		}
 		}
 
 
+		newCooperationContractNumbers := utils.RemoveDuplicationString(cooperationContractNumbers)
+
 		// 查询共创合约
 		// 查询共创合约
 		cooperationContractsMap := make(map[string]*domain.CooperationContract, 0)
 		cooperationContractsMap := make(map[string]*domain.CooperationContract, 0)
 		if count, cooperationContractsFound, err := cooperationContractRepository.Find(map[string]interface{}{
 		if count, cooperationContractsFound, err := cooperationContractRepository.Find(map[string]interface{}{
-			"cooperationContractNumbers": cooperationContractNumbers,
+			"cooperationContractNumbers": newCooperationContractNumbers,
 			"companyId":                  confirmDividendsIncentivesEstimateCommand.CompanyId,
 			"companyId":                  confirmDividendsIncentivesEstimateCommand.CompanyId,
 			"orgId":                      confirmDividendsIncentivesEstimateCommand.OrgId,
 			"orgId":                      confirmDividendsIncentivesEstimateCommand.OrgId,
 			"offsetLimit":                false,
 			"offsetLimit":                false,
@@ -1028,9 +1029,6 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 				failedReasonStr = "无"
 				failedReasonStr = "无"
 			}
 			}
 
 
-			elapsed := time.Since(start)
-			fmt.Println("该函数执行完成耗时：", elapsed)
-
 			return map[string]interface{}{
 			return map[string]interface{}{
 				"report": fmt.Sprintf("已完成%d单订单分红预算，生成%d单分红预算，%d笔订单分红预算失败，失败原因：%s", len(estimateSuccessfullyDividendsOrders), successfullyCount, len(estimateFailedDividendsOrders), failedReasonStr),
 				"report": fmt.Sprintf("已完成%d单订单分红预算，生成%d单分红预算，%d笔订单分红预算失败，失败原因：%s", len(estimateSuccessfullyDividendsOrders), successfullyCount, len(estimateFailedDividendsOrders), failedReasonStr),
 			}, nil
 			}, nil

@@ -164,6 +164,21 @@ func RemoveDuplicationInt64(arr []int64) []int64 {
 	return arr[:j]
 	return arr[:j]
 }
 }
 
 
+func RemoveDuplicationString(arr []string) []string {
+	set := make(map[string]struct{}, len(arr))
+	j := 0
+	for _, v := range arr {
+		_, ok := set[v]
+		if ok {
+			continue
+		}
+		set[v] = struct{}{}
+		arr[j] = v
+		j++
+	}
+	return arr[:j]
+}
+
 func RemoveDuplicationInt32(arr []int32) []int32 {
 func RemoveDuplicationInt32(arr []int32) []int32 {
 	set := make(map[int32]struct{}, len(arr))
 	set := make(map[int32]struct{}, len(arr))
 	j := 0
 	j := 0