作者 陈志颖

Merge branch 'dev-chenzhiying' into dev

@@ -167,7 +167,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -167,7 +167,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
167 var dividendsIncentivesRulesModel []*models.DividendsIncentivesRule 167 var dividendsIncentivesRulesModel []*models.DividendsIncentivesRule
168 for _, rule := range cooperationContract.DividendsIncentivesRules { 168 for _, rule := range cooperationContract.DividendsIncentivesRules {
169 dividendsIncentivesRulesModel = append(dividendsIncentivesRulesModel, &models.DividendsIncentivesRule{ 169 dividendsIncentivesRulesModel = append(dividendsIncentivesRulesModel, &models.DividendsIncentivesRule{
170 - DividendsIncentivesRuleId: 0,  
171 CooperationContractNumber: cooperationContract.CooperationContractNumber, 170 CooperationContractNumber: cooperationContract.CooperationContractNumber,
172 ReferrerPercentage: rule.ReferrerPercentage, 171 ReferrerPercentage: rule.ReferrerPercentage,
173 SalesmanPercentage: rule.SalesmanPercentage, 172 SalesmanPercentage: rule.SalesmanPercentage,
@@ -193,7 +192,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -193,7 +192,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
193 var moneyIncentivesRulesModel []*models.MoneyIncentivesRule 192 var moneyIncentivesRulesModel []*models.MoneyIncentivesRule
194 for _, rule := range cooperationContract.MoneyIncentivesRules { 193 for _, rule := range cooperationContract.MoneyIncentivesRules {
195 moneyIncentivesRulesModel = append(moneyIncentivesRulesModel, &models.MoneyIncentivesRule{ 194 moneyIncentivesRulesModel = append(moneyIncentivesRulesModel, &models.MoneyIncentivesRule{
196 - MoneyIncentivesRuleId: 0,  
197 CooperationContractNumber: cooperationContract.CooperationContractNumber, 195 CooperationContractNumber: cooperationContract.CooperationContractNumber,
198 MoneyIncentivesAmount: rule.MoneyIncentivesAmount, 196 MoneyIncentivesAmount: rule.MoneyIncentivesAmount,
199 MoneyIncentivesStage: rule.MoneyIncentivesStage, 197 MoneyIncentivesStage: rule.MoneyIncentivesStage,
@@ -292,7 +290,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai @@ -292,7 +290,6 @@ func (repository *CooperationContractRepository) Save(cooperationContract *domai
292 var cooperationContractRelevantPeopleToAddModels []*models.CooperationContractRelevant 290 var cooperationContractRelevantPeopleToAddModels []*models.CooperationContractRelevant
293 for _, relevantDomain := range cooperationContractRelevantPeopleToAdd { 291 for _, relevantDomain := range cooperationContractRelevantPeopleToAdd {
294 cooperationContractRelevantPeopleToAddModels = append(cooperationContractRelevantPeopleToAddModels, &models.CooperationContractRelevant{ 292 cooperationContractRelevantPeopleToAddModels = append(cooperationContractRelevantPeopleToAddModels, &models.CooperationContractRelevant{
295 - CooperationContractRelevantId: 0,  
296 CooperationContractNumber: relevantDomain.CooperationContractNumber, 293 CooperationContractNumber: relevantDomain.CooperationContractNumber,
297 UserId: relevantDomain.UserId, 294 UserId: relevantDomain.UserId,
298 UserBaseId: relevantDomain.UserBaseId, 295 UserBaseId: relevantDomain.UserBaseId,