切换导航条
此项目
正在载入...
登录
mmm-go
/
partnermg
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
tangxvhui
5 years ago
提交
e7ad952f89d4a756c038015d9fcd9cf734c1a300
1 个父辈
251228b8
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
更新
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
14 行增加
和
14 行删除
pkg/domain/order_base.go
pkg/domain/order_good.go
pkg/port/beego/controllers/order_info_controlller.go
pkg/domain/order_base.go
查看文件 @
e7ad952
...
...
@@ -143,31 +143,31 @@ func (order *OrderBase) Compute() error {
partnerBonusExpense
=
partnerBonusExpense
.
Add
(
decimal
.
NewFromFloat
(
order
.
Goods
[
i
]
.
GoodCompute
.
PartnerBonusExpense
))
}
//汇总赋值
order
.
OrderCompute
.
PartnerBonusExpense
,
_
=
partnerBonusExpense
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
PartnerBonusHas
,
_
=
partnerBonusHas
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
PartnerBonusNot
,
_
=
partnerBonusNot
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
PlanPartnerBonus
,
_
=
planPartnerBonus
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
PlanOrderAmount
,
_
=
planOrderAmount
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
PartnerBonusExpense
,
_
=
partnerBonusExpense
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
order
.
OrderCompute
.
PartnerBonusHas
,
_
=
partnerBonusHas
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
order
.
OrderCompute
.
PartnerBonusNot
,
_
=
partnerBonusNot
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
order
.
OrderCompute
.
PlanPartnerBonus
,
_
=
planPartnerBonus
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
order
.
OrderCompute
.
PlanOrderAmount
,
_
=
planOrderAmount
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
order
.
OrderCompute
.
PlanOrderCount
=
planOrderCount
if
hasUsePartnerBonus
{
order
.
OrderCompute
.
UsePartnerBonus
,
_
=
usePartnerBonus
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
UsePartnerBonus
,
_
=
usePartnerBonus
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
}
else
{
order
.
OrderCompute
.
UsePartnerBonus
=
-
1
}
if
hasUseOrderAmount
{
order
.
OrderCompute
.
UseOrderAmount
,
_
=
useOrderAmount
.
Round
(
2
)
.
Float64
()
order
.
OrderCompute
.
UseOrderAmount
,
_
=
useOrderAmount
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
//计算业务员的抽成
order
.
OrderCompute
.
SalesmanBonus
,
_
=
useOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
.
Round
(
2
)
.
Float64
()
Round
(
2
)
.
BigFloat
()
.
Float64
()
}
else
{
order
.
OrderCompute
.
UseOrderAmount
=
-
1
order
.
OrderCompute
.
SalesmanBonus
,
_
=
planOrderAmount
.
Mul
(
decimal
.
NewFromFloat
(
order
.
SalesmanBonusPercent
))
.
Div
(
decimal
.
NewFromInt
(
100
))
.
Round
(
2
)
.
Float64
()
Round
(
2
)
.
BigFloat
()
.
Float64
()
}
if
HasUseOrderCount
{
order
.
OrderCompute
.
UseOrderCount
=
useOrderCount
...
...
pkg/domain/order_good.go
查看文件 @
e7ad952
...
...
@@ -151,8 +151,8 @@ func (good *OrderGood) Compute() error {
planamount
:=
price
.
Mul
(
decimal
.
NewFromInt
(
int64
(
good
.
PlanGoodNumber
)))
//price*planGoodNumber
//price*useGoodNumber
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
()
good
.
GoodCompute
.
PlanAmount
,
_
=
planamount
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
good
.
GoodCompute
.
PlanPartnerBonus
,
_
=
planPartnerBonus
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
if
good
.
UseGoodNumber
<
0
{
//没有出现数量调整
good
.
GoodCompute
.
UsePartnerBonus
=
-
1
...
...
@@ -162,8 +162,8 @@ func (good *OrderGood) Compute() error {
//计算调整后的合伙人分红
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
()
good
.
GoodCompute
.
UsePartnerBonus
,
_
=
usePartnerBonus
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
good
.
GoodCompute
.
UseAmount
,
_
=
useamount
.
Round
(
2
)
.
BigFloat
()
.
Float64
()
}
return
nil
...
...
pkg/port/beego/controllers/order_info_controlller.go
查看文件 @
e7ad952
...
...
@@ -235,7 +235,7 @@ func (postData postOrderGood) Valid() error {
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"合伙人分红比例超额"
)
}
partnerRatio
:=
fmt
.
Sprint
(
postData
.
PartnerRatio
)
regexpStr
:=
`^(100|[1-9]\d|\d)(.\d{1,2})$`
regexpStr
:=
`^(100|[1-9]\d|\d)(.\d{1,2})
?
$`
ok
:=
regexp
.
MustCompile
(
regexpStr
)
.
MatchString
(
partnerRatio
)
if
!
ok
{
return
lib
.
ThrowError
(
lib
.
ARG_ERROR
,
"合伙人分红比例精确到小数点2位"
)
...
...
请
注册
或
登录
后发表评论