fix:修复分红预算缺失字段

@@ -91,7 +91,7 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Crea
 	}
 	}
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber})
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": createContractUndertakerFeedbackCommand.CooperationContractNumber})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}
 	}
 	if cooperationContract == nil {
 	if cooperationContract == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createContractUndertakerFeedbackCommand.CooperationContractNumber))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createContractUndertakerFeedbackCommand.CooperationContractNumber))
@@ -153,7 +153,7 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) GetC
 	}
 	}
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": getContractUndertakerFeedbackQuery.FeedbackId})
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": getContractUndertakerFeedbackQuery.FeedbackId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "合约反馈信息不存在")
 	}
 	}
 	if contractUndertakerFeedback == nil {
 	if contractUndertakerFeedback == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getContractUndertakerFeedbackQuery.FeedbackId)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getContractUndertakerFeedbackQuery.FeedbackId)))
@@ -228,7 +228,7 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Remo
 	}
 	}
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": removeContractUndertakerFeedbackCommand.FeedbackId})
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": removeContractUndertakerFeedbackCommand.FeedbackId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "反馈信息不存在")
 	}
 	}
 	if contractUndertakerFeedback == nil {
 	if contractUndertakerFeedback == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(removeContractUndertakerFeedbackCommand.FeedbackId)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(removeContractUndertakerFeedbackCommand.FeedbackId)))
@@ -306,7 +306,7 @@ func (contractUndertakerFeedbackService *ContractUndertakerFeedbackService) Upda
 	}
 	}
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": updateContractUndertakerFeedbackCommand.FeedbackId})
 	contractUndertakerFeedback, err := contractUndertakerFeedbackRepository.FindOne(map[string]interface{}{"contractUndertakerFeedbackId": updateContractUndertakerFeedbackCommand.FeedbackId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "反馈信息不存在")
 	}
 	}
 	if contractUndertakerFeedback == nil {
 	if contractUndertakerFeedback == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateContractUndertakerFeedbackCommand.FeedbackId)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateContractUndertakerFeedbackCommand.FeedbackId)))

@@ -48,7 +48,7 @@ func (cooperationApplicationService *CooperationApplicationService) ApplyForCoop
 	// 获取共创项目
 	// 获取共创项目
 	cooperationProject, err := cooperationProjectRepository.FindOne(map[string]interface{}{"cooperationProjectId": applyForCooperationCommand.CooperationProjectId})
 	cooperationProject, err := cooperationProjectRepository.FindOne(map[string]interface{}{"cooperationProjectId": applyForCooperationCommand.CooperationProjectId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创项目不存在")
 	}
 	}
 	if cooperationProject == nil {
 	if cooperationProject == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(applyForCooperationCommand.CooperationProjectId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(applyForCooperationCommand.CooperationProjectId, 10)))
@@ -169,7 +169,7 @@ func (cooperationApplicationService *CooperationApplicationService) ApprovalCoop
 	// 获取共创申请
 	// 获取共创申请
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": approvalCooperationApplicationCommand.CooperationApplicationId})
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": approvalCooperationApplicationCommand.CooperationApplicationId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创申请不存在")
 	}
 	}
 	if cooperationApplication == nil {
 	if cooperationApplication == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationApplicationId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationApplicationId, 10)))
@@ -330,7 +330,7 @@ func (cooperationApplicationService *CooperationApplicationService) CreateCooper
 	}
 	}
 	cooperationProject, err := cooperationProjectRepository.FindOne(map[string]interface{}{"cooperationProjectNumber": createCooperationApplicationCommand.CooperationProjectNumber})
 	cooperationProject, err := cooperationProjectRepository.FindOne(map[string]interface{}{"cooperationProjectNumber": createCooperationApplicationCommand.CooperationProjectNumber})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创项目不存在")
 	}
 	}
 	if cooperationProject == nil {
 	if cooperationProject == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createCooperationApplicationCommand.CooperationProjectNumber))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", createCooperationApplicationCommand.CooperationProjectNumber))
@@ -445,7 +445,7 @@ func (cooperationApplicationService *CooperationApplicationService) GetCooperati
 	}
 	}
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": getCooperationApplicationQuery.CooperationApplicationId})
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": getCooperationApplicationQuery.CooperationApplicationId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创申请不存在")
 	}
 	}
 	if cooperationApplication == nil {
 	if cooperationApplication == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationApplicationQuery.CooperationApplicationId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationApplicationQuery.CooperationApplicationId, 10)))
