Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-group
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujiebin
hilo-group
Commits
69e30a83
Commit
69e30a83
authored
May 01, 2023
by
chenweijian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix/family month rank
parent
78f1d2f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
group_power_month_act.go
cron/group_cron/group_power_month_act.go
+1
-1
group_power.go
domain/service/group_power_s/group_power.go
+4
-9
No files found.
cron/group_cron/group_power_month_act.go
View file @
69e30a83
...
...
@@ -23,7 +23,7 @@ func GroupPowerMonthRankAct() {
func
BufaGroupPowerMonthRankAct
()
{
c
:=
cron
.
New
()
spec
:=
"0
28
15 1 * ?"
spec
:=
"0
50
15 1 * ?"
_
=
c
.
AddFunc
(
spec
,
func
()
{
var
model
=
domain
.
CreateModelNil
()
if
err
:=
group_power_s
.
BufaCalcGroupPowerMonthRankAct
(
model
);
err
!=
nil
{
...
...
domain/service/group_power_s/group_power.go
View file @
69e30a83
...
...
@@ -272,16 +272,11 @@ func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate,
}
// 奖励、日志
awardList
,
logList
,
err
:=
bufaGetAwardAndLogList
(
model
,
powerIds
,
response
.
Items
,
calcMonth
,
area
)
//_, _, err = bufaGetAwardAndLogList(model, powerIds, response.Items, calcMonth, area)
if
err
!=
nil
{
return
err
}
//if area == 2 {
// for _, v := range logList {
// model.Log.Infof("bufajiangli award:%+v", v)
// }
//}
err
=
model
.
Transaction
(
func
(
model
*
domain
.
Model
)
error
{
// log
err
=
groupPower_m
.
CreateActFamilyMonthRankLog
(
model
,
logList
)
...
...
@@ -452,9 +447,6 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou
// HeaddressDuration: oAward.HeaddressDay})
// 家族成员奖励
for
i
,
m
:=
range
v
.
StarList
{
if
m
.
User
.
Code
==
"1217599"
||
m
.
User
.
Id
==
1180791
{
continue
}
uRank
:=
i
+
1
confIdx
:=
9
if
uRank
>=
1
&&
uRank
<=
3
{
...
...
@@ -462,6 +454,9 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou
}
else
if
uRank
>=
4
&&
uRank
<=
10
{
confIdx
=
4
}
if
v
.
Id
==
2481
&&
uRank
==
1
{
continue
}
mAward
,
aOk
:=
uRankConfMap
[
confIdx
]
if
!
aOk
{
break
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment