feat:调整确定金额激励领域服务

@@ -96,23 +96,22 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
 			return nil, err
 			return nil, err
 		}
 		}
 		if salesmanEstimated {
 		if salesmanEstimated {
-			return nil, fmt.Errorf("用户 " + undertaker.UserName + " 已分红")
+			return nil, fmt.Errorf("业务员 " + undertaker.Salesman.UserName + " 已分红")
 		} else {
 		} else {
-			undertakerDividendsAmount := moneyIncentivesRuleMatched.MoneyIncentivesAmount * (1 - (moneyIncentivesRuleMatched.SalesmanPercentage+moneyIncentivesRuleMatched.ReferrerPercentage)/100)
+			undertakerDividendsAmount := moneyIncentivesRuleMatched.MoneyIncentivesAmount * (moneyIncentivesRuleMatched.SalesmanPercentage / 100)
 			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
 				DividendsUser: &domain.User{
 				DividendsUser: &domain.User{
-					UserId:     undertaker.UserId,
-					UserBaseId: undertaker.UserBaseId,
-					Org:        undertaker.Org,
-					Orgs:       undertaker.Orgs,
-					Department: undertaker.Department,
-					Roles:      undertaker.Roles,
-					UserInfo:   undertaker.UserInfo,
-					UserType:   undertaker.UserType,
-					UserName:   undertaker.UserName,
-					UserPhone:  undertaker.UserPhone,
-					Status:     undertaker.Status,
-					Company:    undertaker.Company,
+					UserId:     undertaker.Salesman.UserId,
+					UserBaseId: undertaker.Salesman.UserBaseId,
+					Org:        undertaker.Salesman.Org,
+					Orgs:       undertaker.Salesman.Orgs,
+					Department: undertaker.Salesman.Department,
+					Roles:      undertaker.Salesman.Roles,
+					UserInfo:   undertaker.Salesman.UserInfo,
+					UserType:   undertaker.Salesman.UserType,
+					UserName:   undertaker.Salesman.UserName,
+					UserPhone:  undertaker.Salesman.UserPhone,
+					Company:    undertaker.Salesman.Company,
 				},
 				},
 				DividendsParticipateType: domain.MONEY_INCENTIVES,
 				DividendsParticipateType: domain.MONEY_INCENTIVES,
 				DividendsStage:           stage,
 				DividendsStage:           stage,
@@ -120,6 +119,37 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do
 			})
 			})
 		}
 		}
 		//	判断关联业务员在当前阶段是否已经分红
 		//	判断关联业务员在当前阶段是否已经分红
+		referrerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
+			"undertakerUid": undertaker.Referrer.UserId,
+			"companyId":     contract.Company.CompanyId,
+			"orgId":         contract.Org.OrgId,
+		})
+		if err != nil {
+			return nil, err
+		}
+		if referrerEstimated {
+			return nil, fmt.Errorf("推荐人 " + undertaker.Salesman.UserName + " 已分红")
+		} else {
+			undertakerDividendsAmount := moneyIncentivesRuleMatched.MoneyIncentivesAmount * (moneyIncentivesRuleMatched.ReferrerPercentage / 100)
+			dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
+				DividendsUser: &domain.User{
+					UserId:     undertaker.Referrer.UserId,
+					UserBaseId: undertaker.Referrer.UserBaseId,
+					Org:        undertaker.Referrer.Org,
+					Orgs:       undertaker.Referrer.Orgs,
+					Department: undertaker.Referrer.Department,
+					Roles:      undertaker.Referrer.Roles,
+					UserInfo:   undertaker.Referrer.UserInfo,
+					UserType:   undertaker.Referrer.UserType,
+					UserName:   undertaker.Referrer.UserName,
+					UserPhone:  undertaker.Referrer.UserPhone,
+					Company:    undertaker.Referrer.Company,
+				},
+				DividendsParticipateType: domain.MONEY_INCENTIVES,
+				DividendsStage:           stage,
+				DividendsAmount:          undertakerDividendsAmount,
+			})
+		}
 	}
 	}
 	return dividendsEstimateDetails, nil
 	return dividendsEstimateDetails, nil
 }
 }