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

转到一个项目

作者 陈志颖
提交 d8df9d2936744c5abe26f07f998d17b970630c73 1 个父辈 ad7f7ccd

fix:承接人值对象json tag修复

内嵌 并排对比
正在显示 2 个修改的文件 包含 15 行增加 和 15 行删除
@@ -16,24 +16,24 @@ type CreateDividendsIncentivesRulesCommand struct { @@ -16,24 +16,24 @@ type CreateDividendsIncentivesRulesCommand struct {
16 SalesmanPercentage float64 `cname:"业务员抽成" json:"salesmanPercentage"` 16 SalesmanPercentage float64 `cname:"业务员抽成" json:"salesmanPercentage"`
17 DividendsIncentivesPercentage float64 `cname:"分红规则激励百分点" json:"dividendsIncentivesPercentage"` 17 DividendsIncentivesPercentage float64 `cname:"分红规则激励百分点" json:"dividendsIncentivesPercentage"`
18 DividendsIncentivesStage int32 `cname:"分红激励阶段" json:"dividendsIncentivesStage"` 18 DividendsIncentivesStage int32 `cname:"分红激励阶段" json:"dividendsIncentivesStage"`
19 - DividendsIncentivesStageEnd time.Time `cname:"" json:"dividendsIncentivesStageEnd"`  
20 - DividendsIncentivesStageStart time.Time `cname:"" json:"dividendsIncentivesStageStart"` 19 + DividendsIncentivesStageEnd time.Time `cname:"业绩分红阶段结束时间" json:"dividendsIncentivesStageEnd"`
  20 + DividendsIncentivesStageStart time.Time `cname:"业绩分红阶段开始时间" json:"dividendsIncentivesStageStart"`
21 } 21 }
22 22
23 type CreateMoneyIncentivesRulesCommand struct { 23 type CreateMoneyIncentivesRulesCommand struct {
24 - MoneyIncentivesRuleId string `cname:"" json:"moneyIncentivesRuleId,string"`  
25 - CooperationContractNumber string `cname:"" json:"cooperationContractNumber"`  
26 - MoneyIncentivesAmount float64 `cname:"" json:"moneyIncentivesAmount"`  
27 - MoneyIncentivesStage int32 `cname:"" json:"moneyIncentivesStage"` 24 + MoneyIncentivesRuleId string `cname:"金额激励规则ID" json:"moneyIncentivesRuleId"`
  25 + CooperationContractNumber string `cname:"共创合约编号" json:"cooperationContractNumber"`
  26 + MoneyIncentivesAmount float64 `cname:"激励金额" json:"moneyIncentivesAmount"`
  27 + MoneyIncentivesStage int32 `cname:"金额激励阶段" json:"moneyIncentivesStage"`
28 MoneyIncentivesStageEnd time.Time `cname:"" json:"moneyIncentivesStageEnd"` 28 MoneyIncentivesStageEnd time.Time `cname:"" json:"moneyIncentivesStageEnd"`
29 - MoneyIncentivesStageStart time.Time `cname:"" json:"moneyIncentivesStageStart"` 29 + MoneyIncentivesStageStart time.Time `cname:"金额激励时间" json:"moneyIncentivesStageStart"`
30 MoneyIncentivesTime time.Time `cname:"" json:"moneyIncentivesTime"` 30 MoneyIncentivesTime time.Time `cname:"" json:"moneyIncentivesTime"`
31 - ReferrerPercentage float64 `cname:"" json:"referrerPercentage"`  
32 - SalesmanPercentage float64 `cname:"" json:"salesmanPercentage"` 31 + ReferrerPercentage float64 `cname:"推荐人抽成" json:"referrerPercentage"`
  32 + SalesmanPercentage float64 `cname:"业务员抽成" json:"salesmanPercentage"`
33 } 33 }
34 34
35 type CreateUndertakersCommand struct { 35 type CreateUndertakersCommand struct {
36 - UndertakerId string `cname:"承接人ID" json:"relevantId"` 36 + UndertakerId string `cname:"承接人ID" json:"undertakerId"`
37 UserId string `cname:"承接人UID" json:"userId"` 37 UserId string `cname:"承接人UID" json:"userId"`
38 ContractAttachment []struct { 38 ContractAttachment []struct {
39 FileType string `cname:"文件类型" json:"fileType"` 39 FileType string `cname:"文件类型" json:"fileType"`
@@ -73,13 +73,13 @@ type CreateCooperationContractCommand struct { @@ -73,13 +73,13 @@ type CreateCooperationContractCommand struct {
73 // 相关人列表 73 // 相关人列表
74 RelevantIds []string `cname:"相关人列表" json:"relevantIds,omitempty"` 74 RelevantIds []string `cname:"相关人列表" json:"relevantIds,omitempty"`
75 // 公司ID，通过集成REST上下文获取 75 // 公司ID，通过集成REST上下文获取
76 - CompanyId int64 `cname:"公司ID" json:"companyId,string" valid:"Required"` 76 + CompanyId int64 `cname:"公司ID" json:"companyId" valid:"Required"`
77 // 组织机构ID 77 // 组织机构ID
78 - OrgId int64 `cname:"组织机构ID" json:"orgId,string" valid:"Required"` 78 + OrgId int64 `cname:"组织机构ID" json:"orgId" valid:"Required"`
79 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 79 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
80 - UserId int64 `cname:"用户ID" json:"userId,string" valid:"Required"` 80 + UserId int64 `cname:"用户ID" json:"userId" valid:"Required"`
81 // 用户基础数据id 81 // 用户基础数据id
82 - UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId,string" valid:"Required"` 82 + UserBaseId int64 `cname:"用户基础数据ID" json:"userBaseId" valid:"Required"`
83 } 83 }
84 84
85 func (createCooperationContractCommand *CreateCooperationContractCommand) Valid(validation *validation.Validation) { 85 func (createCooperationContractCommand *CreateCooperationContractCommand) Valid(validation *validation.Validation) {
@@ -3,7 +3,7 @@ package domain @@ -3,7 +3,7 @@ package domain
3 // Undertaker 共创合约承接方值对象 3 // Undertaker 共创合约承接方值对象
4 type Undertaker struct { 4 type Undertaker struct {
5 // 承接人id 5 // 承接人id
6 - UndertakerId int64 `json:"relevantId,string"` 6 + UndertakerId int64 `json:"undertakerId,string"`
7 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员 7 // 用户ID，通过集成REST上下文获取，可翻译成发起人、承接人、推荐人、业务员
8 UserId int64 `json:"userId,string"` 8 UserId int64 `json:"userId,string"`
9 // 用户基本id 9 // 用户基本id