切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-cooperation
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
差异文件
浏览文件
作者
陈志颖
3 years ago
提交
1b7e92b47798299f8a671e36011cec4ec786520f
2 个父辈
e3f8571a
d31ff4c1
Merge branch 'dev-chenzhiying' into dev
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
32 行增加
和
3 行删除
pkg/application/dividendsOrder/service/dividends_order.go
pkg/infrastructure/pg/models/dividends_estimate.go
pkg/infrastructure/repository/pg_dividends_estimate_repository.go
pkg/infrastructure/repository/pg_dividends_returned_order_repository.go
pkg/application/dividendsOrder/service/dividends_order.go
查看文件 @
1b7e92b
...
...
@@ -1096,6 +1096,16 @@ func (dividendsOrderService *DividendsOrderService) BatchRemoveDividendsOrder(ba
dividendsReturnedOrderRepository
=
value
}
// 分红预算单仓储初始化
var
dividendsEstimateRepository
domain
.
DividendsEstimateRepository
if
value
,
err
:=
factory
.
CreateDividendsEstimateRepository
(
map
[
string
]
interface
{}{
"transactionContext"
:
transactionContext
,
});
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
else
{
dividendsEstimateRepository
=
value
}
dividendsOrderIds
,
err
:=
utils
.
SliceAtoi
(
batchRemoveDividendsOrderCommand
.
DividendsOrderIds
)
if
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
"分红订单ID类型错误"
)
...
...
@@ -1120,9 +1130,22 @@ func (dividendsOrderService *DividendsOrderService) BatchRemoveDividendsOrder(ba
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
fmt
.
Sprintf
(
"分红订单%s有关联的退货单,不可删除"
,
dividendsOrder
.
DividendsOrderNumber
))
}
}
}
// TODO 校验分红订单是否有分红预算
// 校验分红订单是否有分红预算
if
countRelative
,
_
,
err2
:=
dividendsEstimateRepository
.
Find
(
map
[
string
]
interface
{}{
"companyId"
:
dividendsOrder
.
Company
.
CompanyId
,
"orgId"
:
dividendsOrder
.
Org
.
OrgId
,
"orderOrReturnedOrderNum"
:
dividendsOrder
.
DividendsOrderNumber
,
"offsetLimit"
:
false
,
"isCanceled"
:
false
,
});
err2
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
err2
.
Error
())
}
else
{
if
countRelative
>
0
{
return
nil
,
application
.
ThrowError
(
application
.
INTERNAL_SERVER_ERROR
,
fmt
.
Sprintf
(
"分红订单%s有关联的预算单,不可删除"
,
dividendsOrder
.
DividendsOrderNumber
))
}
}
}
dividendsOrdersRemoved
,
err
:=
dividendsOrderRepository
.
BatchRemove
(
dividendsOrders
)
if
err
!=
nil
{
...
...
pkg/infrastructure/pg/models/dividends_estimate.go
查看文件 @
1b7e92b
...
...
@@ -42,7 +42,7 @@ type DividendsEstimate struct {
// 操作时间
OperateTime
time
.
Time
`comment:"操作时间"`
// 取消状态
IsCanceled
bool
`comment:"取消状态"`
IsCanceled
bool
`comment:"取消状态"
pg:",use_zero,default:false"
`
// 产品ID
OrderGoodId
int64
`comment:"产品ID"`
// 创建时间
...
...
pkg/infrastructure/repository/pg_dividends_estimate_repository.go
查看文件 @
1b7e92b
...
...
@@ -346,6 +346,9 @@ func (repository *DividendsEstimateRepository) Find(queryOptions map[string]inte
if
companyId
,
ok
:=
queryOptions
[
"companyId"
];
ok
&&
companyId
.
(
int64
)
!=
0
{
query
.
Where
(
"company->>'companyId' = '?'"
,
companyId
)
}
if
isCanceled
,
ok
:=
queryOptions
[
"isCanceled"
];
ok
{
query
.
Where
(
"is_canceled = ?"
,
isCanceled
.
(
bool
))
}
if
orgId
,
ok
:=
queryOptions
[
"orgId"
];
ok
&&
orgId
.
(
int64
)
!=
0
{
query
.
Where
(
"org->>'orgId' = '?'"
,
orgId
)
}
...
...
pkg/infrastructure/repository/pg_dividends_returned_order_repository.go
查看文件 @
1b7e92b
...
...
@@ -535,6 +535,9 @@ func (repository *DividendsReturnedOrderRepository) Find(queryOptions map[string
if
dividendsReturnedOrderIds
,
ok
:=
queryOptions
[
"dividendsReturnedOrderIds"
];
ok
&&
len
(
dividendsReturnedOrderIds
.
([]
int64
))
>
0
{
query
.
Where
(
"dividends_returned_order_id IN (?)"
,
pg
.
In
(
dividendsReturnedOrderIds
.
([]
int64
)))
}
if
dividendsOrderNumber
,
ok
:=
queryOptions
[
"dividendsOrderNumber"
];
ok
&&
dividendsOrderNumber
!=
""
{
query
.
Where
(
"dividends_order_number = ?"
,
dividendsOrderNumber
)
}
if
dividendsReturnedOrderNumber
,
ok
:=
queryOptions
[
"dividendsReturnedOrderNumber"
];
ok
&&
dividendsReturnedOrderNumber
!=
""
{
query
.
Where
(
"dividends_returned_order_number ilike ?"
,
fmt
.
Sprintf
(
"%%%s%%"
,
dividendsReturnedOrderNumber
))
}
...
...
请
注册
或
登录
后发表评论