修正 错误

@@ -28,13 +28,16 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat
 func (dividendsEstimateService *DividendsEstimateService) EstimateDividendsIncentives(estimateDividendsIncentivesCommand *command.EstimateDividendsIncentivesCommand) (interface{}, error) {
 func (dividendsEstimateService *DividendsEstimateService) EstimateDividendsIncentives(estimateDividendsIncentivesCommand *command.EstimateDividendsIncentivesCommand) (interface{}, error) {
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
 		estimateDividendsIncentivesCommand.Operator)
 		estimateDividendsIncentivesCommand.Operator)
-	_, err := creationCooperationGateway.DividendsEstimateDividendsIncentives(allied_creation_cooperation.ReqDividendsEstimateDividendsIncentives{
+	result, err := creationCooperationGateway.DividendsEstimateDividendsIncentives(allied_creation_cooperation.ReqDividendsEstimateDividendsIncentives{
 		OrderGoodIds: estimateDividendsIncentivesCommand.OrderGoodIds,
 		OrderGoodIds: estimateDividendsIncentivesCommand.OrderGoodIds,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	return estimateDividendsIncentivesCommand, nil
+	respData := map[string]string{
+		"result": result.Report,
+	}
+	return respData, nil
 }
 }
 
 
 // 确定预算金额激励分红
 // 确定预算金额激励分红

@@ -126,7 +126,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
 	return updateDividendsReturnedOrderCommand, nil
 	return updateDividendsReturnedOrderCommand, nil
 }
 }
 
 
-// 更新分红退货单服务
+// 分红单下拉选择列表
 func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDividendsOrder(selectorDividendsOrderQuery *query.SelectorDividendsOrderQuery) (
 func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDividendsOrder(selectorDividendsOrderQuery *query.SelectorDividendsOrderQuery) (
 	int, interface{}, error) {
 	int, interface{}, error) {
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(selectorDividendsOrderQuery.Operator)
 	creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(selectorDividendsOrderQuery.Operator)
@@ -134,6 +134,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SelectorDivi
 		DividendsOrderNumber: selectorDividendsOrderQuery.DividendsOrderNumber,
 		DividendsOrderNumber: selectorDividendsOrderQuery.DividendsOrderNumber,
 		PageNumber:           1,
 		PageNumber:           1,
 		PageSize:             999,
 		PageSize:             999,
+		OrgId:                selectorDividendsOrderQuery.Operator.OrgId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())

@@ -244,6 +244,7 @@ type (
 		OrderGoodIds []string `json:"orderGoodIds"`
 		OrderGoodIds []string `json:"orderGoodIds"`
 	}
 	}
 
 
-	DataDividendsEstimateDividendsIncentives []struct {
+	DataDividendsEstimateDividendsIncentives struct {
+		Report string `json:"report"`
 	}
 	}
 )
 )

@@ -127,6 +127,7 @@ type (
 		CompanyId            int     `json:"companyId"`
 		CompanyId            int     `json:"companyId"`
 		CustomerName         string  `json:"customerName"`
 		CustomerName         string  `json:"customerName"`
 		DividendsOrderNumber string  `json:"dividendsOrderNumber"`
 		DividendsOrderNumber string  `json:"dividendsOrderNumber"`
+		OrgId                int64   `json:"orgId"`
 		OrgIds               []int64 `json:"orgIds"`
 		OrgIds               []int64 `json:"orgIds"`
 		PageNumber           int     `json:"pageNumber"`
 		PageNumber           int     `json:"pageNumber"`
 		PageSize             int     `json:"pageSize"`
 		PageSize             int     `json:"pageSize"`