切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-cooperation
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
陈志颖
3 years ago
提交
57906bb677ad9f1f4365a92f06d194467b5b7941
1 个父辈
1d81fe77
fix:取消关联的分红预算单
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
82 行增加
和
62 行删除
pkg/infrastructure/domain_service/pg_cancel_dividends_estimate_service.go
pkg/infrastructure/domain_service/pg_cancel_dividends_estimate_service.go
查看文件 @
57906bb
...
...
@@ -63,39 +63,49 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
// 自定义查询
queryOptions
:=
make
(
map
[
string
]
interface
{})
//参与分红类型,1承接人,2推荐人,3关联业务员
if
dividendsEstimate
.
DividendsParticipateType
==
1
{
// 当前取消的是承接人的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"orderOrReturnedOrderNum"
:
dividendsEstimate
.
OrderOrReturnedOrderNum
,
"dividendsParticipateTypes"
:
[]
int32
{
2
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsTypes"
:
[]
int32
{
1
,
2
},
}
}
else
if
dividendsEstimate
.
DividendsParticipateType
==
2
{
// 当前取消的是推荐人的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"orderOrReturnedOrderNum"
:
dividendsEstimate
.
OrderOrReturnedOrderNum
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsTypes"
:
[]
int32
{
1
,
2
},
}
}
else
if
dividendsEstimate
.
DividendsParticipateType
==
3
{
// 当前取消的是关联业务员的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"orderOrReturnedOrderNum"
:
dividendsEstimate
.
OrderOrReturnedOrderNum
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
2
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsTypes"
:
[]
int32
{
1
,
2
},
}
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"orderOrReturnedOrderNum"
:
dividendsEstimate
.
OrderOrReturnedOrderNum
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
2
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsTypes"
:
[]
int32
{
1
,
2
},
}
//参与分红类型,1承接人,2推荐人,3关联业务员
//if dividendsEstimate.DividendsParticipateType == 1 { // 当前取消的是承接人的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum,
// "dividendsParticipateTypes": []int32{1, 2, 3},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsTypes": []int32{1, 2},
// }
//} else if dividendsEstimate.DividendsParticipateType == 2 { // 当前取消的是推荐人的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum,
// "dividendsParticipateTypes": []int32{1, 3},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsTypes": []int32{1, 2},
// }
//} else if dividendsEstimate.DividendsParticipateType == 3 { // 当前取消的是关联业务员的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum,
// "dividendsParticipateTypes": []int32{1, 2},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsTypes": []int32{1, 2},
// }
//}
// 根据当前分红预算单的分红订单号或退货单号获取相关的分红预算单
if
countRelative
,
dividendsEstimatesRelative
,
err2
:=
dividendsEstimateRepository
.
Find
(
queryOptions
);
err2
!=
nil
{
return
nil
,
err2
...
...
@@ -118,39 +128,49 @@ func (domainService *CancelDividendsEstimateService) CancelEstimate(dividendsEst
// 自定义查询
queryOptions
:=
make
(
map
[
string
]
interface
{})
//参与分红类型,1承接人,2推荐人,3关联业务员
if
dividendsEstimate
.
DividendsParticipateType
==
1
{
// 当前取消的是承接人的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"cooperationContractNumber"
:
dividendsEstimate
.
CooperationContractNumber
,
"dividendsParticipateTypes"
:
[]
int32
{
2
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsType"
:
int32
(
3
),
}
}
else
if
dividendsEstimate
.
DividendsParticipateType
==
2
{
// 当前取消的是推荐人的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"cooperationContractNumber"
:
dividendsEstimate
.
CooperationContractNumber
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsType"
:
int32
(
3
),
}
}
else
if
dividendsEstimate
.
DividendsParticipateType
==
3
{
// 当前取消的是关联业务员的分红预算单
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"cooperationContractNumber"
:
dividendsEstimate
.
CooperationContractNumber
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
2
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsType"
:
int32
(
3
),
}
queryOptions
=
map
[
string
]
interface
{}{
"companyId"
:
dividendsEstimate
.
Company
.
CompanyId
,
"orgId"
:
dividendsEstimate
.
Org
.
OrgId
,
"cooperationContractNumber"
:
dividendsEstimate
.
CooperationContractNumber
,
"dividendsParticipateTypes"
:
[]
int32
{
1
,
2
,
3
},
"offsetLimit"
:
false
,
"dividendsStage"
:
dividendsEstimate
.
DividendsStage
,
"dividendsType"
:
int32
(
3
),
}
//参与分红类型,1承接人,2推荐人,3关联业务员
//if dividendsEstimate.DividendsParticipateType == 1 { // 当前取消的是承接人的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "cooperationContractNumber": dividendsEstimate.CooperationContractNumber,
// "dividendsParticipateTypes": []int32{2, 3},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsType": int32(3),
// }
//} else if dividendsEstimate.DividendsParticipateType == 2 { // 当前取消的是推荐人的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "cooperationContractNumber": dividendsEstimate.CooperationContractNumber,
// "dividendsParticipateTypes": []int32{1, 3},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsType": int32(3),
// }
//} else if dividendsEstimate.DividendsParticipateType == 3 { // 当前取消的是关联业务员的分红预算单
// queryOptions = map[string]interface{}{
// "companyId": dividendsEstimate.Company.CompanyId,
// "orgId": dividendsEstimate.Org.OrgId,
// "cooperationContractNumber": dividendsEstimate.CooperationContractNumber,
// "dividendsParticipateTypes": []int32{1, 2},
// "offsetLimit": false,
// "dividendsStage": dividendsEstimate.DividendsStage,
// "dividendsType": int32(3),
// }
//}
// 根据当前分红预算单的分红订单号或退货单号获取相关的分红预算单
if
countRelative
,
dividendsEstimatesRelative
,
err2
:=
dividendsEstimateRepository
.
Find
(
queryOptions
);
err2
!=
nil
{
return
nil
,
err2
...
...
请
注册
或
登录
后发表评论