allied-creation / allied-creation-basic · 提交

转到一个项目

作者 tangxuhui
提交 a697fb45c3e20a18b71cf0205e496333d5509db1 1 个父辈 752c31cf

添加消息字段 msg_type,新增消息类型

内嵌 并排对比
正在显示 3 个修改的文件 包含 56 行增加 和 8 行删除
@@ -74,6 +74,10 @@ func (noticePersonalService *NoticePersonalService) AgreeJoinCreationProject(agr @@ -74,6 +74,10 @@ func (noticePersonalService *NoticePersonalService) AgreeJoinCreationProject(agr
74 extendData := map[string]interface{}{ 74 extendData := map[string]interface{}{
75 "creationProjectId": agreeJoinCreationProjectCommand.CreationProjectId, 75 "creationProjectId": agreeJoinCreationProjectCommand.CreationProjectId,
76 } 76 }
  77 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  78 + if err != nil {
  79 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  80 + }
77 extendStr, _ := json.Marshal(extendData) 81 extendStr, _ := json.Marshal(extendData)
78 noticePersonal := domain.NoticePersonal{ 82 noticePersonal := domain.NoticePersonal{
79 CreatedAt: time.Now(), 83 CreatedAt: time.Now(),
@@ -82,11 +86,12 @@ func (noticePersonalService *NoticePersonalService) AgreeJoinCreationProject(agr @@ -82,11 +86,12 @@ func (noticePersonalService *NoticePersonalService) AgreeJoinCreationProject(agr
82 CompanyId: agreeJoinCreationProjectCommand.CompanyId, 86 CompanyId: agreeJoinCreationProjectCommand.CompanyId,
83 Content: tplResult.String(), 87 Content: tplResult.String(),
84 IsRead: domain.NoticePersonalIsNotRead, 88 IsRead: domain.NoticePersonalIsNotRead,
85 - Module: domain.Action01_01, 89 + Module: domain.Module01,
86 ModuleAction: domain.Action01_01, 90 ModuleAction: domain.Action01_01,
87 UserBaseId: agreeJoinCreationProjectCommand.UserBaseId, 91 UserBaseId: agreeJoinCreationProjectCommand.UserBaseId,
88 OrgId: agreeJoinCreationProjectCommand.OrgId, 92 OrgId: agreeJoinCreationProjectCommand.OrgId,
89 UserId: agreeJoinCreationProjectCommand.UserId, 93 UserId: agreeJoinCreationProjectCommand.UserId,
  94 + MsgType: noticeAction.MsgType,
90 } 95 }
91 var noticePersonalRepository domain.NoticePersonalRepository 96 var noticePersonalRepository domain.NoticePersonalRepository
92 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 97 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -225,6 +230,10 @@ func (noticePersonalService *NoticePersonalService) InformExpectedDividends(info @@ -225,6 +230,10 @@ func (noticePersonalService *NoticePersonalService) InformExpectedDividends(info
225 "creationContractId": informExpectedDividendsCommand.CreationContractId, 230 "creationContractId": informExpectedDividendsCommand.CreationContractId,
226 "dividendsEstimateId": informExpectedDividendsCommand.DividendsEstimateId, 231 "dividendsEstimateId": informExpectedDividendsCommand.DividendsEstimateId,
227 } 232 }
  233 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  234 + if err != nil {
  235 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  236 + }
228 extendStr, _ := json.Marshal(extendData) 237 extendStr, _ := json.Marshal(extendData)
229 noticePersonal := domain.NoticePersonal{ 238 noticePersonal := domain.NoticePersonal{
230 CreatedAt: time.Now(), 239 CreatedAt: time.Now(),
@@ -238,6 +247,7 @@ func (noticePersonalService *NoticePersonalService) InformExpectedDividends(info @@ -238,6 +247,7 @@ func (noticePersonalService *NoticePersonalService) InformExpectedDividends(info
238 UserBaseId: informExpectedDividendsCommand.UserBaseId, 247 UserBaseId: informExpectedDividendsCommand.UserBaseId,
239 OrgId: informExpectedDividendsCommand.OrgId, 248 OrgId: informExpectedDividendsCommand.OrgId,
240 UserId: informExpectedDividendsCommand.UserId, 249 UserId: informExpectedDividendsCommand.UserId,
  250 + MsgType: noticeAction.MsgType,
241 } 251 }
242 var noticePersonalRepository domain.NoticePersonalRepository 252 var noticePersonalRepository domain.NoticePersonalRepository
243 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 253 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -318,6 +328,10 @@ func (noticePersonalService *NoticePersonalService) InformJoinCreationContract(i @@ -318,6 +328,10 @@ func (noticePersonalService *NoticePersonalService) InformJoinCreationContract(i
318 } 328 }
319 extendData := map[string]interface{}{} 329 extendData := map[string]interface{}{}
320 extendStr, _ := json.Marshal(extendData) 330 extendStr, _ := json.Marshal(extendData)
  331 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  332 + if err != nil {
  333 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  334 + }
321 noticePersonal := domain.NoticePersonal{ 335 noticePersonal := domain.NoticePersonal{
322 CreatedAt: time.Now(), 336 CreatedAt: time.Now(),
323 UpdatedAt: time.Now(), 337 UpdatedAt: time.Now(),
@@ -330,6 +344,7 @@ func (noticePersonalService *NoticePersonalService) InformJoinCreationContract(i @@ -330,6 +344,7 @@ func (noticePersonalService *NoticePersonalService) InformJoinCreationContract(i
330 UserBaseId: informJoinCreationContractCommand.UserBaseId, 344 UserBaseId: informJoinCreationContractCommand.UserBaseId,
331 OrgId: informJoinCreationContractCommand.OrgId, 345 OrgId: informJoinCreationContractCommand.OrgId,
332 UserId: informJoinCreationContractCommand.UserId, 346 UserId: informJoinCreationContractCommand.UserId,
  347 + MsgType: noticeAction.MsgType,
333 } 348 }
334 var noticePersonalRepository domain.NoticePersonalRepository 349 var noticePersonalRepository domain.NoticePersonalRepository
335 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 350 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -409,6 +424,10 @@ func (noticePersonalService *NoticePersonalService) RefuseJoinCreationProject(re @@ -409,6 +424,10 @@ func (noticePersonalService *NoticePersonalService) RefuseJoinCreationProject(re
409 "creationProjectId": refuseJoinCreationProjectCommand.CreationProjectId, 424 "creationProjectId": refuseJoinCreationProjectCommand.CreationProjectId,
410 } 425 }
411 extendStr, _ := json.Marshal(extendData) 426 extendStr, _ := json.Marshal(extendData)
  427 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  428 + if err != nil {
  429 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  430 + }
412 noticePersonal := domain.NoticePersonal{ 431 noticePersonal := domain.NoticePersonal{
413 CreatedAt: time.Now(), 432 CreatedAt: time.Now(),
414 UpdatedAt: time.Now(), 433 UpdatedAt: time.Now(),
@@ -421,6 +440,7 @@ func (noticePersonalService *NoticePersonalService) RefuseJoinCreationProject(re @@ -421,6 +440,7 @@ func (noticePersonalService *NoticePersonalService) RefuseJoinCreationProject(re
421 UserBaseId: refuseJoinCreationProjectCommand.UserBaseId, 440 UserBaseId: refuseJoinCreationProjectCommand.UserBaseId,
422 OrgId: refuseJoinCreationProjectCommand.OrgId, 441 OrgId: refuseJoinCreationProjectCommand.OrgId,
423 UserId: refuseJoinCreationProjectCommand.UserId, 442 UserId: refuseJoinCreationProjectCommand.UserId,
  443 + MsgType: noticeAction.MsgType,
424 } 444 }
425 var noticePersonalRepository domain.NoticePersonalRepository 445 var noticePersonalRepository domain.NoticePersonalRepository
426 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 446 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -503,6 +523,10 @@ func (noticePersonalService *NoticePersonalService) CreditAccountEstimate(credit @@ -503,6 +523,10 @@ func (noticePersonalService *NoticePersonalService) CreditAccountEstimate(credit
503 "dividendsEstimateId": creditAccountEstimateCommand.DividendsEstimateId, 523 "dividendsEstimateId": creditAccountEstimateCommand.DividendsEstimateId,
504 } 524 }
505 extendStr, _ := json.Marshal(extendData) 525 extendStr, _ := json.Marshal(extendData)
  526 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  527 + if err != nil {
  528 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  529 + }
506 noticePersonal := domain.NoticePersonal{ 530 noticePersonal := domain.NoticePersonal{
507 CreatedAt: time.Now(), 531 CreatedAt: time.Now(),
508 UpdatedAt: time.Now(), 532 UpdatedAt: time.Now(),
@@ -515,6 +539,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountEstimate(credit @@ -515,6 +539,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountEstimate(credit
515 UserBaseId: creditAccountEstimateCommand.UserBaseId, 539 UserBaseId: creditAccountEstimateCommand.UserBaseId,
516 OrgId: creditAccountEstimateCommand.OrgId, 540 OrgId: creditAccountEstimateCommand.OrgId,
517 UserId: creditAccountEstimateCommand.UserId, 541 UserId: creditAccountEstimateCommand.UserId,
  542 + MsgType: noticeAction.MsgType,
518 } 543 }
519 var noticePersonalRepository domain.NoticePersonalRepository 544 var noticePersonalRepository domain.NoticePersonalRepository
520 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 545 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -596,6 +621,10 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA @@ -596,6 +621,10 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA
596 "creditAccountId": creditAccountPaymentCommand.CreditAccountId, 621 "creditAccountId": creditAccountPaymentCommand.CreditAccountId,
597 } 622 }
598 extendStr, _ := json.Marshal(extendData) 623 extendStr, _ := json.Marshal(extendData)
  624 + noticeAction, err := domain.GetNoticeModuleAction(domain.Module01, domain.Action01_01)
  625 + if err != nil {
  626 + return nil, application.ThrowError(application.ARG_ERROR, err.Error())
  627 + }
599 noticePersonal := domain.NoticePersonal{ 628 noticePersonal := domain.NoticePersonal{
600 CreatedAt: time.Now(), 629 CreatedAt: time.Now(),
601 UpdatedAt: time.Now(), 630 UpdatedAt: time.Now(),
@@ -608,6 +637,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA @@ -608,6 +637,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA
608 UserBaseId: creditAccountPaymentCommand.UserBaseId, 637 UserBaseId: creditAccountPaymentCommand.UserBaseId,
609 OrgId: creditAccountPaymentCommand.OrgId, 638 OrgId: creditAccountPaymentCommand.OrgId,
610 UserId: creditAccountPaymentCommand.UserId, 639 UserId: creditAccountPaymentCommand.UserId,
  640 + MsgType: noticeAction.MsgType,
611 } 641 }
612 var noticePersonalRepository domain.NoticePersonalRepository 642 var noticePersonalRepository domain.NoticePersonalRepository
613 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{ 643 if value, err := factory.CreateNoticePersonalRepository(map[string]interface{}{
@@ -628,7 +658,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA @@ -628,7 +658,7 @@ func (noticePersonalService *NoticePersonalService) CreditAccountPayment(creditA
628 return noticePersonal, nil 658 return noticePersonal, nil
629 } 659 }
630 660
631 -// 设置消息：账期结算消息-分红预算 661 +// 读取消息
632 func (noticePersonalService *NoticePersonalService) ReadNotice(readNoticeCommand *command.ReadNoticeCommand) (interface{}, error) { 662 func (noticePersonalService *NoticePersonalService) ReadNotice(readNoticeCommand *command.ReadNoticeCommand) (interface{}, error) {
633 if err := readNoticeCommand.ValidateCommand(); err != nil { 663 if err := readNoticeCommand.ValidateCommand(); err != nil {
634 return nil, application.ThrowError(application.ARG_ERROR, err.Error()) 664 return nil, application.ThrowError(application.ARG_ERROR, err.Error())
@@ -35,6 +35,8 @@ type NoticePersonal struct { @@ -35,6 +35,8 @@ type NoticePersonal struct {
35 OrgId int64 `json:"orgId"` 35 OrgId int64 `json:"orgId"`
36 // 接收方用户id 36 // 接收方用户id
37 UserId int64 `json:"userId"` 37 UserId int64 `json:"userId"`
  38 + //app端使用
  39 + MsgType int `json:"msg_type"`
38 } 40 }
39 41
40 type NoticePersonalRepository interface { 42 type NoticePersonalRepository interface {
1 package domain 1 package domain
2 2
  3 +import "errors"
  4 +
3 //NoticeModule 消息模块 5 //NoticeModule 消息模块
4 type NoticeModule struct { 6 type NoticeModule struct {
5 ModuleCode string `json:"Code"` 7 ModuleCode string `json:"Code"`
@@ -11,6 +13,7 @@ type NoticeModuleAction struct { @@ -11,6 +13,7 @@ type NoticeModuleAction struct {
11 ModuleCode string `json:"module_code"` 13 ModuleCode string `json:"module_code"`
12 ActionCode string `json:"action_Code"` 14 ActionCode string `json:"action_Code"`
13 Name string `json:"name"` 15 Name string `json:"name"`
  16 + MsgType int `json:"msgType"`
14 } 17 }
15 18
16 // 编排消息需要的变量 19 // 编排消息需要的变量
@@ -70,13 +73,25 @@ func ValidNoticeModuleAction(moduleCode string, actioncode string) bool { @@ -70,13 +73,25 @@ func ValidNoticeModuleAction(moduleCode string, actioncode string) bool {
70 return false 73 return false
71 } 74 }
72 75
  76 +func GetNoticeModuleAction(moduleCode string, actioncode string) (NoticeModuleAction, error) {
  77 + for i := range noticeModuleActionList {
  78 + if (noticeModuleActionList[i].ActionCode == actioncode) &&
  79 + (noticeModuleActionList[i].ModuleCode == moduleCode) {
  80 + return noticeModuleActionList[i], nil
  81 + }
  82 + }
  83 + return NoticeModuleAction{}, errors.New("未找到对应的消息动作")
  84 +}
  85 +
73 //业务模块 86 //业务模块
74 const ( 87 const (
  88 + Module00 = "module00" // 系统消息
75 Module01 = "module01" // 天联共创 89 Module01 = "module01" // 天联共创
76 ) 90 )
77 91
78 //业务环节 92 //业务环节
79 const ( 93 const (
  94 + Action00_01 = "action00_01" //系统消息
80 Action01_01 = "action01_01" //天联共创-共创申请审核通过 95 Action01_01 = "action01_01" //天联共创-共创申请审核通过
81 Action01_02 = "action01_02" //天联共创-共创申请审核拒绝 96 Action01_02 = "action01_02" //天联共创-共创申请审核拒绝
82 Action01_03 = "action01_03" //天联共创-共创确认 97 Action01_03 = "action01_03" //天联共创-共创确认
@@ -121,12 +136,13 @@ var noticeModuleList = []NoticeModule{ @@ -121,12 +136,13 @@ var noticeModuleList = []NoticeModule{
121 136
122 //noticeModuleActionList 业务环节列表 137 //noticeModuleActionList 业务环节列表
123 var noticeModuleActionList = []NoticeModuleAction{ 138 var noticeModuleActionList = []NoticeModuleAction{
124 - {ModuleCode: Module01, ActionCode: Action01_01, Name: "共创申请通过"},  
125 - {ModuleCode: Module01, ActionCode: Action01_02, Name: "共创申请拒绝"},  
126 - {ModuleCode: Module01, ActionCode: Action01_03, Name: "共创确认"},  
127 - {ModuleCode: Module01, ActionCode: Action01_04, Name: "分红预算消息"},  
128 - {ModuleCode: Module01, ActionCode: Action01_05, Name: "账期结算消息"},  
129 - {ModuleCode: Module01, ActionCode: Action01_06, Name: "支付消息"}, 139 + {ModuleCode: Module00, ActionCode: Action00_01, Name: "系统消息", MsgType: 0},
  140 + {ModuleCode: Module01, ActionCode: Action01_01, Name: "共创申请通过", MsgType: 0},
  141 + {ModuleCode: Module01, ActionCode: Action01_02, Name: "共创申请拒绝", MsgType: 0},
  142 + {ModuleCode: Module01, ActionCode: Action01_03, Name: "共创确认", MsgType: 0},
  143 + {ModuleCode: Module01, ActionCode: Action01_04, Name: "分红预算消息", MsgType: 0},
  144 + {ModuleCode: Module01, ActionCode: Action01_05, Name: "账期结算消息", MsgType: 0},
  145 + {ModuleCode: Module01, ActionCode: Action01_06, Name: "支付消息", MsgType: 0},
130 } 146 }
131 147
132 //noticeSettingParamList 业务变量列表 148 //noticeSettingParamList 业务变量列表