allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 tangxuhui
提交 0ad90fa80265ae39880b9af59baf1f60d47431f5 1 个父辈 c6e86649

数据结构更新

内嵌 并排对比
正在显示 4 个修改的文件 包含 19 行增加 和 18 行删除
@@ -36,13 +36,13 @@ type CreateCooperationContractCommand struct { @@ -36,13 +36,13 @@ type CreateCooperationContractCommand struct {
36 // 业务员抽成比例 36 // 业务员抽成比例
37 SalesmanPercentage float64 `json:"salesmanPercentage"` 37 SalesmanPercentage float64 `json:"salesmanPercentage"`
38 // 分红规则激励百分点 38 // 分红规则激励百分点
39 - DividendsIncentivesPercentage float64 `json:"dividendsIncentivesPercentage"` 39 + DividendsPercentage float64 `json:"dividendsPercentage"`
40 // 分红规则激励阶段， 40 // 分红规则激励阶段，
41 - DividendsIncentivesStage int `json:"dividendsIncentivesStage,string,"` 41 + DividendsStage int `json:"dividendsStage,string,"`
42 // 分红规则激励阶段结束 42 // 分红规则激励阶段结束
43 - DividendsIncentivesStageEnd int `json:"dividendsIncentivesStageEnd"` 43 + DividendsStageEnd int `json:"dividendsStageEnd"`
44 // 分红规则激励阶段开始 44 // 分红规则激励阶段开始
45 - DividendsIncentivesStageStart int `json:"dividendsIncentivesStageStart"` 45 + DividendsStageStart int `json:"dividendsStageStart"`
46 } `json:"dividendsIncentivesRules"` 46 } `json:"dividendsIncentivesRules"`
47 // 金额激励规则列表 47 // 金额激励规则列表
48 MoneyIncentivesRules []struct { 48 MoneyIncentivesRules []struct {
@@ -31,6 +31,7 @@ type UpdateCooperationContractCommand struct { @@ -31,6 +31,7 @@ type UpdateCooperationContractCommand struct {
31 } `json:"cooperationContract"` 31 } `json:"cooperationContract"`
32 // 业绩分红激励规则列表 32 // 业绩分红激励规则列表
33 DividendsIncentivesRules []struct { 33 DividendsIncentivesRules []struct {
  34 + DividendsIncentivesRuleId string `json:"dividendsIncentivesRuleId"`
34 // 关联的项目合约编号 35 // 关联的项目合约编号
35 CooperationContractNumber string `json:"cooperationContractNumber"` 36 CooperationContractNumber string `json:"cooperationContractNumber"`
36 // 推荐人抽成比例 37 // 推荐人抽成比例
@@ -57,7 +57,7 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon @@ -57,7 +57,7 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon
57 } 57 }
58 58
59 type MoneyIncentivesRule struct { 59 type MoneyIncentivesRule struct {
60 - MoneyIncentivesRuleId int `json:"moneyIncentivesRuleId"` 60 + MoneyIncentivesRuleId int `json:"moneyIncentivesRuleId,string"`
61 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的共创合约编号 61 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的共创合约编号
62 MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` // 激励金额 62 MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` // 激励金额
63 MoneyIncentivesStage int `json:"moneyIncentivesStage"` // 金额激励阶段 63 MoneyIncentivesStage int `json:"moneyIncentivesStage"` // 金额激励阶段
@@ -67,14 +67,14 @@ type MoneyIncentivesRule struct { @@ -67,14 +67,14 @@ type MoneyIncentivesRule struct {
67 } 67 }
68 68
69 type DividendsIncentivesRule struct { 69 type DividendsIncentivesRule struct {
70 - DividendsIncentivesRuleId int `json:"dividendsIncentivesRuleId"` 70 + DividendsIncentivesRuleId int `json:"dividendsIncentivesRuleId,string"`
71 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的项目合约编号 71 CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的项目合约编号
72 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例 72 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
73 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例 73 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
74 - DividendsIncentivesPercentage float64 `json:"dividendsIncentivesPercentage"` // 分红规则激励百分点  
75 - DividendsIncentivesStage int `json:"dividendsIncentivesStage,string"` // 分红规则激励阶段，  
76 - DividendsIncentivesStageEnd int64 `json:"dividendsIncentivesStageEnd"` // 分红规则激励阶段结束  
77 - DividendsIncentivesStageStart int64 `json:"dividendsIncentivesStageStart"` // 分红规则激励阶段开始 74 + DividendsPercentage float64 `json:"dividendsPercentage"` // 分红规则激励百分点
  75 + DividendsStage int `json:"dividendsStage,string"` // 分红规则激励阶段，
  76 + DividendsStageEnd int64 `json:"dividendsStageEnd"` // 分红规则激励阶段结束
  77 + DividendsStageStart int64 `json:"dividendsStageStart"` // 分红规则激励阶段开始
78 } 78 }
79 79
80 type Relevant struct { 80 type Relevant struct {
@@ -130,10 +130,10 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -130,10 +130,10 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
130 CooperationContractNumber: v.CooperationContractNumber, 130 CooperationContractNumber: v.CooperationContractNumber,
131 ReferrerPercentage: v.ReferrerPercentage, 131 ReferrerPercentage: v.ReferrerPercentage,
132 SalesmanPercentage: v.SalesmanPercentage, 132 SalesmanPercentage: v.SalesmanPercentage,
133 - DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,  
134 - DividendsIncentivesStage: v.DividendsIncentivesStage,  
135 - DividendsIncentivesStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6,  
136 - DividendsIncentivesStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6, 133 + DividendsPercentage: v.DividendsIncentivesPercentage,
  134 + DividendsStage: v.DividendsIncentivesStage,
  135 + DividendsStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6,
  136 + DividendsStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6,
137 } 137 }
138 dividendsIncentivesRules = append(dividendsIncentivesRules, r) 138 dividendsIncentivesRules = append(dividendsIncentivesRules, r)
139 } 139 }
@@ -26,10 +26,10 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -26,10 +26,10 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
26 CooperationContractNumber: v.CooperationContractNumber, 26 CooperationContractNumber: v.CooperationContractNumber,
27 ReferrerPercentage: v.ReferrerPercentage, 27 ReferrerPercentage: v.ReferrerPercentage,
28 SalesmanPercentage: v.SalesmanPercentage, 28 SalesmanPercentage: v.SalesmanPercentage,
29 - DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,  
30 - DividendsIncentivesStage: v.DividendsIncentivesStage,  
31 - DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),  
32 - DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0), 29 + DividendsIncentivesPercentage: v.DividendsPercentage,
  30 + DividendsIncentivesStage: v.DividendsStage,
  31 + DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsStageEnd/1e3), 0),
  32 + DividendsIncentivesStageStart: time.Unix(int64(v.DividendsStageStart/1e3), 0),
33 } 33 }
34 rules1 = append(rules1, r) 34 rules1 = append(rules1, r)
35 } 35 }