切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
5 years ago
提交
8ef802cad9785329f9eb5e8e3046a6d89a43dca4
1 个父辈
79d28087
master
...
dev
feature/multi-miniprogram
master20210315
master20210622
sample01
test
v0.8.0-dev
0.9.2
0.9.1
0.9.0
0.8.0
0.7.0
0.6.0
0.5.0
0.5.0-1
0.4.0
0.3.0
0.3.0-1
0.2.0
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
11 行增加
和
5 行删除
pkg/domain/order_base.go
pkg/domain/order_good.go
pkg/domain/order_base.go
查看文件 @
8ef802c
...
...
@@ -158,10 +158,16 @@ func (order *OrderBase) Compute() error {
if
hasUseOrderAmount
{
order
.
OrderCompute
.
UseOrderAmount
,
_
=
useOrderAmount
.
Round
(
2
)
.
Float64
()
//计算业务员的抽成
order
.
OrderCompute
.
SalesmanBonus
,
_
=
useOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
SalesmanBonus
,
_
=
useOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
.
Round
(
2
)
.
Float64
()
}
else
{
order
.
OrderCompute
.
UseOrderAmount
=
-
1
order
.
OrderCompute
.
SalesmanBonus
,
_
=
planOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
SalesmanBonus
,
_
=
planOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
.
Round
(
2
)
.
Float64
()
}
if
HasUseOrderCount
{
order
.
OrderCompute
.
UseOrderCount
=
useOrderCount
...
...
pkg/domain/order_good.go
查看文件 @
8ef802c
...
...
@@ -150,7 +150,7 @@ func (good *OrderGood) Compute() error {
price
:=
decimal
.
NewFromFloat
(
good
.
Price
)
planamount
:=
price
.
Mul
(
decimal
.
NewFromInt
(
int64
(
good
.
PlanGoodNumber
)))
//price*planGoodNumber
//price*useGoodNumber
planPartnerBonus
:=
planamount
.
Mul
(
decimal
.
NewFromFloat
(
good
.
PartnerBonusPercent
))
//price*planGoodNumber*PartnerBonusPercent
planPartnerBonus
:=
planamount
.
Mul
(
decimal
.
NewFromFloat
(
good
.
PartnerBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
//price*planGoodNumber*PartnerBonusPercent
good
.
GoodCompute
.
PlanAmount
,
_
=
planamount
.
Round
(
2
)
.
Float64
()
good
.
GoodCompute
.
PlanPartnerBonus
,
_
=
planPartnerBonus
.
Round
(
2
)
.
Float64
()
if
good
.
UseGoodNumber
<
0
{
...
...
@@ -160,8 +160,8 @@ func (good *OrderGood) Compute() error {
}
else
{
//计算调整后的货品总值
//计算调整后的合伙人分红
useamount
:=
price
.
Mul
(
decimal
.
NewFromInt
(
int64
(
good
.
UseGoodNumber
)))
//price*useGoodNumber/price*useGoodNumber
usePartnerBonus
:=
useamount
.
Mul
(
decimal
.
NewFromFloat
(
good
.
PartnerBonusPercent
))
//price*useGoodNumber*PartnerBonusPercent
useamount
:=
price
.
Mul
(
decimal
.
NewFromInt
(
int64
(
good
.
UseGoodNumber
)))
//price*useGoodNumber/price*useGoodNumber
usePartnerBonus
:=
useamount
.
Mul
(
decimal
.
NewFromFloat
(
good
.
PartnerBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
//price*useGoodNumber*PartnerBonusPercent
good
.
GoodCompute
.
UsePartnerBonus
,
_
=
usePartnerBonus
.
Round
(
2
)
.
Float64
()
good
.
GoodCompute
.
UseAmount
,
_
=
useamount
.
Round
(
2
)
.
Float64
()
}
...
...
请
注册
或
登录
后发表评论