@@ -523,7 +523,7 @@ func (cooperationApplicationService *CooperationApplicationService) RemoveCooper
 	}
 	}
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": removeCooperationApplicationCommand.CooperationApplicationId})
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": removeCooperationApplicationCommand.CooperationApplicationId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创申请不存在")
 	}
 	}
 	if cooperationApplication == nil {
 	if cooperationApplication == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationApplicationCommand.CooperationApplicationId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationApplicationCommand.CooperationApplicationId, 10)))
@@ -608,7 +608,7 @@ func (cooperationApplicationService *CooperationApplicationService) UpdateCooper
 	}
 	}
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": updateCooperationApplicationCommand.CooperationApplicationId})
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": updateCooperationApplicationCommand.CooperationApplicationId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创申请不存在")
 	}
 	}
 	if cooperationApplication == nil {
 	if cooperationApplication == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationApplicationCommand.CooperationApplicationId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationApplicationCommand.CooperationApplicationId, 10)))
@@ -658,7 +658,7 @@ func (cooperationApplicationService *CooperationApplicationService) CancelCooper
 	}
 	}
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": cooperationApplicationId})
 	cooperationApplication, err := cooperationApplicationRepository.FindOne(map[string]interface{}{"cooperationApplicationId": cooperationApplicationId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创申请不存在")
 	}
 	}
 	if cooperationApplication == nil {
 	if cooperationApplication == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationApplicationId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationApplicationId, 10)))

@@ -368,7 +368,7 @@ func (cooperationContractService *CooperationContractService) GetCooperationCont
 	}
 	}
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": getCooperationContractQuery.CooperationContractId})
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": getCooperationContractQuery.CooperationContractId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}
 	}
 	if cooperationContract == nil {
 	if cooperationContract == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationContractQuery.CooperationContractId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationContractQuery.CooperationContractId, 10)))
@@ -489,7 +489,7 @@ func (cooperationContractService *CooperationContractService) RemoveCooperationC
 	}
 	}
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": removeCooperationContractCommand.CooperationContractId})
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": removeCooperationContractCommand.CooperationContractId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}
 	}
 	if cooperationContract == nil {
 	if cooperationContract == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationContractCommand.CooperationContractId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationContractCommand.CooperationContractId, 10)))
@@ -603,7 +603,7 @@ func (cooperationContractService *CooperationContractService) OperateCooperation
 	// 获取共创合约
 	// 获取共创合约
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": operateCooperationContractCommand.CooperationContractId})
 	cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": operateCooperationContractCommand.CooperationContractId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}
 	}
 	if cooperationContract == nil {
 	if cooperationContract == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(operateCooperationContractCommand.CooperationContractId)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(operateCooperationContractCommand.CooperationContractId)))
@@ -883,7 +883,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
 	// 获取待更新的共创合约
 	// 获取待更新的共创合约
 	cooperationContract, err8 := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": updateCooperationContractCommand.CooperationContractId})
 	cooperationContract, err8 := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractId": updateCooperationContractCommand.CooperationContractId})
 	if err8 != nil {
 	if err8 != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err8.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 	}
 	}
 	if cooperationContract == nil {
 	if cooperationContract == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateCooperationContractCommand.CooperationContractId)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateCooperationContractCommand.CooperationContractId)))

@@ -140,7 +140,7 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
 	}
 	}
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": getCooperationContractChangeLogQuery.CooperationContractChangeLogId})
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": getCooperationContractChangeLogQuery.CooperationContractChangeLogId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约变更记录不存在")
 	}
 	}
 	if cooperationContractChangeLog == nil {
 	if cooperationContractChangeLog == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationContractChangeLogQuery.CooperationContractChangeLogId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationContractChangeLogQuery.CooperationContractChangeLogId, 10)))
@@ -215,7 +215,7 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
 	}
 	}
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": removeCooperationContractChangeLogCommand.CooperationContractChangeLogId})
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": removeCooperationContractChangeLogCommand.CooperationContractChangeLogId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约变更记录不存在")
 	}
 	}
 	if cooperationContractChangeLog == nil {
 	if cooperationContractChangeLog == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationContractChangeLogCommand.CooperationContractChangeLogId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationContractChangeLogCommand.CooperationContractChangeLogId, 10)))
