|
@@ -8,6 +8,7 @@ import ( |
|
@@ -8,6 +8,7 @@ import ( |
|
8
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
|
8
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain"
|
|
9
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
|
9
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/domain/service"
|
|
10
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
|
10
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/dao"
|
|
|
|
11
|
+ "gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation/pkg/infrastructure/utils"
|
|
11
|
"time"
|
12
|
"time"
|
|
12
|
)
|
13
|
)
|
|
13
|
|
14
|
|
|
@@ -49,6 +50,7 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do |
|
@@ -49,6 +50,7 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do |
|
49
|
|
50
|
|
|
50
|
// 金额激励预算
|
51
|
// 金额激励预算
|
|
51
|
for _, undertaker := range contract.Undertakers {
|
52
|
for _, undertaker := range contract.Undertakers {
|
|
|
|
53
|
+ if utils.IsContain64(undertakerUIDs, undertaker.UndertakerId) {
|
|
52
|
// 判断承接人在当前阶段是否已经分红
|
54
|
// 判断承接人在当前阶段是否已经分红
|
|
53
|
undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
|
55
|
undertakerEstimated, err := dividendsEstimateDao.UserEstimated(map[string]interface{}{
|
|
54
|
"undertakerUid": undertaker.UserId,
|
56
|
"undertakerUid": undertaker.UserId,
|
|
@@ -154,6 +156,7 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do |
|
@@ -154,6 +156,7 @@ func (domainService *ConfirmMoneyIncentivesEstimateService) Confirm(contract *do |
|
154
|
}
|
156
|
}
|
|
155
|
}
|
157
|
}
|
|
156
|
}
|
158
|
}
|
|
|
|
159
|
+ }
|
|
157
|
return dividendsEstimateDetails, nil
|
160
|
return dividendsEstimateDetails, nil
|
|
158
|
}
|
161
|
}
|
|
159
|
|
162
|
|