正在显示
3 个修改的文件
包含
17 行增加
和
33 行删除
@@ -15,7 +15,9 @@ type DividendsIncentivesRule struct { | @@ -15,7 +15,9 @@ type DividendsIncentivesRule struct { | ||
15 | // 分红规则激励百分点 | 15 | // 分红规则激励百分点 |
16 | DividendsIncentivesPercentage float64 `json:"dividendsIncentivesPercentage"` | 16 | DividendsIncentivesPercentage float64 `json:"dividendsIncentivesPercentage"` |
17 | // 分红规则激励阶段,阶段返回时需要转换为中文数字 | 17 | // 分红规则激励阶段,阶段返回时需要转换为中文数字 |
18 | - DividendsIncentivesStage int64 `json:"dividendsIncentivesStage,string"` | 18 | + DividendsIncentivesStage int64 `json:"dividendsIncentivesStage"` |
19 | + // 分红激励规则阶段中文表示 | ||
20 | + DividendsIncentivesStageCN string `json:"dividendsIncentivesStageCN"` | ||
19 | // 分红规则激励阶段结束 | 21 | // 分红规则激励阶段结束 |
20 | DividendsIncentivesStageEnd time.Time `json:"dividendsIncentivesStageEnd"` | 22 | DividendsIncentivesStageEnd time.Time `json:"dividendsIncentivesStageEnd"` |
21 | // 分红规则激励阶段开始 | 23 | // 分红规则激励阶段开始 |
@@ -73,20 +75,10 @@ func (dividendsIncentivesRule *DividendsIncentivesRule) Update(data map[string]i | @@ -73,20 +75,10 @@ func (dividendsIncentivesRule *DividendsIncentivesRule) Update(data map[string]i | ||
73 | if dividendsIncentivesStageStart, ok := data["dividendsIncentivesStageStart"]; ok { | 75 | if dividendsIncentivesStageStart, ok := data["dividendsIncentivesStageStart"]; ok { |
74 | dividendsIncentivesRule.DividendsIncentivesStageStart = dividendsIncentivesStageStart.(time.Time) | 76 | dividendsIncentivesRule.DividendsIncentivesStageStart = dividendsIncentivesStageStart.(time.Time) |
75 | } | 77 | } |
76 | - if orgId, ok := data["orgId"]; ok { | ||
77 | - dividendsIncentivesRule.Org.OrgId = orgId.(int64) | ||
78 | - } | ||
79 | - if orgName, ok := data["orgName"]; ok { | ||
80 | - dividendsIncentivesRule.Org.OrgName = orgName.(string) | ||
81 | - } | ||
82 | - if companyId, ok := data["companyId"]; ok { | ||
83 | - dividendsIncentivesRule.Org.Company.CompanyId = companyId.(int64) | ||
84 | - } | ||
85 | - if companyLogo, ok := data["companyLogo"]; ok { | ||
86 | - dividendsIncentivesRule.Org.Company.CompanyLogo = companyLogo.(string) | ||
87 | - } | ||
88 | - if companyName, ok := data["companyName"]; ok { | ||
89 | - dividendsIncentivesRule.Org.Company.CompanyName = companyName.(string) | ||
90 | - } | ||
91 | return nil | 78 | return nil |
92 | } | 79 | } |
80 | + | ||
81 | +// NumberToCNNumber 数字转中文数字 | ||
82 | +func (dividendsIncentivesRule *DividendsIncentivesRule) NumberToCNNumber() (string, error) { | ||
83 | + return "", nil | ||
84 | +} |
@@ -11,7 +11,9 @@ type MoneyIncentivesRule struct { | @@ -11,7 +11,9 @@ type MoneyIncentivesRule struct { | ||
11 | // 激励金额 | 11 | // 激励金额 |
12 | MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` | 12 | MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` |
13 | // 金额激励阶段,阶段返回时需要转换为中文数字 | 13 | // 金额激励阶段,阶段返回时需要转换为中文数字 |
14 | - MoneyIncentivesStage int64 `json:"moneyIncentivesStage,string"` | 14 | + MoneyIncentivesStage int64 `json:"moneyIncentivesStage"` |
15 | + // 金额激励规则阶段中文表示 | ||
16 | + MoneyIncentivesStageCN string `json:"moneyIncentivesStageCN"` | ||
15 | // 金额激励阶段有效期结束 | 17 | // 金额激励阶段有效期结束 |
16 | MoneyIncentivesStageEnd time.Time `json:"moneyIncentivesStageEnd"` | 18 | MoneyIncentivesStageEnd time.Time `json:"moneyIncentivesStageEnd"` |
17 | // 金额激励阶段有效期开始 | 19 | // 金额激励阶段有效期开始 |
@@ -78,20 +80,10 @@ func (moneyIncentivesRule *MoneyIncentivesRule) Update(data map[string]interface | @@ -78,20 +80,10 @@ func (moneyIncentivesRule *MoneyIncentivesRule) Update(data map[string]interface | ||
78 | if salesmanPercentage, ok := data["salesmanPercentage"]; ok { | 80 | if salesmanPercentage, ok := data["salesmanPercentage"]; ok { |
79 | moneyIncentivesRule.SalesmanPercentage = salesmanPercentage.(float64) | 81 | moneyIncentivesRule.SalesmanPercentage = salesmanPercentage.(float64) |
80 | } | 82 | } |
81 | - if orgId, ok := data["orgId"]; ok { | ||
82 | - moneyIncentivesRule.Org.OrgId = orgId.(int64) | ||
83 | - } | ||
84 | - if orgName, ok := data["orgName"]; ok { | ||
85 | - moneyIncentivesRule.Org.OrgName = orgName.(string) | ||
86 | - } | ||
87 | - if companyId, ok := data["companyId"]; ok { | ||
88 | - moneyIncentivesRule.Org.Company.CompanyId = companyId.(int64) | ||
89 | - } | ||
90 | - if companyLogo, ok := data["companyLogo"]; ok { | ||
91 | - moneyIncentivesRule.Org.Company.CompanyLogo = companyLogo.(string) | ||
92 | - } | ||
93 | - if companyName, ok := data["companyName"]; ok { | ||
94 | - moneyIncentivesRule.Org.Company.CompanyName = companyName.(string) | ||
95 | - } | ||
96 | return nil | 83 | return nil |
97 | } | 84 | } |
85 | + | ||
86 | +// NumberToCNNumber 数字转中文数字 | ||
87 | +func (moneyIncentivesRule *MoneyIncentivesRule) NumberToCNNumber() (string, error) { | ||
88 | + return "", nil | ||
89 | +} |
-
请 注册 或 登录 后发表评论