allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 b8dfb7827c55cbb0009c65f2e69a1e1146cde4b0 1 个父辈 02b86edc

feat:完善共创模式增删查改功能

内嵌 并排对比
正在显示 20 个修改的文件 包含 119 行增加 和 89 行删除
@@ -14,15 +14,15 @@ type CreateCooperationModeCommand struct { @@ -14,15 +14,15 @@ type CreateCooperationModeCommand struct {
14 // 共创模式编码，手动输入，唯一确定 14 // 共创模式编码，手动输入，唯一确定
15 CooperationModeNumber string `cname:"共创模式编码，手动输入，唯一确定" json:"cooperationModeNumber" valid:"Required"` 15 CooperationModeNumber string `cname:"共创模式编码，手动输入，唯一确定" json:"cooperationModeNumber" valid:"Required"`
16 // 备注 16 // 备注
17 - Remarks string `cname:"备注" json:"remarks" valid:"Required"` 17 + Remarks string `cname:"备注" json:"remarks,omitempty"`
18 // 公司ID，通过集成REST上下文获取 18 // 公司ID，通过集成REST上下文获取
19 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 19 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
20 // 组织机构ID 20 // 组织机构ID
21 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 21 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
22 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 22 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
23 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 23 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
24 // 用户基础数据id 24 // 用户基础数据id
25 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 25 + UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string"`
26 } 26 }
27 27
28 func (createCooperationModeCommand *CreateCooperationModeCommand) Valid(validation *validation.Validation) { 28 func (createCooperationModeCommand *CreateCooperationModeCommand) Valid(validation *validation.Validation) {
@@ -18,7 +18,7 @@ type RemoveCooperationModeCommand struct { @@ -18,7 +18,7 @@ type RemoveCooperationModeCommand struct {
18 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 18 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
19 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 19 UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"`
20 // 用户基础数据id 20 // 用户基础数据id
21 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 21 + UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string"`
22 } 22 }
23 23
24 func (removeCooperationModeCommand *RemoveCooperationModeCommand) Valid(validation *validation.Validation) { 24 func (removeCooperationModeCommand *RemoveCooperationModeCommand) Valid(validation *validation.Validation) {
@@ -10,21 +10,21 @@ import ( @@ -10,21 +10,21 @@ import (
10 10
11 type UpdateCooperationModeCommand struct { 11 type UpdateCooperationModeCommand struct {
12 // 共创模式ID 12 // 共创模式ID
13 - CooperationModeId string `cname:"共创模式id" json:"cooperationModeId" valid:"Required"` 13 + CooperationModeId int64 `cname:"共创模式id" json:"cooperationModeId" valid:"Required"`
14 // 共创模式名称 14 // 共创模式名称
15 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"` 15 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"`
16 - // 共创模式编码，手动输入，唯一确定  
17 - CooperationModeNumber string `cname:"共创模式编码，手动输入，唯一确定" json:"cooperationModeNumber" valid:"Required"`  
18 // 备注 16 // 备注
19 - Remarks string `cname:"备注" json:"remarks" valid:"Required"` 17 + Remarks string `cname:"备注" json:"remarks,omitempty"`
  18 + // 共创模式状态，1启用，2禁用
  19 + Status int32 `cname:"状态" json:"status" valid:"Required"`
20 // 公司ID，通过集成REST上下文获取 20 // 公司ID，通过集成REST上下文获取
21 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 21 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 22 // 组织机构ID
23 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 23 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
24 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 24 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
25 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 25 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
26 // 用户基础数据id 26 // 用户基础数据id
27 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 27 + UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string"`
28 } 28 }
29 29
30 func (updateCooperationModeCommand *UpdateCooperationModeCommand) Valid(validation *validation.Validation) { 30 func (updateCooperationModeCommand *UpdateCooperationModeCommand) Valid(validation *validation.Validation) {
@@ -16,9 +16,9 @@ type GetCooperationModeQuery struct { @@ -16,9 +16,9 @@ type GetCooperationModeQuery struct {
16 // 组织机构ID 16 // 组织机构ID
17 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 17 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
18 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 18 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
19 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 19 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
20 // 用户基础数据id 20 // 用户基础数据id
21 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 21 + UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string"`
22 } 22 }
23 23
24 func (getCooperationModeQuery *GetCooperationModeQuery) Valid(validation *validation.Validation) { 24 func (getCooperationModeQuery *GetCooperationModeQuery) Valid(validation *validation.Validation) {
@@ -18,9 +18,9 @@ type ListCooperationModeQuery struct { @@ -18,9 +18,9 @@ type ListCooperationModeQuery struct {
18 // 组织机构ID 18 // 组织机构ID
19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 19 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 20 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
21 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 21 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
22 // 用户基础数据id 22 // 用户基础数据id
23 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 23 + UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string"`
24 } 24 }
25 25
26 func (listCooperationModeQuery *ListCooperationModeQuery) Valid(validation *validation.Validation) { 26 func (listCooperationModeQuery *ListCooperationModeQuery) Valid(validation *validation.Validation) {
@@ -10,21 +10,21 @@ import ( @@ -10,21 +10,21 @@ import (
10 10
11 type SearchCooperationModeQuery struct { 11 type SearchCooperationModeQuery struct {
12 // 页面大小 12 // 页面大小
13 - PageNumber int64 `cname:"页面大小" json:"pageNumber" valid:"Required"` 13 + PageNumber int64 `cname:"页面大小" json:"pageNumber,omitempty"`
14 // 页面大小 14 // 页面大小
15 - PageSize int64 `cname:"页面大小" json:"pageSize" valid:"Required"` 15 + PageSize int64 `cname:"页面大小" json:"pageSize,omitempty"`
16 // 共创模式名称 16 // 共创模式名称
17 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"` 17 CooperationModeName string `cname:"共创模式名称" json:"cooperationModeName" valid:"Required"`
18 // 组织机构名称 18 // 组织机构名称
19 OrganizationName string `cname:"组织机构名称" json:"organizationName,omitempty"` 19 OrganizationName string `cname:"组织机构名称" json:"organizationName,omitempty"`
20 // 公司ID，通过集成REST上下文获取 20 // 公司ID，通过集成REST上下文获取
21 - CompanyId int64 `cname:"公司ID，通过集成REST上下文获取" json:"companyId,string" valid:"Required"` 21 + CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"`
22 // 组织机构ID 22 // 组织机构ID
23 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 23 OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"`
24 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 24 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
25 - UserId int64 `cname:"用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员" json:"userId,string" valid:"Required"` 25 + UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"`
26 // 用户基础数据id 26 // 用户基础数据id
27 - UserBaseId int64 `cname:"用户基础数据is" json:"userBaseId,string" valid:"Required"` 27 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string"`
28 } 28 }
29 29
30 func (searchCooperationModeQuery *SearchCooperationModeQuery) Valid(validation *validation.Validation) { 30 func (searchCooperationModeQuery *SearchCooperationModeQuery) Valid(validation *validation.Validation) {
@@ -81,6 +81,10 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea @@ -81,6 +81,10 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea
81 organization = data 81 organization = data
82 } 82 }
83 83
  84 + //TODO 校验共创模式编码唯一性
  85 +
  86 + //TODO 校验共创模式名称唯一性
  87 +
84 newCooperationMode := &domain.CooperationMode{ 88 newCooperationMode := &domain.CooperationMode{
85 CooperationModeName: createCooperationModeCommand.CooperationModeName, 89 CooperationModeName: createCooperationModeCommand.CooperationModeName,
86 CooperationModeNumber: createCooperationModeCommand.CooperationModeNumber, 90 CooperationModeNumber: createCooperationModeCommand.CooperationModeNumber,
@@ -93,6 +97,7 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea @@ -93,6 +97,7 @@ func (cooperationModeService *CooperationModeService) CreateCooperationMode(crea
93 DeletedAt: time.Time{}, 97 DeletedAt: time.Time{},
94 CreatedAt: time.Now(), 98 CreatedAt: time.Now(),
95 } 99 }
  100 +
96 var cooperationModeRepository domain.CooperationModeRepository 101 var cooperationModeRepository domain.CooperationModeRepository
97 if value, err := factory.CreateCooperationModeRepository(map[string]interface{}{ 102 if value, err := factory.CreateCooperationModeRepository(map[string]interface{}{
98 "transactionContext": transactionContext, 103 "transactionContext": transactionContext,
@@ -60,12 +60,6 @@ func (cooperationContractRelevant *CooperationContractRelevant) Update(data map[ @@ -60,12 +60,6 @@ func (cooperationContractRelevant *CooperationContractRelevant) Update(data map[
60 if companyName, ok := data["companyName"]; ok { 60 if companyName, ok := data["companyName"]; ok {
61 cooperationContractRelevant.Relevant.Org.Company.CompanyName = companyName.(string) 61 cooperationContractRelevant.Relevant.Org.Company.CompanyName = companyName.(string)
62 } 62 }
63 - if roleId, ok := data["roleId"]; ok {  
64 - cooperationContractRelevant.Relevant.Roles.RoleId = roleId.(int64)  
65 - }  
66 - if roleName, ok := data["roleName"]; ok {  
67 - cooperationContractRelevant.Relevant.Roles.RoleName = roleName.(string)  
68 - }  
69 if userAvatar, ok := data["userAvatar"]; ok { 63 if userAvatar, ok := data["userAvatar"]; ok {
70 cooperationContractRelevant.Relevant.UserInfo.UserAvatar = userAvatar.(string) 64 cooperationContractRelevant.Relevant.UserInfo.UserAvatar = userAvatar.(string)
71 } 65 }
@@ -45,9 +45,6 @@ func (cooperationMode *CooperationMode) Identify() interface{} { @@ -45,9 +45,6 @@ func (cooperationMode *CooperationMode) Identify() interface{} {
45 } 45 }
46 46
47 func (cooperationMode *CooperationMode) Update(data map[string]interface{}) error { 47 func (cooperationMode *CooperationMode) Update(data map[string]interface{}) error {
48 - if cooperationModeNumber, ok := data["cooperationModeNumber"]; ok {  
49 - cooperationMode.CooperationModeNumber = cooperationModeNumber.(string)  
50 - }  
51 if cooperationModeName, ok := data["cooperationModeName"]; ok { 48 if cooperationModeName, ok := data["cooperationModeName"]; ok {
52 cooperationMode.CooperationModeName = cooperationModeName.(string) 49 cooperationMode.CooperationModeName = cooperationModeName.(string)
53 } 50 }
@@ -60,17 +57,5 @@ func (cooperationMode *CooperationMode) Update(data map[string]interface{}) erro @@ -60,17 +57,5 @@ func (cooperationMode *CooperationMode) Update(data map[string]interface{}) erro
60 if userId, ok := data["userId"]; ok { 57 if userId, ok := data["userId"]; ok {
61 cooperationMode.Operator.UserId = userId.(int64) 58 cooperationMode.Operator.UserId = userId.(int64)
62 } 59 }
63 - if userBaseId, ok := data["userBaseId"]; ok {  
64 - cooperationMode.Operator.UserBaseId = userBaseId.(int64)  
65 - }  
66 - if orgs, ok := data["orgs"]; ok {  
67 - cooperationMode.Operator.Orgs = orgs.([]*Org)  
68 - }  
69 - if roleId, ok := data["roleId"]; ok {  
70 - cooperationMode.Operator.Role.RoleId = roleId.(int64)  
71 - }  
72 - if roleName, ok := data["roleName"]; ok {  
73 - cooperationMode.Operator.Role.RoleName = roleName.(string)  
74 - }  
75 return nil 60 return nil
76 } 61 }
@@ -4,6 +4,7 @@ import ( @@ -4,6 +4,7 @@ import (
4 "encoding/json" 4 "encoding/json"
5 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain" 5 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/service_gateway/adaptor" 6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/service_gateway/adaptor"
  7 + "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/log"
7 ) 8 )
8 9
9 type UserService struct { 10 type UserService struct {
@@ -119,10 +120,20 @@ func (service *UserService) OperatorFrom(companyId int64, orgId int64, userId in @@ -119,10 +120,20 @@ func (service *UserService) OperatorFrom(companyId int64, orgId int64, userId in
119 return nil, err 120 return nil, err
120 } else { 121 } else {
121 if operator != nil { 122 if operator != nil {
122 - err := json.Unmarshal(operator.([]byte), returnData)  
123 - if err != nil { 123 + log.Logger.Debug("操作人", map[string]interface{}{
  124 + "operator interface": operator,
  125 + })
  126 + operatorJson, err1 := json.Marshal(operator)
  127 + if err1 != nil {
124 return nil, err 128 return nil, err
125 } 129 }
  130 + log.Logger.Debug("操作人", map[string]interface{}{
  131 + "operator json": operatorJson,
  132 + })
  133 + err2 := json.Unmarshal(operatorJson, &returnData)
  134 + if err2 != nil {
  135 + return nil, err2
  136 + }
126 } 137 }
127 return returnData, nil 138 return returnData, nil
128 } 139 }
@@ -22,7 +22,7 @@ type CooperationContractRelevant struct { @@ -22,7 +22,7 @@ type CooperationContractRelevant struct {
22 //合约人所属部门 22 //合约人所属部门
23 Department *domain.Department `comment:"合约人所属部门"` 23 Department *domain.Department `comment:"合约人所属部门"`
24 //合约人角色 24 //合约人角色
25 - Role *domain.Role `comment:"合约人角色"` 25 + Roles []*domain.Role `comment:"合约人角色"`
26 //合约人用户信息 26 //合约人用户信息
27 UserInfo *domain.UserInfo `comment:"合约人用户信息"` 27 UserInfo *domain.UserInfo `comment:"合约人用户信息"`
28 //合约人用户类型 28 //合约人用户类型
@@ -60,7 +60,7 @@ func TransformToCooperationContractDomainModelFromPgModels( @@ -60,7 +60,7 @@ func TransformToCooperationContractDomainModelFromPgModels(
60 Org: relevant.Org, 60 Org: relevant.Org,
61 Orgs: relevant.Orgs, 61 Orgs: relevant.Orgs,
62 Department: relevant.Department, 62 Department: relevant.Department,
63 - Roles: relevant.Role, 63 + Roles: relevant.Roles,
64 UserInfo: relevant.UserInfo, 64 UserInfo: relevant.UserInfo,
65 UserType: relevant.UserType, 65 UserType: relevant.UserType,
66 Status: relevant.Status, 66 Status: relevant.Status,
@@ -17,7 +17,7 @@ func TransformToCooperationContractRelevantDomainModelFromPgModels(cooperationCo @@ -17,7 +17,7 @@ func TransformToCooperationContractRelevantDomainModelFromPgModels(cooperationCo
17 Org: cooperationContractRelevantModel.Org, 17 Org: cooperationContractRelevantModel.Org,
18 Orgs: cooperationContractRelevantModel.Orgs, 18 Orgs: cooperationContractRelevantModel.Orgs,
19 Department: cooperationContractRelevantModel.Department, 19 Department: cooperationContractRelevantModel.Department,
20 - Roles: cooperationContractRelevantModel.Role, 20 + Roles: cooperationContractRelevantModel.Roles,
21 UserInfo: cooperationContractRelevantModel.UserInfo, 21 UserInfo: cooperationContractRelevantModel.UserInfo,
22 UserType: cooperationContractRelevantModel.UserType, 22 UserType: cooperationContractRelevantModel.UserType,
23 Status: cooperationContractRelevantModel.Status, 23 Status: cooperationContractRelevantModel.Status,
@@ -106,7 +106,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -106,7 +106,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
106 Org: relevant.Org, 106 Org: relevant.Org,
107 Orgs: relevant.Orgs, 107 Orgs: relevant.Orgs,
108 Department: relevant.Department, 108 Department: relevant.Department,
109 - Role: relevant.Roles, 109 + Roles: relevant.Roles,
110 UserInfo: relevant.UserInfo, 110 UserInfo: relevant.UserInfo,
111 UserType: relevant.UserType, 111 UserType: relevant.UserType,
112 Status: relevant.Status, 112 Status: relevant.Status,
@@ -267,7 +267,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -267,7 +267,7 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
267 Org: relevantDomain.Org, 267 Org: relevantDomain.Org,
268 Orgs: relevantDomain.Orgs, 268 Orgs: relevantDomain.Orgs,
269 Department: relevantDomain.Department, 269 Department: relevantDomain.Department,
270 - Role: relevantDomain.Roles, 270 + Roles: relevantDomain.Roles,
271 UserInfo: relevantDomain.UserInfo, 271 UserInfo: relevantDomain.UserInfo,
272 UserType: relevantDomain.UserType, 272 UserType: relevantDomain.UserType,
273 Status: relevantDomain.Status, 273 Status: relevantDomain.Status,
@@ -24,6 +24,7 @@ func (repository *CooperationModeRepository) nextIdentify() (int64, error) { @@ -24,6 +24,7 @@ func (repository *CooperationModeRepository) nextIdentify() (int64, error) {
24 id, err := IdWorker.NextId() 24 id, err := IdWorker.NextId()
25 return id, err 25 return id, err
26 } 26 }
  27 +
27 func (repository *CooperationModeRepository) Save(cooperationMode *domain.CooperationMode) (*domain.CooperationMode, error) { 28 func (repository *CooperationModeRepository) Save(cooperationMode *domain.CooperationMode) (*domain.CooperationMode, error) {
28 sqlBuildFields := []string{ 29 sqlBuildFields := []string{
29 "cooperation_mode_id", 30 "cooperation_mode_id",
@@ -78,7 +79,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper @@ -78,7 +79,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper
78 cooperationMode.Operator, 79 cooperationMode.Operator,
79 cooperationMode.OperateTime, 80 cooperationMode.OperateTime,
80 cooperationMode.UpdatedAt, 81 cooperationMode.UpdatedAt,
81 - cooperationMode.DeletedAt, 82 + nil,
82 cooperationMode.CreatedAt, 83 cooperationMode.CreatedAt,
83 ); err != nil { 84 ); err != nil {
84 return cooperationMode, err 85 return cooperationMode, err
@@ -110,7 +111,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper @@ -110,7 +111,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper
110 cooperationMode.Operator, 111 cooperationMode.Operator,
111 cooperationMode.OperateTime, 112 cooperationMode.OperateTime,
112 cooperationMode.UpdatedAt, 113 cooperationMode.UpdatedAt,
113 - cooperationMode.DeletedAt, 114 + nil,
114 cooperationMode.CreatedAt, 115 cooperationMode.CreatedAt,
115 cooperationMode.Identify(), 116 cooperationMode.Identify(),
116 ); err != nil { 117 ); err != nil {
@@ -119,6 +120,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper @@ -119,6 +120,7 @@ func (repository *CooperationModeRepository) Save(cooperationMode *domain.Cooper
119 } 120 }
120 return cooperationMode, nil 121 return cooperationMode, nil
121 } 122 }
  123 +
122 func (repository *CooperationModeRepository) Remove(cooperationMode *domain.CooperationMode) (*domain.CooperationMode, error) { 124 func (repository *CooperationModeRepository) Remove(cooperationMode *domain.CooperationMode) (*domain.CooperationMode, error) {
123 tx := repository.transactionContext.PgTx 125 tx := repository.transactionContext.PgTx
124 cooperationModeModel := new(models.CooperationMode) 126 cooperationModeModel := new(models.CooperationMode)
@@ -128,6 +130,7 @@ func (repository *CooperationModeRepository) Remove(cooperationMode *domain.Coop @@ -128,6 +130,7 @@ func (repository *CooperationModeRepository) Remove(cooperationMode *domain.Coop
128 } 130 }
129 return cooperationMode, nil 131 return cooperationMode, nil
130 } 132 }
  133 +
131 func (repository *CooperationModeRepository) FindOne(queryOptions map[string]interface{}) (*domain.CooperationMode, error) { 134 func (repository *CooperationModeRepository) FindOne(queryOptions map[string]interface{}) (*domain.CooperationMode, error) {
132 tx := repository.transactionContext.PgTx 135 tx := repository.transactionContext.PgTx
133 cooperationModeModel := new(models.CooperationMode) 136 cooperationModeModel := new(models.CooperationMode)
@@ -146,6 +149,7 @@ func (repository *CooperationModeRepository) FindOne(queryOptions map[string]int @@ -146,6 +149,7 @@ func (repository *CooperationModeRepository) FindOne(queryOptions map[string]int
146 return transform.TransformToCooperationModeDomainModelFromPgModels(cooperationModeModel) 149 return transform.TransformToCooperationModeDomainModelFromPgModels(cooperationModeModel)
147 } 150 }
148 } 151 }
  152 +
149 func (repository *CooperationModeRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.CooperationMode, error) { 153 func (repository *CooperationModeRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.CooperationMode, error) {
150 tx := repository.transactionContext.PgTx 154 tx := repository.transactionContext.PgTx
151 var cooperationModeModels []*models.CooperationMode 155 var cooperationModeModels []*models.CooperationMode
@@ -166,6 +170,7 @@ func (repository *CooperationModeRepository) Find(queryOptions map[string]interf @@ -166,6 +170,7 @@ func (repository *CooperationModeRepository) Find(queryOptions map[string]interf
166 return int64(count), cooperationModes, nil 170 return int64(count), cooperationModes, nil
167 } 171 }
168 } 172 }
  173 +
169 func NewCooperationModeRepository(transactionContext *pgTransaction.TransactionContext) (*CooperationModeRepository, error) { 174 func NewCooperationModeRepository(transactionContext *pgTransaction.TransactionContext) (*CooperationModeRepository, error) {
170 if transactionContext == nil { 175 if transactionContext == nil {
171 return nil, fmt.Errorf("transactionContext参数不能为nil") 176 return nil, fmt.Errorf("transactionContext参数不能为nil")
@@ -70,7 +70,7 @@ func (serviceGateway *HttplibUserServiceGateway) GetUsers(companyId int64, orgId @@ -70,7 +70,7 @@ func (serviceGateway *HttplibUserServiceGateway) GetUsers(companyId int64, orgId
70 } 70 }
71 71
72 // GetCompany 获取公司信息 72 // GetCompany 获取公司信息
73 -func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (map[string]interface{}, error) { 73 +func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (*translator.CompanyDetail, error) {
74 companyIdStr := strconv.FormatInt(companyId, 10) 74 companyIdStr := strconv.FormatInt(companyId, 10)
75 url := serviceGateway.baseURL + "/company/" + companyIdStr 75 url := serviceGateway.baseURL + "/company/" + companyIdStr
76 request := serviceGateway.createRequest(url, "get") 76 request := serviceGateway.createRequest(url, "get")
@@ -84,15 +84,29 @@ func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (ma @@ -84,15 +84,29 @@ func (serviceGateway *HttplibUserServiceGateway) GetCompany(companyId int64) (ma
84 "param": options, 84 "param": options,
85 }) 85 })
86 } 86 }
87 -  
88 - response := make(map[string]interface{})  
89 - err2 := request.ToJSON(&response)  
90 - if err2 != nil {  
91 - return nil, err2 87 + //response := make(map[string]interface{})
  88 + //err2 := request.ToJSON(&response)
  89 + //if err2 != nil {
  90 + // return nil, err2
  91 + //}
  92 + //
  93 + //data, err := serviceGateway.responseHandle(response)
  94 + //return data, err
  95 + byteResult, err := request.Bytes()
  96 + if err != nil {
  97 + return nil, fmt.Errorf("获取返回企业失败：%w", err)
92 } 98 }
93 -  
94 - data, err := serviceGateway.responseHandle(response)  
95 - return data, err 99 + log.Logger.Debug("获取用户模块请求数据：返回企业。", map[string]interface{}{
  100 + "result": string(byteResult),
  101 + })
  102 + var result GatewayResponse
  103 + err = json.Unmarshal(byteResult, &result)
  104 + if err != nil {
  105 + return nil, fmt.Errorf("解析返回企业：%w", err)
  106 + }
  107 + var data translator.CompanyDetail
  108 + err = serviceGateway.getResponseData(result, &data)
  109 + return &data, err
96 } 110 }
97 111
98 // GetDepartment 获取部门信息 112 // GetDepartment 获取部门信息
@@ -116,23 +130,37 @@ func (serviceGateway *HttplibUserServiceGateway) GetDepartment(companyId int64, @@ -116,23 +130,37 @@ func (serviceGateway *HttplibUserServiceGateway) GetDepartment(companyId int64,
116 } 130 }
117 131
118 // GetOrganization 获取组织信息 132 // GetOrganization 获取组织信息
119 -func (serviceGateway *HttplibUserServiceGateway) GetOrganization(companyId int64, organizationId int64) (map[string]interface{}, error) { 133 +func (serviceGateway *HttplibUserServiceGateway) GetOrganization(companyId int64, organizationId int64) (*translator.OrganizationDetail, error) {
120 organizationIdStr := strconv.FormatInt(organizationId, 10) 134 organizationIdStr := strconv.FormatInt(organizationId, 10)
121 url := serviceGateway.baseURL + "/org/" + organizationIdStr 135 url := serviceGateway.baseURL + "/org/" + organizationIdStr
122 request := serviceGateway.createRequest(url, "get") 136 request := serviceGateway.createRequest(url, "get")
123 options := make(map[string]interface{}) 137 options := make(map[string]interface{})
124 - options["orgId"] = organizationId  
125 _, err1 := request.JSONBody(options) 138 _, err1 := request.JSONBody(options)
126 if err1 != nil { 139 if err1 != nil {
127 return nil, err1 140 return nil, err1
128 } 141 }
129 - response := make(map[string]interface{})  
130 - err2 := request.ToJSON(&response)  
131 - if err2 != nil {  
132 - return nil, err2 142 + //response := make(map[string]interface{})
  143 + //err2 := request.ToJSON(&response)
  144 + //if err2 != nil {
  145 + // return nil, err2
  146 + //}
  147 + //data, err := serviceGateway.responseHandle(response)
  148 + //return data, err
  149 + byteResult, err := request.Bytes()
  150 + if err != nil {
  151 + return nil, fmt.Errorf("获取返回组织失败：%w", err)
133 } 152 }
134 - data, err := serviceGateway.responseHandle(response)  
135 - return data, err 153 + log.Logger.Debug("获取用户模块请求数据：返回组织。", map[string]interface{}{
  154 + "result": string(byteResult),
  155 + })
  156 + var result GatewayResponse
  157 + err = json.Unmarshal(byteResult, &result)
  158 + if err != nil {
  159 + return nil, fmt.Errorf("解析返回组织：%w", err)
  160 + }
  161 + var data translator.OrganizationDetail
  162 + err = serviceGateway.getResponseData(result, &data)
  163 + return &data, err
136 } 164 }
137 165
138 // UserInMenu 判断用户是否具有模块权限 166 // UserInMenu 判断用户是否具有模块权限
1 package service_gateway 1 package service_gateway
2 2
  3 +import "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/service_gateway/translator"
  4 +
3 type UserServiceGateway interface { 5 type UserServiceGateway interface {
4 - GetUser(companyId int64, orgId int64, uid int64) (map[string]interface{}, error) 6 + GetUser(companyId int64, orgId int64, uid int64) (*translator.UserDetail, error)
5 GetUsers(companyId int64, orgId int64, uids []int64) (map[string]interface{}, error) 7 GetUsers(companyId int64, orgId int64, uids []int64) (map[string]interface{}, error)
6 - GetCompany(companyId int64) (map[string]interface{}, error)  
7 - GetOrganization(companyId int64, organizationId int64) (map[string]interface{}, error) 8 + GetCompany(companyId int64) (*translator.CompanyDetail, error)
  9 + GetOrganization(companyId int64, organizationId int64) (*translator.OrganizationDetail, error)
8 GetDepartment(companyId int64, departmentId int64) (map[string]interface{}, error) 10 GetDepartment(companyId int64, departmentId int64) (map[string]interface{}, error)
9 UserInMenu(companyId int64, userId int64, menuCode string) (bool, error) 11 UserInMenu(companyId int64, userId int64, menuCode string) (bool, error)
10 UserInOrganization(companyId int64, orgId int64, userId int64) (bool, error) 12 UserInOrganization(companyId int64, orgId int64, userId int64) (bool, error)
@@ -18,8 +18,8 @@ type OrganizationDetail struct { @@ -18,8 +18,8 @@ type OrganizationDetail struct {
18 OrgName string `json:"orgName"` 18 OrgName string `json:"orgName"`
19 Ext struct { 19 Ext struct {
20 } `json:"ext"` 20 } `json:"ext"`
21 - IsOrg bool `json:"isOrg"`  
22 - OrgStatus int `json:"orgStatus"` 21 + IsOrg int `json:"isOrg"`
  22 + OrgStatus int `json:"orgStatus"`
23 } 23 }
24 24
25 func (translator *OrganizationTranslator) ToOrganizationFromRepresentation(organization *OrganizationDetail) (*domain.Org, error) { 25 func (translator *OrganizationTranslator) ToOrganizationFromRepresentation(organization *OrganizationDetail) (*domain.Org, error) {
@@ -115,10 +115,10 @@ func (translator *UserTranslator) ToRelevantFromRepresentation(user *UserDetail) @@ -115,10 +115,10 @@ func (translator *UserTranslator) ToRelevantFromRepresentation(user *UserDetail)
115 }, nil 115 }, nil
116 } 116 }
117 117
118 -func (translator *UserTranslator) ToReferrerFromRepresentation(data map[string]interface{}) (*domain.Referrer, error) { 118 +func (translator *UserTranslator) ToReferrerFromRepresentation(user *UserDetail) (*domain.Referrer, error) {
119 return &domain.Referrer{ 119 return &domain.Referrer{
120 - UserId: data["userId"].(int64),  
121 - UserBaseId: data["userBaseId"].(int64), 120 + UserId: user.UserId,
  121 + UserBaseId: user.UserBaseId,
122 Role: nil, 122 Role: nil,
123 Orgs: nil, 123 Orgs: nil,
124 Org: nil, 124 Org: nil,
@@ -129,10 +129,10 @@ func (translator *UserTranslator) ToReferrerFromRepresentation(data map[string]i @@ -129,10 +129,10 @@ func (translator *UserTranslator) ToReferrerFromRepresentation(data map[string]i
129 }, nil 129 }, nil
130 } 130 }
131 131
132 -func (translator *UserTranslator) ToUndertakerFromRepresentation(data map[string]interface{}) (*domain.Undertaker, error) { 132 +func (translator *UserTranslator) ToUndertakerFromRepresentation(user *UserDetail) (*domain.Undertaker, error) {
133 return &domain.Undertaker{ 133 return &domain.Undertaker{
134 - UserId: data["userId"].(int64),  
135 - UserBaseId: data["userBaseId"].(int64), 134 + UserId: user.UserId,
  135 + UserBaseId: user.UserBaseId,
136 Org: nil, 136 Org: nil,
137 Orgs: nil, 137 Orgs: nil,
138 Department: nil, 138 Department: nil,
@@ -145,10 +145,10 @@ func (translator *UserTranslator) ToUndertakerFromRepresentation(data map[string @@ -145,10 +145,10 @@ func (translator *UserTranslator) ToUndertakerFromRepresentation(data map[string
145 }, nil 145 }, nil
146 } 146 }
147 147
148 -func (translator *UserTranslator) ToSalesmanFromRepresentation(data map[string]interface{}) (*domain.Salesman, error) { 148 +func (translator *UserTranslator) ToSalesmanFromRepresentation(user *UserDetail) (*domain.Salesman, error) {
149 return &domain.Salesman{ 149 return &domain.Salesman{
150 - UserId: data["userId"].(int64),  
151 - UserBaseId: data["userBaseId"].(int64), 150 + UserId: user.UserId,
  151 + UserBaseId: user.UserBaseId,
152 Role: nil, 152 Role: nil,
153 Orgs: nil, 153 Orgs: nil,
154 Org: nil, 154 Org: nil,
@@ -159,10 +159,10 @@ func (translator *UserTranslator) ToSalesmanFromRepresentation(data map[string]i @@ -159,10 +159,10 @@ func (translator *UserTranslator) ToSalesmanFromRepresentation(data map[string]i
159 }, nil 159 }, nil
160 } 160 }
161 161
162 -func (translator *UserTranslator) ToOperatorFromRepresentation(data map[string]interface{}) (*domain.User, error) { 162 +func (translator *UserTranslator) ToOperatorFromRepresentation(user *UserDetail) (*domain.User, error) {
163 return &domain.User{ 163 return &domain.User{
164 - UserId: data["userId"].(int64),  
165 - UserBaseId: data["userBaseId"].(int64), 164 + UserId: user.UserId,
  165 + UserBaseId: user.UserBaseId,
166 Org: nil, 166 Org: nil,
167 Orgs: nil, 167 Orgs: nil,
168 Department: nil, 168 Department: nil,
@@ -174,10 +174,10 @@ func (translator *UserTranslator) ToOperatorFromRepresentation(data map[string]i @@ -174,10 +174,10 @@ func (translator *UserTranslator) ToOperatorFromRepresentation(data map[string]i
174 }, nil 174 }, nil
175 } 175 }
176 176
177 -func (translator *UserTranslator) ToUserFromRepresentation(data map[string]interface{}) (*domain.User, error) { 177 +func (translator *UserTranslator) ToUserFromRepresentation(user *UserDetail) (*domain.User, error) {
178 return &domain.User{ 178 return &domain.User{
179 - UserId: data["userId"].(int64),  
180 - UserBaseId: data["userBaseId"].(int64), 179 + UserId: user.UserId,
  180 + UserBaseId: user.UserBaseId,
181 Org: nil, 181 Org: nil,
182 Orgs: nil, 182 Orgs: nil,
183 Department: nil, 183 Department: nil,
@@ -34,7 +34,7 @@ func (controller *CooperationModeController) UpdateCooperationMode() { @@ -34,7 +34,7 @@ func (controller *CooperationModeController) UpdateCooperationMode() {
34 updateCooperationModeCommand.OrgId = header.OrgId 34 updateCooperationModeCommand.OrgId = header.OrgId
35 updateCooperationModeCommand.UserId = header.UserId 35 updateCooperationModeCommand.UserId = header.UserId
36 updateCooperationModeCommand.UserBaseId = header.UserBaseId 36 updateCooperationModeCommand.UserBaseId = header.UserBaseId
37 - cooperationModeId := controller.GetString(":cooperationModeId") 37 + cooperationModeId, _ := controller.GetInt64(":cooperationModeId")
38 updateCooperationModeCommand.CooperationModeId = cooperationModeId 38 updateCooperationModeCommand.CooperationModeId = cooperationModeId
39 data, err := cooperationModeService.UpdateCooperationMode(updateCooperationModeCommand) 39 data, err := cooperationModeService.UpdateCooperationMode(updateCooperationModeCommand)
40 controller.Response(data, err) 40 controller.Response(data, err)