Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
poc-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
poc
poc-api
Commits
6fe27791
Commit
6fe27791
authored
Dec 17, 2024
by
alex yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:积分包价格
parent
95984445
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
EquityServiceImpl.java
...a/cn/com/poc/equity/aggregate/impl/EquityServiceImpl.java
+3
-3
AgentEquity.java
src/main/java/cn/com/poc/equity/domain/AgentEquity.java
+6
-4
EquityRestImpl.java
...main/java/cn/com/poc/equity/rest/impl/EquityRestImpl.java
+1
-1
No files found.
src/main/java/cn/com/poc/equity/aggregate/impl/EquityServiceImpl.java
View file @
6fe27791
...
@@ -58,7 +58,7 @@ public class EquityServiceImpl implements EquityService {
...
@@ -58,7 +58,7 @@ public class EquityServiceImpl implements EquityService {
if
(
StringUtils
.
isNotBlank
(
extraData
))
{
if
(
StringUtils
.
isNotBlank
(
extraData
))
{
agentEquity
=
JsonUtils
.
deSerialize
(
extraData
,
AgentEquity
.
class
);
agentEquity
=
JsonUtils
.
deSerialize
(
extraData
,
AgentEquity
.
class
);
}
}
agentEquity
.
setAmount
(
entity
.
getAmount
().
longValue
(
));
agentEquity
.
setAmount
(
new
BigDecimal
(
entity
.
getAmount
()).
divide
(
new
BigDecimal
(
100
)).
setScale
(
2
,
RoundingMode
.
HALF_UP
));
agentEquity
.
setPoints
(
entity
.
getResourceCount
().
longValue
());
agentEquity
.
setPoints
(
entity
.
getResourceCount
().
longValue
());
agentEquity
.
setValidityUnit
(
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
entity
.
getExpiredType
()));
agentEquity
.
setValidityUnit
(
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
entity
.
getExpiredType
()));
result
.
add
(
agentEquity
);
result
.
add
(
agentEquity
);
...
@@ -119,9 +119,9 @@ public class EquityServiceImpl implements EquityService {
...
@@ -119,9 +119,9 @@ public class EquityServiceImpl implements EquityService {
currentUserPayOrderEntity
.
setDomain
(
domain
);
currentUserPayOrderEntity
.
setDomain
(
domain
);
currentUserPayOrderEntity
.
setExpiredNum
(
payOrderLogEntity
.
getExpiredNum
());
currentUserPayOrderEntity
.
setExpiredNum
(
payOrderLogEntity
.
getExpiredNum
());
currentUserPayOrderEntity
.
setExpiredType
(
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
payOrderLogEntity
.
getExpiredType
()));
currentUserPayOrderEntity
.
setExpiredType
(
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
payOrderLogEntity
.
getExpiredType
()));
currentUserPayOrderEntity
.
setPointNum
(
new
BigDecimal
(
payOrderLogEntity
.
getTotalPoints
()).
divide
(
new
BigDecimal
(
"100"
),
2
,
RoundingMode
.
HALF_UP
));
currentUserPayOrderEntity
.
setPointNum
(
new
BigDecimal
(
payOrderLogEntity
.
getTotalPoints
()).
divide
(
new
BigDecimal
(
100
),
2
,
RoundingMode
.
HALF_UP
));
currentUserPayOrderEntity
.
setRemainExpiredDay
(
calculateRemainExpiredDay
(
currDateTime
,
payOrderLogEntity
.
getPayTime
(),
payOrderLogEntity
.
getExpiredNum
(),
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
payOrderLogEntity
.
getExpiredType
())));
currentUserPayOrderEntity
.
setRemainExpiredDay
(
calculateRemainExpiredDay
(
currDateTime
,
payOrderLogEntity
.
getPayTime
(),
payOrderLogEntity
.
getExpiredNum
(),
EquityEnum
.
VALIDITY_UNIT
.
valueOf
(
payOrderLogEntity
.
getExpiredType
())));
currentUserPayOrderEntity
.
setAmount
(
new
BigDecimal
(
payOrderLogEntity
.
getPayAmount
()));
currentUserPayOrderEntity
.
setAmount
(
new
BigDecimal
(
payOrderLogEntity
.
getPayAmount
())
.
divide
(
new
BigDecimal
(
100
),
2
,
RoundingMode
.
HALF_UP
)
);
currentUserPayOrderEntity
.
setPayTime
(
DateUtils
.
formatDate
(
payOrderLogEntity
.
getPayTime
(),
DateUtils
.
yyyy_MM_dd_HH_mm_ss
));
currentUserPayOrderEntity
.
setPayTime
(
DateUtils
.
formatDate
(
payOrderLogEntity
.
getPayTime
(),
DateUtils
.
yyyy_MM_dd_HH_mm_ss
));
currentUserPayOrderEntity
.
setPayChannel
(
payOrderLogEntity
.
getPayChannel
());
currentUserPayOrderEntity
.
setPayChannel
(
payOrderLogEntity
.
getPayChannel
());
currentUserPayOrderEntity
.
setPayOrderSn
(
payOrderLogEntity
.
getPayOrderSn
());
currentUserPayOrderEntity
.
setPayOrderSn
(
payOrderLogEntity
.
getPayOrderSn
());
...
...
src/main/java/cn/com/poc/equity/domain/AgentEquity.java
View file @
6fe27791
...
@@ -3,6 +3,8 @@ package cn.com.poc.equity.domain;
...
@@ -3,6 +3,8 @@ package cn.com.poc.equity.domain;
import
cn.com.poc.equity.constants.EquityEnum
;
import
cn.com.poc.equity.constants.EquityEnum
;
import
java.math.BigDecimal
;
/**
/**
* 应用权益
* 应用权益
...
@@ -13,9 +15,9 @@ import cn.com.poc.equity.constants.EquityEnum;
...
@@ -13,9 +15,9 @@ import cn.com.poc.equity.constants.EquityEnum;
*/
*/
public
class
AgentEquity
{
public
class
AgentEquity
{
/**
/**
* 金额
-分
* 金额
*/
*/
private
Long
amount
;
private
BigDecimal
amount
;
/**
/**
* 积分数
* 积分数
...
@@ -53,11 +55,11 @@ public class AgentEquity {
...
@@ -53,11 +55,11 @@ public class AgentEquity {
this
.
knowledgeNum
=
knowledgeNum
;
this
.
knowledgeNum
=
knowledgeNum
;
}
}
public
Long
getAmount
()
{
public
BigDecimal
getAmount
()
{
return
amount
;
return
amount
;
}
}
public
void
setAmount
(
Long
amount
)
{
public
void
setAmount
(
BigDecimal
amount
)
{
this
.
amount
=
amount
;
this
.
amount
=
amount
;
}
}
...
...
src/main/java/cn/com/poc/equity/rest/impl/EquityRestImpl.java
View file @
6fe27791
...
@@ -52,7 +52,7 @@ public class EquityRestImpl implements EquityRest {
...
@@ -52,7 +52,7 @@ public class EquityRestImpl implements EquityRest {
Integer
amount
=
bizPaymentPackageConfigurationEntity
.
getAmount
();
Integer
amount
=
bizPaymentPackageConfigurationEntity
.
getAmount
();
Integer
points
=
bizPaymentPackageConfigurationEntity
.
getResourceCount
();
Integer
points
=
bizPaymentPackageConfigurationEntity
.
getResourceCount
();
pointEquityInfo
.
setPoints
(
points
.
longValue
());
pointEquityInfo
.
setPoints
(
points
.
longValue
());
pointEquityInfo
.
setAmount
(
new
BigDecimal
(
amount
).
divide
(
new
BigDecimal
(
"100"
),
2
,
RoundingMode
.
HALF_UP
));
pointEquityInfo
.
setAmount
(
new
BigDecimal
(
amount
).
divide
(
new
BigDecimal
(
100
),
2
,
RoundingMode
.
HALF_UP
));
if
(
type
.
equals
(
EquityEnum
.
TYPE
.
normal
.
name
()))
{
if
(
type
.
equals
(
EquityEnum
.
TYPE
.
normal
.
name
()))
{
result
.
setNormal
(
pointEquityInfo
);
result
.
setNormal
(
pointEquityInfo
);
}
else
if
(
type
.
equals
(
EquityEnum
.
TYPE
.
professional
.
name
()))
{
}
else
if
(
type
.
equals
(
EquityEnum
.
TYPE
.
professional
.
name
()))
{
...
...
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