切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
3f70779ef726f4a1c244a539519de63007c53f38
1 个父辈
ad62b033
master
...
dev
feature/multi-miniprogram
master20210315
master20210622
test
v0.8.0-dev
0.9.2
0.9.1
0.9.0
0.8.0
0.7.0
修复:bug-16 bug-24
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
15 行增加
和
10 行删除
pkg/application/orderinfo/service/order_info.go
pkg/infrastructure/domainService/pg_order_bonus_service.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
3f70779
...
...
@@ -814,6 +814,7 @@ func (service OrderInfoService) ListOrderBonusForExcel(listOrderQuery query.List
"partner_name"
:
result
[
i
]
.
PartnerName
,
"bonus_status"
:
""
,
"update_time"
:
result
[
i
]
.
UpdateTime
,
"create_time"
:
result
[
i
]
.
CreateTime
,
"partner_bonus"
:
fmt
.
Sprint
(
result
[
i
]
.
PartnerBonus
),
"partner_bonus_has"
:
fmt
.
Sprint
(
result
[
i
]
.
PartnerBonusHas
),
"partner_bonus_not"
:
fmt
.
Sprint
(
result
[
i
]
.
PartnerBonusNot
),
...
...
pkg/infrastructure/domainService/pg_order_bonus_service.go
查看文件 @
3f70779
...
...
@@ -393,7 +393,9 @@ func (serve *OrderBonusService) BatchPayPartnerBonus(orderIds []int64, adminId i
e
:=
fmt
.
Sprintf
(
"获取管理员用户(id=%d)数据失败,%s"
,
adminId
,
err
)
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
e
)
}
var
payEvents
[]
event
.
PayOrderGoodBonus
var
(
payEvents
[]
event
.
PayOrderGoodBonus
)
for
_
,
orderId
:=
range
orderIds
{
var
oldOrder
*
domain
.
OrderBase
oldOrder
,
err
=
orderBaseReponsitory
.
FindOne
(
domain
.
OrderBaseFindOneQuery
{
OrderId
:
orderId
})
...
...
@@ -440,17 +442,19 @@ func (serve *OrderBonusService) BatchPayPartnerBonus(orderIds []int64, adminId i
if
err
!=
nil
{
return
lib
.
ThrowError
(
lib
.
INTERNAL_SERVER_ERROR
,
err
.
Error
())
}
//构建事件
payEvent
:=
event
.
PayOrderGoodBonus
{
OrderBase
:
oldOrder
,
Goods
:
updateGoods
,
Admin
:
&
adminUser
,
}
payEvents
=
append
(
payEvents
,
payEvent
)
}
//构建事件
payEvent
:=
event
.
PayOrderGoodBonus
{
OrderBase
:
oldOrder
,
Goods
:
updateGoods
,
Admin
:
&
adminUser
,
}
payEvents
=
append
(
payEvents
,
payEvent
)
}
if
err
=
serve
.
Publish
(
event
.
BatchPayOrderGoodBonus
(
payEvents
));
err
!=
nil
{
return
err
if
len
(
payEvents
)
>
0
{
if
err
=
serve
.
Publish
(
event
.
BatchPayOrderGoodBonus
(
payEvents
));
err
!=
nil
{
return
err
}
}
return
nil
}
...
...
请
注册
或
登录
后发表评论