作者 tangxuhui

接口调整

@@ -15,7 +15,8 @@ type CreateCooperationApplicationCommand struct { @@ -15,7 +15,8 @@ type CreateCooperationApplicationCommand struct {
15 // 申请人的id 15 // 申请人的id
16 //ApplicantUid int `json:"userId"` 16 //ApplicantUid int `json:"userId"`
17 // 17 //
18 - CooperationProjectNumber string `json:"cooperationProjectNumber"` 18 + CooperationProjectId int `json:"cooperationProjectId"`
  19 + // CooperationProjectNumber string `json:"cooperationProjectNumber"`
19 // 附件列表 20 // 附件列表
20 Attachment []domain.Attachment `json:"attachment"` 21 Attachment []domain.Attachment `json:"attachment"`
21 } 22 }
@@ -95,11 +95,10 @@ func (srv CooperationApplicationsService) SearchCooperationApplications(applicat @@ -95,11 +95,10 @@ func (srv CooperationApplicationsService) SearchCooperationApplications(applicat
95 func (srv CooperationApplicationsService) CreateCooperationApplications(createApplicationsCommand *command.CreateCooperationApplicationCommand) (interface{}, error) { 95 func (srv CooperationApplicationsService) CreateCooperationApplications(createApplicationsCommand *command.CreateCooperationApplicationCommand) (interface{}, error) {
96 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation( 96 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(
97 createApplicationsCommand.Operator) 97 createApplicationsCommand.Operator)
98 - result, err := creationCooperationGateway.CooperationApplicationAdd(allied_creation_cooperation.ReqCooperationApplicationAdd{  
99 - ApplicantUid: strconv.Itoa(int(createApplicationsCommand.Operator.UserId)), 98 + result, err := creationCooperationGateway.ApplyForCooperation(allied_creation_cooperation.ReqApplyForCooperation{
100 CooperationApplicationDescription: createApplicationsCommand.CooperationApplicationDescription, 99 CooperationApplicationDescription: createApplicationsCommand.CooperationApplicationDescription,
  100 + CooperationProjectId: createApplicationsCommand.CooperationProjectId,
101 CooperationApplicationAttachment: createApplicationsCommand.Attachment, 101 CooperationApplicationAttachment: createApplicationsCommand.Attachment,
102 - CooperationProjectNumber: createApplicationsCommand.CooperationProjectNumber,  
103 }) 102 })
104 if err != nil { 103 if err != nil {
105 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 104 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -412,3 +412,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationsOneclickA @@ -412,3 +412,34 @@ func (gateway HttplibAlliedCreationCooperation) CooperationApplicationsOneclickA
412 err = gateway.GetResponseData(result, &data) 412 err = gateway.GetResponseData(result, &data)
413 return &data, err 413 return &data, err
414 } 414 }
  415 +
  416 +// ApplyForCooperation 申请共创项目
  417 +func (gateway HttplibAlliedCreationCooperation) ApplyForCooperation(param ReqApplyForCooperation) (*DataApplyForCooperation, error) {
  418 + url := gateway.baseUrL + "/cooperation-applications/" + strconv.Itoa(param.CooperationProjectId) + "/apply-for-cooperation"
  419 + method := "POST"
  420 + req := gateway.CreateRequest(url, method)
  421 + log.Logger.Debug("向业务模块请求数据:创建共创申请。", map[string]interface{}{
  422 + "api": method + ":" + url,
  423 + "param": param,
  424 + })
  425 + req, err := req.JSONBody(param)
  426 + if err != nil {
  427 + return nil, fmt.Errorf("请求创建共创申请失败:%w", err)
  428 + }
  429 +
  430 + byteResult, err := req.Bytes()
  431 + if err != nil {
  432 + return nil, fmt.Errorf("获取创建共创申请失败:%w", err)
  433 + }
  434 + log.Logger.Debug("获取业务模块请求数据:创建共创申请。", map[string]interface{}{
  435 + "result": string(byteResult),
  436 + })
  437 + var result service_gateway.GatewayResponse
  438 + err = json.Unmarshal(byteResult, &result)
  439 + if err != nil {
  440 + return nil, fmt.Errorf("解析创建共创申请:%w", err)
  441 + }
  442 + var data DataApplyForCooperation
  443 + err = gateway.GetResponseData(result, &data)
  444 + return &data, err
  445 +}
@@ -233,3 +233,20 @@ type ( @@ -233,3 +233,20 @@ type (
233 DataCooperationApplicationOneclickApproval struct { 233 DataCooperationApplicationOneclickApproval struct {
234 } 234 }
235 ) 235 )
  236 +
  237 +//申请共创项目
  238 +type (
  239 + ReqApplyForCooperation struct {
  240 + // 共创申请人uid
  241 + // ApplicantUid string `json:"-" `
  242 + // 共创申请描述
  243 + CooperationApplicationDescription string ` json:"cooperationApplicationDescription"`
  244 + // 共创申请描述附件
  245 + CooperationApplicationAttachment []domain.Attachment `json:"cooperationApplicationAttachment"`
  246 + // 关联的共创项目id
  247 + CooperationProjectId int `json:"cooperationProjectId"`
  248 + }
  249 + DataApplyForCooperation struct {
  250 + CooperationApplicationId int `json:"cooperationApplicationId,string"`
  251 + }
  252 +)