切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Your Name
3 years ago
提交
9cc7a4f613480459ba08181beafbacab22d87f7d
1 个父辈
3eda76f9
调整 根据项目编码获取详情 需要的条件
隐藏空白字符变更
内嵌
并排对比
正在显示
10 个修改的文件
包含
26 行增加
和
45 行删除
pkg/application/web/cooperationProject/query/get_cooperation_project.go
pkg/application/web/cooperationProject/service/cooperation_project.go
pkg/application/web/dividendsOrder/query/get_dividends_order.go
pkg/application/web/dividendsOrder/service/dividends_order.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_cooperation_project.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_dividends_order.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_dividends_order.go
pkg/port/beego/controllers/web_client/cooperation_project_controller.go
pkg/port/beego/controllers/web_client/dividends_order_controller.go
pkg/application/web/cooperationProject/query/get_cooperation_project.go
查看文件 @
9cc7a4f
package
query
import
(
"fmt"
"github.com/beego/beego/v2/core/validation"
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
)
...
...
@@ -11,24 +8,7 @@ type GetCooperationProjectQuery struct {
//操作人
Operator
domain
.
Operator
`json:"-"`
// 共创项目ID
CooperationProjectId
int
`json:"cooperationProjectId"`
CooperationProjectNumber
string
`json:"cooperationProjectNumber"`
}
func
(
getCooperationProjectQuery
*
GetCooperationProjectQuery
)
Valid
(
validation
*
validation
.
Validation
)
{
}
func
(
getCooperationProjectQuery
*
GetCooperationProjectQuery
)
ValidateQuery
()
error
{
valid
:=
validation
.
Validation
{}
b
,
err
:=
valid
.
Valid
(
getCooperationProjectQuery
)
if
err
!=
nil
{
return
err
}
if
!
b
{
for
_
,
validErr
:=
range
valid
.
Errors
{
return
fmt
.
Errorf
(
"%s %s"
,
validErr
.
Key
,
validErr
.
Message
)
}
}
return
nil
CooperationProjectId
int
`json:"-"`
CooperationProjectNumber
string
`json:"-"`
OrgId
int
`json:"-"`
}
...
...
pkg/application/web/cooperationProject/service/cooperation_project.go
查看文件 @
9cc7a4f
...
...
@@ -63,6 +63,8 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
resultProject
,
err
:=
creationCooperationGateway
.
CooperationProjectGet
(
allied_creation_cooperation
.
ReqCooperationProjectGet
{
CooperationProjectId
:
getCooperationProjectQuery
.
CooperationProjectId
,
CooperationProjectNumber
:
getCooperationProjectQuery
.
CooperationProjectNumber
,
OrgId
:
getCooperationProjectQuery
.
OrgId
,
CompanyId
:
int
(
getCooperationProjectQuery
.
Operator
.
CompanyId
),
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
@@ -72,6 +74,7 @@ func (cooperationProjectService *CooperationProjectService) GetCooperationProjec
PageNumber
:
0
,
PageSize
:
0
,
CompanyId
:
resultProject
.
Company
.
CompanyId
,
OrgId
:
int64
(
resultProject
.
Org
.
OrgId
),
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
pkg/application/web/dividendsOrder/query/get_dividends_order.go
查看文件 @
9cc7a4f
...
...
@@ -8,24 +8,7 @@ type GetDividendsOrderQuery struct {
//操作人
Operator
domain
.
Operator
`json:"-"`
// 分红订单ID
DividendsOrderId
int
`json:"dividendsOrderId,string" valid:"Required"`
DividendsOrderNumber
string
`json:"dividendsOrderNumber"`
DividendsOrderId
int
`json:"-" `
DividendsOrderNumber
string
`json:"-"`
OrgId
int
`json:"-"`
}
// func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) {
// }
// func (getDividendsOrderQuery *GetDividendsOrderQuery) ValidateQuery() error {
// valid := validation.Validation{}
// b, err := valid.Valid(getDividendsOrderQuery)
// if err != nil {
// return err
// }
// if !b {
// for _, validErr := range valid.Errors {
// return fmt.Errorf("%s %s", validErr.Key, validErr.Message)
// }
// }
// return nil
// }
...
...
pkg/application/web/dividendsOrder/service/dividends_order.go
查看文件 @
9cc7a4f
...
...
@@ -57,6 +57,8 @@ func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividen
result
,
err
:=
creationCooperationGateway
.
DividendsOrderGet
(
allied_creation_cooperation
.
ReqDividendsOrderGet
{
DividendsOrderId
:
getDividendsOrderQuery
.
DividendsOrderId
,
DividendsOrderNumber
:
getDividendsOrderQuery
.
DividendsOrderNumber
,
OrgId
:
getDividendsOrderQuery
.
OrgId
,
CompanyId
:
int
(
getDividendsOrderQuery
.
Operator
.
CompanyId
),
})
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
TRANSACTION_ERROR
,
err
.
Error
())
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_cooperation_project.go
查看文件 @
9cc7a4f
...
...
@@ -78,7 +78,10 @@ func (gateway HttplibAlliedCreationCooperation) CooperationProjectGet(param ReqC
req
:=
gateway
.
CreateRequest
(
url
,
method
)
if
len
(
param
.
CooperationProjectNumber
)
>
0
{
req
.
Param
(
"cooperationProjectNumber"
,
param
.
CooperationProjectNumber
)
req
.
Param
(
"orgId"
,
strconv
.
Itoa
(
param
.
OrgId
))
req
.
Param
(
"companyId"
,
strconv
.
Itoa
(
param
.
CompanyId
))
}
log
.
Logger
.
Debug
(
"向业务模块请求数据:返回共创项目详情。"
,
map
[
string
]
interface
{}{
"api"
:
method
+
":"
+
url
,
"param"
:
param
,
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/module_dividends_order.go
查看文件 @
9cc7a4f
...
...
@@ -205,6 +205,8 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid
req
:=
gateway
.
CreateRequest
(
url
,
method
)
if
len
(
param
.
DividendsOrderNumber
)
>
0
{
req
.
Param
(
"dividendsOrderNumber"
,
param
.
DividendsOrderNumber
)
req
.
Param
(
"orgId"
,
strconv
.
Itoa
(
param
.
OrgId
))
req
.
Param
(
"companyId"
,
strconv
.
Itoa
(
param
.
CompanyId
))
}
fmt
.
Printf
(
"=========>param %+v"
,
param
)
log
.
Logger
.
Debug
(
"向业务模块请求数据:返回分红订单详情。"
,
map
[
string
]
interface
{}{
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_cooperation_project.go
查看文件 @
9cc7a4f
...
...
@@ -118,6 +118,8 @@ type (
ReqCooperationProjectGet
struct
{
CooperationProjectId
int
CooperationProjectNumber
string
OrgId
int
CompanyId
int
}
DataCooperationProjectGet
struct
{
...
...
pkg/infrastructure/service_gateway/allied_creation_cooperation/param_dividends_order.go
查看文件 @
9cc7a4f
...
...
@@ -173,8 +173,10 @@ type (
//返回分红订单详情
type
(
ReqDividendsOrderGet
struct
{
DividendsOrderId
int
`json:"dividendsOrderId"`
DividendsOrderNumber
string
`json:"dividendsOrderNumber"`
DividendsOrderId
int
DividendsOrderNumber
string
OrgId
int
CompanyId
int
}
DataDividendsOrderGet
struct
{
...
...
pkg/port/beego/controllers/web_client/cooperation_project_controller.go
查看文件 @
9cc7a4f
...
...
@@ -46,8 +46,10 @@ func (controller *CooperationProjectController) GetCooperationProject() {
getCooperationProjectQuery
:=
&
query
.
GetCooperationProjectQuery
{}
projectId
,
_
:=
controller
.
GetInt
(
":projectId"
)
projectNumber
:=
controller
.
GetString
(
"cooperationProjectNumber"
)
orgId
,
_
:=
controller
.
GetInt
(
"orgId"
)
getCooperationProjectQuery
.
CooperationProjectId
=
projectId
getCooperationProjectQuery
.
CooperationProjectNumber
=
projectNumber
getCooperationProjectQuery
.
OrgId
=
orgId
getCooperationProjectQuery
.
Operator
=
controller
.
GetOperator
()
data
,
err
:=
cooperationProjectService
.
GetCooperationProject
(
getCooperationProjectQuery
)
controller
.
Response
(
data
,
err
)
...
...
pkg/port/beego/controllers/web_client/dividends_order_controller.go
查看文件 @
9cc7a4f
...
...
@@ -61,7 +61,9 @@ func (controller *DividendsOrderController) GetDividendsOrder() {
getDividendsOrderQuery
:=
&
query
.
GetDividendsOrderQuery
{}
orderId
,
_
:=
controller
.
GetInt
(
":orderId"
)
dividendsOrderNumber
:=
controller
.
GetString
(
"dividendsOrderNumber"
)
orgId
,
_
:=
controller
.
GetInt
(
"orgId"
)
getDividendsOrderQuery
.
DividendsOrderId
=
orderId
getDividendsOrderQuery
.
OrgId
=
orgId
getDividendsOrderQuery
.
DividendsOrderNumber
=
dividendsOrderNumber
getDividendsOrderQuery
.
Operator
=
controller
.
GetOperator
()
data
,
err
:=
dividendsOrderService
.
GetDividendsOrder
(
getDividendsOrderQuery
)
...
...
请
注册
或
登录
后发表评论