切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-cooperation
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
yangfu
3 years ago
提交
65429ed6395a72ec0ec190c63c7ad2fad85a5dea
2 个父辈
cf166f60
f978341f
Merge branch 'test' of
http://gitlab.fjmaimaimai.com/allied-creation/allied-crea…
…tion-cooperation into test
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
32 行增加
和
7 行删除
pkg/application/dividendsEstimate/service/dividends_estimate.go
pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
pkg/application/dividendsEstimate/service/dividends_estimate.go
查看文件 @
65429ed
...
...
@@ -893,6 +893,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
dividendsGoodCount
=
dividendsGoodCount
+
1
}
}
if
dividendsGoodCount
==
len
(
dividendsReturnedOrderFound
.
Goods
)
{
// 2已分红
dividendsReturnedOrdersFound
[
i
]
.
DividendStatus
=
2
}
else
if
dividendsGoodCount
>
0
&&
dividendsGoodCount
<
len
(
dividendsReturnedOrderFound
.
Goods
)
{
// 3部分分红
...
...
pkg/infrastructure/domain_service/pg_confirm_dividends_incentives_estimate_service.go
查看文件 @
65429ed
...
...
@@ -60,24 +60,36 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
"orgId"
:
orderGood
.
OrgId
,
})
if
err
!=
nil
{
var
orderNumber
string
if
orderGood
.
DividendsOrderNumber
!=
""
{
orderNumber
=
orderGood
.
DividendsOrderNumber
}
else
{
orderNumber
=
orderGood
.
DividendsReturnedOrderNumber
}
dividendsEstimateDetails
=
append
(
dividendsEstimateDetails
,
&
service
.
DividendsEstimateDetail
{
DividendsUser
:
nil
,
DividendsParticipateType
:
0
,
DividendsStage
:
0
,
DividendsAmount
:
0
,
OrderOrReturnedOrderNumber
:
order
Good
.
DividendsOrder
Number
,
OrderOrReturnedOrderNumber
:
orderNumber
,
IsSuccessfully
:
false
,
Reason
:
"共创合约错误"
,
})
continue
}
if
cooperationContract
==
nil
{
var
orderNumber
string
if
orderGood
.
DividendsOrderNumber
!=
""
{
orderNumber
=
orderGood
.
DividendsOrderNumber
}
else
{
orderNumber
=
orderGood
.
DividendsReturnedOrderNumber
}
dividendsEstimateDetails
=
append
(
dividendsEstimateDetails
,
&
service
.
DividendsEstimateDetail
{
DividendsUser
:
nil
,
DividendsParticipateType
:
0
,
DividendsStage
:
0
,
DividendsAmount
:
0
,
OrderOrReturnedOrderNumber
:
order
Good
.
DividendsOrder
Number
,
OrderOrReturnedOrderNumber
:
orderNumber
,
IsSuccessfully
:
false
,
Reason
:
"共创合约"
+
orderGood
.
CooperationContractNumber
+
"不存在"
,
})
...
...
@@ -92,12 +104,18 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
//"notPause": true,
})
if
err
!=
nil
{
var
orderNumber
string
if
orderGood
.
DividendsOrderNumber
!=
""
{
orderNumber
=
orderGood
.
DividendsOrderNumber
}
else
{
orderNumber
=
orderGood
.
DividendsReturnedOrderNumber
}
dividendsEstimateDetails
=
append
(
dividendsEstimateDetails
,
&
service
.
DividendsEstimateDetail
{
DividendsUser
:
nil
,
DividendsParticipateType
:
0
,
DividendsStage
:
0
,
DividendsAmount
:
0
,
OrderOrReturnedOrderNumber
:
order
Good
.
DividendsOrder
Number
,
OrderOrReturnedOrderNumber
:
orderNumber
,
IsSuccessfully
:
false
,
Reason
:
"共创项目"
+
orderGood
.
CooperationContractNumber
+
"查询错误"
,
})
...
...
@@ -105,12 +123,18 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
}
if
cooperationProject
==
nil
{
var
orderNumber
string
if
orderGood
.
DividendsOrderNumber
!=
""
{
orderNumber
=
orderGood
.
DividendsOrderNumber
}
else
{
orderNumber
=
orderGood
.
DividendsReturnedOrderNumber
}
dividendsEstimateDetails
=
append
(
dividendsEstimateDetails
,
&
service
.
DividendsEstimateDetail
{
DividendsUser
:
nil
,
DividendsParticipateType
:
0
,
DividendsStage
:
0
,
DividendsAmount
:
0
,
OrderOrReturnedOrderNumber
:
order
Good
.
DividendsOrder
Number
,
OrderOrReturnedOrderNumber
:
orderNumber
,
IsSuccessfully
:
false
,
Reason
:
"共创项目"
+
orderGood
.
CooperationContractNumber
+
"已结束或不存在"
,
})
...
...
@@ -316,7 +340,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
DividendsParticipateType
:
domain
.
UNDERTAKER
,
DividendsStage
:
dividendsIncentivesRuleMatched
.
DividendsIncentivesStage
,
DividendsAmount
:
-
undertakerDividendsAmount
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
DividendsOrderNumber
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
Dividends
Returned
OrderNumber
,
IsSuccessfully
:
true
,
})
}
...
...
@@ -342,7 +366,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
DividendsParticipateType
:
domain
.
REFERRER
,
DividendsStage
:
dividendsIncentivesRuleMatched
.
DividendsIncentivesStage
,
DividendsAmount
:
-
referrerDividendsAmount
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
DividendsOrderNumber
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
Dividends
Returned
OrderNumber
,
IsSuccessfully
:
true
,
})
}
...
...
@@ -369,7 +393,7 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
DividendsParticipateType
:
domain
.
SALESMAN
,
DividendsStage
:
dividendsIncentivesRuleMatched
.
DividendsIncentivesStage
,
DividendsAmount
:
-
salesmanDividendsAmount
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
DividendsOrderNumber
,
OrderOrReturnedOrderNumber
:
dividendsReturnedOrder
.
Dividends
Returned
OrderNumber
,
IsSuccessfully
:
true
,
})
}
...
...
请
注册
或
登录
后发表评论