@@ -293,7 +293,7 @@ func (cooperationContractChangeLogService *CooperationContractChangeLogService)
 	}
 	}
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": updateCooperationContractChangeLogCommand.CooperationContractChangeLogId})
 	cooperationContractChangeLog, err := cooperationContractChangeLogRepository.FindOne(map[string]interface{}{"cooperationContractChangeLogId": updateCooperationContractChangeLogCommand.CooperationContractChangeLogId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约变更记录不存在")
 	}
 	}
 	if cooperationContractChangeLog == nil {
 	if cooperationContractChangeLog == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationContractChangeLogCommand.CooperationContractChangeLogId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationContractChangeLogCommand.CooperationContractChangeLogId, 10)))

@@ -168,7 +168,7 @@ func (cooperationModeService *CooperationModeService) GetCooperationMode(getCoop
 	}
 	}
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": getCooperationModeQuery.CooperationModeId})
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": getCooperationModeQuery.CooperationModeId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
 	}
 	}
 	if cooperationMode == nil {
 	if cooperationMode == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationModeQuery.CooperationModeId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(getCooperationModeQuery.CooperationModeId, 10)))
@@ -241,7 +241,7 @@ func (cooperationModeService *CooperationModeService) RemoveCooperationMode(remo
 	}
 	}
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": removeCooperationModeCommand.CooperationModeId})
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": removeCooperationModeCommand.CooperationModeId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
 	}
 	}
 	if cooperationMode == nil {
 	if cooperationMode == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationModeCommand.CooperationModeId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(removeCooperationModeCommand.CooperationModeId, 10)))
@@ -379,7 +379,7 @@ func (cooperationModeService *CooperationModeService) UpdateCooperationMode(upda
 
 
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": updateCooperationModeCommand.CooperationModeId})
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": updateCooperationModeCommand.CooperationModeId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
 	}
 	}
 	if cooperationMode == nil {
 	if cooperationMode == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationModeCommand.CooperationModeId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(updateCooperationModeCommand.CooperationModeId, 10)))
@@ -423,7 +423,7 @@ func (cooperationModeService *CooperationModeService) OperateCooperationMode(ope
 	cooperationModeId, _ := strconv.ParseInt(operateCooperationModeCommand.CooperationModeId, 10, 64)
 	cooperationModeId, _ := strconv.ParseInt(operateCooperationModeCommand.CooperationModeId, 10, 64)
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": cooperationModeId})
 	cooperationMode, err := cooperationModeRepository.FindOne(map[string]interface{}{"cooperationModeId": cooperationModeId})
 	if err != nil {
 	if err != nil {
-		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创模式不存在")
 	}
 	}
 	if cooperationMode == nil {
 	if cooperationMode == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationModeId, 10)))
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cooperationModeId, 10)))

@@ -456,6 +456,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 		_ = transactionContext.RollbackTransaction()
 		_ = transactionContext.RollbackTransaction()
 	}()
 	}()
 
 
+	// 订单产品ID类型转换
 	orderGoodIds, err := utils.SliceAtoi(confirmDividendsIncentivesEstimateCommand.OrderGoodIds)
 	orderGoodIds, err := utils.SliceAtoi(confirmDividendsIncentivesEstimateCommand.OrderGoodIds)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -493,6 +494,22 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 		organization = data
 		organization = data
 	}
 	}
 
 
