切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
唐旭辉
4 years ago
提交
960b08bf151727b1bbb299dadea07aa98cabbaab
1 个父辈
5a69f804
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-26
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
16 行增加
和
8 行删除
pkg/application/orderinfo/service/order_info.go
pkg/domain/event/payOrderGoodBonus.go
pkg/application/orderinfo/service/order_info.go
查看文件 @
960b08b
...
...
@@ -815,10 +815,10 @@ func (service OrderInfoService) ListOrderBonusForExcel(listOrderQuery query.List
"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
),
"partner_bonus_expense"
:
fmt
.
Sprint
(
result
[
i
]
.
PartnerBonusExpense
),
"partner_bonus"
:
fmt
.
Sprintf
(
"%10.2f"
,
result
[
i
]
.
PartnerBonus
),
"partner_bonus_has"
:
fmt
.
Sprintf
(
"%10.2f"
,
result
[
i
]
.
PartnerBonusHas
),
"partner_bonus_not"
:
fmt
.
Sprintf
(
"%10.2f"
,
result
[
i
]
.
PartnerBonusNot
),
"partner_bonus_expense"
:
fmt
.
Sprintf
(
"%10.2f"
,
result
[
i
]
.
PartnerBonusExpense
),
}
if
result
[
i
]
.
HasBonusPercent
==
0
{
m
[
"partner_bonus"
]
=
"-"
...
...
@@ -894,13 +894,19 @@ func (service OrderInfoService) ListOrderForExcel(listOrderQuery query.ListOrder
"update_time"
:
ordersData
[
i
]
.
UpdateTime
,
"create_time"
:
ordersData
[
i
]
.
CreateTime
,
"plan_order_count"
:
fmt
.
Sprint
(
ordersData
[
i
]
.
PlanOrderCount
),
"use_order_count"
:
fmt
.
Sprint
(
ordersData
[
i
]
.
UseOrderCount
)
,
"use_order_count"
:
""
,
"region_name"
:
fmt
.
Sprint
(
ordersData
[
i
]
.
RegionName
),
"plan_order_amount"
:
fmt
.
Sprint
(
ordersData
[
i
]
.
PlanOrderAmount
),
"user_order_amount"
:
fmt
.
Sprint
(
ordersData
[
i
]
.
UseOrderAmount
),
"plan_order_amount"
:
fmt
.
Sprintf
(
"%10.2f"
,
ordersData
[
i
]
.
PlanOrderAmount
),
"use_order_amount"
:
""
,
"partner_category"
:
ordersData
[
i
]
.
PartnerCategory
,
"buyer_name"
:
ordersData
[
i
]
.
BuyerName
,
}
if
ordersData
[
i
]
.
UseOrderCount
>=
0
{
m
[
"use_order_count"
]
=
fmt
.
Sprint
(
ordersData
[
i
]
.
UseOrderCount
)
}
if
ordersData
[
i
]
.
UseOrderAmount
>=
0
{
m
[
"use_order_amount"
]
=
fmt
.
Sprintf
(
"%10.2f"
,
ordersData
[
i
]
.
UseOrderAmount
)
}
resultMaps
=
append
(
resultMaps
,
m
)
}
column
:=
[][
2
]
string
{
...
...
pkg/domain/event/payOrderGoodBonus.go
查看文件 @
960b08b
...
...
@@ -8,6 +8,8 @@ const (
BATCH_PAY_ORDER_GOOD_BONUS_EVENT
string
=
"BatchPayOrderGoodBonus"
)
//BatchPayOrderGoodBonus
//事件:批量支付一个订单中货品的分红
type
BatchPayOrderGoodBonus
[]
PayOrderGoodBonus
func
(
p
BatchPayOrderGoodBonus
)
EventType
()
string
{
...
...
@@ -15,7 +17,7 @@ func (p BatchPayOrderGoodBonus) EventType() string {
}
//PayOrderGoodBonus
//事件:
批量
支付一个订单中货品的分红
//事件:支付一个订单中货品的分红
type
PayOrderGoodBonus
struct
{
OrderBase
*
domain
.
OrderBase
Goods
[]
domain
.
OrderGood
...
...
请
注册
或
登录
后发表评论