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

转到一个项目

作者 tangxuhui
提交 2c40ffa6e8c985a104c7c29b3fde2f8bf51fa208 1 个父辈 f68d81b4

更新

内嵌 并排对比
正在显示 3 个修改的文件 包含 12 行增加 和 12 行删除
@@ -25,7 +25,7 @@ type CreateCooperationContractCommand struct { @@ -25,7 +25,7 @@ type CreateCooperationContractCommand struct {
25 // 共创模式编码， 25 // 共创模式编码，
26 CooperationModeNumber string `json:"cooperationModeNumber"` 26 CooperationModeNumber string `json:"cooperationModeNumber"`
27 // 共创合约发起人uid 27 // 共创合约发起人uid
28 - SponsorUid string `json:"sponsorUid"` 28 + SponsorUserId string `json:"sponsorUserId"`
29 } `json:"cooperationContract"` 29 } `json:"cooperationContract"`
30 // 业绩分红激励规则列表 30 // 业绩分红激励规则列表
31 DividendsIncentivesRules []struct { 31 DividendsIncentivesRules []struct {
@@ -27,7 +27,7 @@ type UpdateCooperationContractCommand struct { @@ -27,7 +27,7 @@ type UpdateCooperationContractCommand struct {
27 // 共创模式编码， 27 // 共创模式编码，
28 CooperationModeNumber string `json:"cooperationModeNumber"` 28 CooperationModeNumber string `json:"cooperationModeNumber"`
29 // 共创合约发起人uid 29 // 共创合约发起人uid
30 - SponsorUid string `json:"sponsorUid"` 30 + SponsorUserId string `json:"sponsorUserId"`
31 } `json:"cooperationContract"` 31 } `json:"cooperationContract"`
32 // 业绩分红激励规则列表 32 // 业绩分红激励规则列表
33 DividendsIncentivesRules []struct { 33 DividendsIncentivesRules []struct {
@@ -38,13 +38,13 @@ type UpdateCooperationContractCommand struct { @@ -38,13 +38,13 @@ type UpdateCooperationContractCommand struct {
38 // 业务员抽成比例 38 // 业务员抽成比例
39 SalesmanPercentage float64 `json:"salesmanPercentage"` 39 SalesmanPercentage float64 `json:"salesmanPercentage"`
40 // 分红规则激励百分点 40 // 分红规则激励百分点
41 - DividendsIncentivesPercentage float64 `json:"dividendsIncentivesPercentage"` 41 + DividendsPercentage float64 `json:"dividendsPercentage"`
42 // 分红规则激励阶段， 42 // 分红规则激励阶段，
43 - DividendsIncentivesStage int `json:"dividendsIncentivesStage,string,"` 43 + DividendsStage int `json:"dividendsStage"`
44 // 分红规则激励阶段结束 44 // 分红规则激励阶段结束
45 - DividendsIncentivesStageEnd int `json:"dividendsIncentivesStageEnd"` 45 + DividendsStageEnd int `json:"dividendsStageEnd"`
46 // 分红规则激励阶段开始 46 // 分红规则激励阶段开始
47 - DividendsIncentivesStageStart int `json:"dividendsIncentivesStageStart"` 47 + DividendsStageStart int `json:"dividendsStageStart"`
48 } `json:"dividendsIncentivesRules"` 48 } `json:"dividendsIncentivesRules"`
49 // 金额激励规则列表 49 // 金额激励规则列表
50 MoneyIncentivesRules []struct { 50 MoneyIncentivesRules []struct {
@@ -67,7 +67,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -67,7 +67,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
67 CooperationContractUndertakerType: createCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, 67 CooperationContractUndertakerType: createCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
68 CooperationContractName: createCooperationContractCommand.CooperationContract.CooperationContractName, 68 CooperationContractName: createCooperationContractCommand.CooperationContract.CooperationContractName,
69 CooperationModeNumber: createCooperationContractCommand.CooperationContract.CooperationModeNumber, 69 CooperationModeNumber: createCooperationContractCommand.CooperationContract.CooperationModeNumber,
70 - SponsorUid: createCooperationContractCommand.CooperationContract.SponsorUid, 70 + SponsorUid: createCooperationContractCommand.CooperationContract.SponsorUserId,
71 CompanyId: int(createCooperationContractCommand.Operator.CompanyId), 71 CompanyId: int(createCooperationContractCommand.Operator.CompanyId),
72 UserId: int(createCooperationContractCommand.Operator.UserId), 72 UserId: int(createCooperationContractCommand.Operator.UserId),
73 UserBaseId: int(createCooperationContractCommand.Operator.UserBaseId), 73 UserBaseId: int(createCooperationContractCommand.Operator.UserBaseId),
@@ -141,10 +141,10 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -141,10 +141,10 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
141 CooperationContractNumber: v.CooperationContractNumber, 141 CooperationContractNumber: v.CooperationContractNumber,
142 ReferrerPercentage: v.ReferrerPercentage, 142 ReferrerPercentage: v.ReferrerPercentage,
143 SalesmanPercentage: v.SalesmanPercentage, 143 SalesmanPercentage: v.SalesmanPercentage,
144 - DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,  
145 - DividendsIncentivesStage: v.DividendsIncentivesStage,  
146 - DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),  
147 - DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0), 144 + DividendsIncentivesPercentage: v.DividendsPercentage,
  145 + DividendsIncentivesStage: v.DividendsStage,
  146 + DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsStageEnd/1e3), 0),
  147 + DividendsIncentivesStageStart: time.Unix(int64(v.DividendsStageStart/1e3), 0),
148 } 148 }
149 rules1 = append(rules1, r) 149 rules1 = append(rules1, r)
150 } 150 }
@@ -184,7 +184,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -184,7 +184,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
184 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, 184 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
185 CooperationContractName: updateCooperationContractCommand.CooperationContract.CooperationContractName, 185 CooperationContractName: updateCooperationContractCommand.CooperationContract.CooperationContractName,
186 CooperationModeNumber: updateCooperationContractCommand.CooperationContract.CooperationModeNumber, 186 CooperationModeNumber: updateCooperationContractCommand.CooperationContract.CooperationModeNumber,
187 - SponsorUid: updateCooperationContractCommand.CooperationContract.SponsorUid, 187 + SponsorUid: updateCooperationContractCommand.CooperationContract.SponsorUserId,
188 CompanyId: int(updateCooperationContractCommand.Operator.CompanyId), 188 CompanyId: int(updateCooperationContractCommand.Operator.CompanyId),
189 UserId: int(updateCooperationContractCommand.Operator.UserId), 189 UserId: int(updateCooperationContractCommand.Operator.UserId),
190 UserBaseId: int(updateCooperationContractCommand.Operator.UserBaseId), 190 UserBaseId: int(updateCooperationContractCommand.Operator.UserBaseId),