+	// 用户REST服务初始化
+	var userService service.UserService
+	if value, err := factory.CreateUserService(map[string]interface{}{}); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		userService = value
+	}
+
+	// 获取操作人
+	var operator *domain.User
+	if data, err := userService.OperatorFrom(confirmDividendsIncentivesEstimateCommand.CompanyId, confirmDividendsIncentivesEstimateCommand.OrgId, confirmDividendsIncentivesEstimateCommand.UserId); err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	} else {
+		operator = data
+	}
+
 	// 分红订单仓储初始化
 	// 分红订单仓储初始化
 	var dividendsOrderRepository domain.DividendsOrderRepository
 	var dividendsOrderRepository domain.DividendsOrderRepository
 	if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{
 	if value, err := factory.CreateDividendsOrderRepository(map[string]interface{}{
@@ -566,9 +583,9 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 		for _, orderGood := range orderGoods {
 		for _, orderGood := range orderGoods {
 			dividendsEstimate := &domain.DividendsEstimate{}
 			dividendsEstimate := &domain.DividendsEstimate{}
 			if orderGood.DividendsOrderNumber != "" { // 查询分红订单
 			if orderGood.DividendsOrderNumber != "" { // 查询分红订单
-				dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{"dividendsOrderNumber": orderGood.DividendsOrderNumber})
-				if err != nil {
-					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				dividendsOrder, err3 := dividendsOrderRepository.FindOne(map[string]interface{}{"dividendsOrderNumber": orderGood.DividendsOrderNumber})
+				if err3 != nil {
+					return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单不存在")
 				}
 				}
 				if dividendsOrder == nil {
 				if dividendsOrder == nil {
 					return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsOrderNumber))
 					return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsOrderNumber))
@@ -598,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 							DividendsStage:               dividendsEstimateDetail.DividendsStage,
 							DividendsStage:               dividendsEstimateDetail.DividendsStage,
 							Org:                          organization,
 							Org:                          organization,
 							Company:                      company,
 							Company:                      company,
-							Operator:                     nil,
+							Operator:                     operator,
 							OperateTime:                  time.Time{},
 							OperateTime:                  time.Time{},
 							IsCanceled:                   false,
 							IsCanceled:                   false,
 							CreatedAt:                    time.Now(),
 							CreatedAt:                    time.Now(),
@@ -641,7 +658,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
 							DividendsStage:               dividendsReturnedEstimateDetail.DividendsStage,
 							DividendsStage:               dividendsReturnedEstimateDetail.DividendsStage,
 							Org:                          organization,
 							Org:                          organization,
 							Company:                      company,
 							Company:                      company,
-							Operator:                     nil,
+							Operator:                     operator,
 							OperateTime:                  time.Time{},
 							OperateTime:                  time.Time{},
 							IsCanceled:                   false,
 							IsCanceled:                   false,
 							CreatedAt:                    time.Now(),
 							CreatedAt:                    time.Now(),

@@ -5,6 +5,7 @@ import (
 	"github.com/beego/beego/v2/core/validation"
 	"github.com/beego/beego/v2/core/validation"
 	"reflect"
 	"reflect"
 	"strings"
 	"strings"
+	"time"
 )
 )
 
 
 type OrderGoods struct {
 type OrderGoods struct {
@@ -30,7 +31,7 @@ type CreateDividendsOrderCommand struct {
 	// 分红订单原单号
 	// 分红订单原单号
 	DividendsOriginalOrderNum string `cname:"源单号" json:"dividendsOriginalOrderNum" valid:"Required"`
 	DividendsOriginalOrderNum string `cname:"源单号" json:"dividendsOriginalOrderNum" valid:"Required"`
 	// 订单时间
 	// 订单时间
-	OrderTime string `cname:"订单时间" json:"orderTime" valid:"Required"`
+	OrderTime time.Time `cname:"订单时间" json:"orderTime" valid:"Required"`
 	// 备注
 	// 备注
 	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
 	Remarks string `cname:"备注" json:"remarks" valid:"Required"`
 	// 订单区域名称
 	// 订单区域名称

@@ -136,9 +136,9 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
 		dividendsOrderAmount = dividendsOrderAmount + orderGood.OrderGoodAmount
 		dividendsOrderAmount = dividendsOrderAmount + orderGood.OrderGoodAmount
 	}
 	}
 
 
-	// 订单时间转换
-	orderTimeInt, _ := strconv.ParseInt(createDividendsOrderCommand.OrderTime, 10, 64)
-	orderTime := utils.TransformTimestampToTime(orderTimeInt)
+	//// 订单时间转换
+	//orderTimeInt, _ := strconv.ParseInt(createDividendsOrderCommand.OrderTime, 10, 64)
+	//orderTime := utils.TransformTimestampToTime(orderTimeInt)
 
 
 	// 新增分红订单
 	// 新增分红订单
 	newDividendsOrder := &domain.DividendsOrder{
 	newDividendsOrder := &domain.DividendsOrder{
@@ -146,7 +146,7 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
 		DividendsOrderNumber:      dividendsOrderNumber,
 		DividendsOrderNumber:      dividendsOrderNumber,
 		DividendsOriginalOrderNum: createDividendsOrderCommand.DividendsOriginalOrderNum,
 		DividendsOriginalOrderNum: createDividendsOrderCommand.DividendsOriginalOrderNum,
 		DividendsOrderAmount:      dividendsOrderAmount,
 		DividendsOrderAmount:      dividendsOrderAmount,
-		OrderTime:                 orderTime,
+		OrderTime:                 createDividendsOrderCommand.OrderTime,
 		DividendTime:              time.Time{},
 		DividendTime:              time.Time{},
 		DividendStatus:            domain.TO_BE_DIVIDEND,
 		DividendStatus:            domain.TO_BE_DIVIDEND,
 		Region: &domain.RegionInfo{
 		Region: &domain.RegionInfo{

@@ -44,7 +44,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 		// 获取合约
 		// 获取合约
 		cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": orderGood.CooperationContractNumber})
 		cooperationContract, err := cooperationContractRepository.FindOne(map[string]interface{}{"cooperationContractNumber": orderGood.CooperationContractNumber})
 		if err != nil {
 		if err != nil {
-			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "共创合约不存在")
 		}
 		}
 		if cooperationContract == nil {
 		if cooperationContract == nil {
 			return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.CooperationContractNumber))
 			return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.CooperationContractNumber))
@@ -55,7 +55,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 				"dividendsOrderNumber": orderGood.DividendsOrderNumber,
 				"dividendsOrderNumber": orderGood.DividendsOrderNumber,
 			})
 			})
 			if err2 != nil {
 			if err2 != nil {
-				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单不存在")
 			}
 			}
 			if dividendsOrder == nil {
 			if dividendsOrder == nil {
 				return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsOrderNumber))
 				return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsOrderNumber))
