作者 tangxuhui

调整关联共创合约下拉选择列表 数据过滤条件

... ... @@ -234,8 +234,8 @@ func (cooperationContractService *CooperationContractService) RemoveCooperationC
return removeCooperationContractCommand, nil
}
// 返回共创合约下拉选择列表表
func (cooperationContractService *CooperationContractService) ListCooperationContractSelector(
// 分红单,分红退货单 返回共创合约下拉选择列表
func (cooperationContractService *CooperationContractService) ContractSelectorForDividendsOrder(
listCooperationContractQuery *query.ListContractSelectorQuery) (int, interface{}, error) {
creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(listCooperationContractQuery.Operator)
result, err := creationCooperationGateway.CooperationContractSearch(allied_creation_cooperation.ReqCooperationContractSearch{
... ... @@ -244,6 +244,7 @@ func (cooperationContractService *CooperationContractService) ListCooperationCon
SponsorName: listCooperationContractQuery.SponsorName,
CooperationContractNumber: listCooperationContractQuery.CooperationContractNumber,
OrgId: listCooperationContractQuery.Operator.OrgId,
IncentivesType: 1,
})
if err != nil {
return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
... ...
... ... @@ -237,6 +237,7 @@ type (
UserBaseId int64 `json:"userBaseId"`
// 组织机构ID
OrgIds []int64 ` json:"orgIds"`
IncentivesType int `json:"incentivesType"` //作为合约激励方式的判断,1业绩分红激励,2金额激励
}
DataCooperationContractSearch struct {
... ...
... ... @@ -108,7 +108,7 @@ func (controller *CooperationContractController) RemoveCooperationContract() {
}
//分红订单,分红退货单获取关联合约选择列表
func (controller *CooperationContractController) SelectorContract() {
func (controller *CooperationContractController) SelectorContractForDividendsOrder() {
cooperationContractService := service.NewCooperationContractService(nil)
listCooperationContractQuery := &query.ListContractSelectorQuery{}
err := controller.Unmarshal(listCooperationContractQuery)
... ... @@ -118,6 +118,6 @@ func (controller *CooperationContractController) SelectorContract() {
return
}
listCooperationContractQuery.Operator = controller.GetOperator()
cnt, data, err := cooperationContractService.ListCooperationContractSelector(listCooperationContractQuery)
cnt, data, err := cooperationContractService.ContractSelectorForDividendsOrder(listCooperationContractQuery)
controller.ReturnPageListData(int64(cnt), data, err, listCooperationContractQuery.PageNumber)
}
... ...
... ... @@ -11,5 +11,5 @@ func init() {
web.Router("/v1/web/dividends-order/remove", &web_client.DividendsOrderController{}, "Post:RemoveDividendsOrder")
web.Router("/v1/web/dividends-order/:orderId", &web_client.DividendsOrderController{}, "Get:GetDividendsOrder")
web.Router("/v1/web/dividends-order/search", &web_client.DividendsOrderController{}, "Post:SearchDividendsOrder")
web.Router("/v1/web/dividends-order/selector/contract", &web_client.CooperationContractController{}, "Post:SelectorContract")
web.Router("/v1/web/dividends-order/selector/contract", &web_client.CooperationContractController{}, "Post:SelectorContractForDividendsOrder")
}
... ...