切换导航条
此项目
正在载入...
登录
allied-creation
/
allied-creation-gateway
·
提交
转到一个项目
GitLab
转到群组
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
yangfu
3 years ago
提交
b58299000973f77ea95a0457f3c1f74715597f4c
1 个父辈
5ecd28c8
个人首页统计修改
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
16 行增加
和
6 行删除
pkg/application/mobile/cooperation/service/statistics_person.go
pkg/application/mobile/cooperation/service/statistics_person.go
查看文件 @
b582990
...
...
@@ -56,7 +56,7 @@ func (srv PersonStatisticsService) IndexStatistics(cmd *command.IndexStatisticsC
beginTime
:=
time
.
Date
(
year
,
month
,
1
,
0
,
0
,
0
,
0
,
time
.
Local
)
endTime
:=
beginTime
.
AddDate
(
0
,
1
,
0
)
// 2.本月分红统计 - 个人
dividendStatistics
Result
,
err
:=
gateway
.
CooperationStatistics
(
allied_creation_cooperation
.
CreditAccountStatistics
,
map
[
string
]
interface
{}{
unPaid
Result
,
err
:=
gateway
.
CooperationStatistics
(
allied_creation_cooperation
.
CreditAccountStatistics
,
map
[
string
]
interface
{}{
"userBaseId"
:
cmd
.
Operator
.
UserBaseId
,
"beginTime"
:
beginTime
,
"endTime"
:
endTime
,
...
...
@@ -71,14 +71,24 @@ func (srv PersonStatisticsService) IndexStatistics(cmd *command.IndexStatisticsC
Paid
float64
`json:"paid"`
Unpaid
float64
`json:"unpaid"`
}
var
annualDividend
=
&
AnnualDividend
{}
if
err
:=
json
.
UnmarshalFromString
(
json
.
MarshalToString
(
dividendStatisticsResult
),
annualDividend
);
err
!=
nil
{
var
annualUnPaidDividend
=
&
AnnualDividend
{}
if
err
:=
json
.
UnmarshalFromString
(
json
.
MarshalToString
(
unPaidResult
),
annualUnPaidDividend
);
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
// 2.本月分红统计 - 个人
paymentResult
,
err
:=
gateway
.
CooperationStatistics
(
allied_creation_cooperation
.
CreditAccountStatistics
,
map
[
string
]
interface
{}{
"userBaseId"
:
cmd
.
Operator
.
UserBaseId
,
"paymentBeginTime"
:
beginTime
,
"paymentEndTime"
:
endTime
,
})
var
annualPaymentDividend
=
&
AnnualDividend
{}
if
err
:=
json
.
UnmarshalFromString
(
json
.
MarshalToString
(
paymentResult
),
annualPaymentDividend
);
err
!=
nil
{
return
nil
,
application
.
ThrowError
(
application
.
BUSINESS_ERROR
,
err
.
Error
())
}
dividendStatistics
:=
map
[
string
]
interface
{}{
"dividendAmount"
:
annualDividend
.
Paid
+
annualDividend
.
Unpaid
,
// 分红金额 annualDividend.Total
"paidAmount"
:
annualDividend
.
Paid
,
// 已支付
"unPaidAmount"
:
annualDividend
.
Unpaid
,
// 未支付
"dividendAmount"
:
annualPaymentDividend
.
Paid
+
annualUnPaidDividend
.
Unpaid
,
// 分红金额 annualDividend.Total
"paidAmount"
:
annualPaymentDividend
.
Paid
,
// 已支付
"unPaidAmount"
:
annualUnPaidDividend
.
Unpaid
,
// 未支付
}
return
map
[
string
]
interface
{}{
...
...
请
注册
或
登录
后发表评论