@@ -68,6 +68,10 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 					break
 					break
 				}
 				}
 			}
 			}
+			if dividendsIncentivesRuleMatched == nil {
+				return nil, application.ThrowError(application.RES_NO_FIND_ERROR, "未匹配到分红规则")
+			}
+
 			// 计算分红
 			// 计算分红
 			if dividendsIncentivesRuleMatched != nil {
 			if dividendsIncentivesRuleMatched != nil {
 				for _, undertaker := range cooperationContract.Undertakers {
 				for _, undertaker := range cooperationContract.Undertakers {
@@ -143,7 +147,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
 				"dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber,
 				"dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber,
 			})
 			})
 			if err3 != nil {
 			if err3 != nil {
-				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红退货单不存在")
 			}
 			}
 			if dividendsReturnedOrder == nil {
 			if dividendsReturnedOrder == nil {
 				return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsReturnedOrderNumber))
 				return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsReturnedOrderNumber))

@@ -23,7 +23,7 @@ type CooperationContractChangeLog struct {
 	Company *domain.Company `comment:"公司"`
 	Company *domain.Company `comment:"公司"`
 	// 组织机构
 	// 组织机构
 	Org *domain.Org `comment:"组织"`
 	Org *domain.Org `comment:"组织"`
-	// 操作人
+	//
 	Operator *domain.User `comment:"操作人"`
 	Operator *domain.User `comment:"操作人"`
 	// 操作时间
 	// 操作时间
 	OperatorTime time.Time `comment:"操作时间"`
 	OperatorTime time.Time `comment:"操作时间"`

@@ -56,12 +56,12 @@ func (repository *DividendsEstimateRepository) Save(dividendsEstimate *domain.Di
 	updateFieldsSnippet := sqlbuilder.SqlUpdateFieldsSnippet(updateFields)
 	updateFieldsSnippet := sqlbuilder.SqlUpdateFieldsSnippet(updateFields)
 	tx := repository.transactionContext.PgTx
 	tx := repository.transactionContext.PgTx
 	if dividendsEstimate.Identify() == nil {
 	if dividendsEstimate.Identify() == nil {
-		//dividendsEstimateId, err := repository.nextIdentify()
-		//if err != nil {
-		//	return dividendsEstimate, err
-		//} else {
-		//	dividendsEstimate.DividendsEstimateId = dividendsEstimateId
-		//}
+		dividendsEstimateId, err := repository.nextIdentify()
+		if err != nil {
+			return dividendsEstimate, err
+		} else {
+			dividendsEstimate.DividendsEstimateId = dividendsEstimateId
+		}
 		if _, err := tx.QueryOne(
 		if _, err := tx.QueryOne(
 			pg.Scan(
 			pg.Scan(
 				&dividendsEstimate.DividendsEstimateId,
 				&dividendsEstimate.DividendsEstimateId,