Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
token
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
wallet
token
Commits
f1ecef2b
Commit
f1ecef2b
authored
Nov 30, 2018
by
ZhuChunYang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释添加
parent
b182bb10
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
CoinPublishRule.php
common/models/psources/CoinPublishRule.php
+5
-5
No files found.
common/models/psources/CoinPublishRule.php
View file @
f1ecef2b
...
...
@@ -217,7 +217,7 @@ class CoinPublishRule extends BaseActiveRecord
/**
* 获取时间范围内的有效任务(将要执行的)
*
*
zcy 判断release_time 根据$repeat 规则 在不在 $start和$end范围内
* @param string $start 时间戳
* @param string $end 时间戳
* @param integer $repeat 重复方法
...
...
@@ -275,13 +275,13 @@ class CoinPublishRule extends BaseActiveRecord
public
static
function
calReleaseAmountMonth
(
$lock_present
,
$rel_present
,
$type
,
$repeat
,
$amount
,
$freeze
,
$timestamp
,
$month_end
,
$release_timestamp
)
{
$result
=
0
;
$is_
executed
=
self
::
isVariableInRange
(
$timestamp
,
$month_end
,
$repeat
,
$release_timestamp
);
if
(
$is_executed
)
{
$result
+=
self
::
calReleaseAmount
(
$lock_present
,
$rel_present
,
$type
,
$amount
,
$freeze
,
0
);
$is_
need_executed
=
self
::
isVariableInRange
(
$timestamp
,
$month_end
,
$repeat
,
$release_timestamp
);
// zcy 是否将要释放
if
(
$is_
need_
executed
)
{
$result
+=
self
::
calReleaseAmount
(
$lock_present
,
$rel_present
,
$type
,
$amount
,
$freeze
,
0
);
//zcy 这次将需要释放的量
}
else
{
//如果是第一次添加的不计算
if
(
$amount
*
$lock_present
/
100
!=
$freeze
)
{
$result
+=
self
::
calReleaseAmount
(
$lock_present
,
$rel_present
,
$type
,
$amount
,
$freeze
,
-
1
);
$result
+=
self
::
calReleaseAmount
(
$lock_present
,
$rel_present
,
$type
,
$amount
,
$freeze
,
-
1
);
//zcy 这次已经释放过的量(上次释放的量)
}
}
return
$result
;
...
...
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