Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
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
base_platform_enterprise
gic-platform-enterprise
Commits
69e22f27
Commit
69e22f27
authored
Nov 20, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加提示
parent
cc6575ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
BillingAccountServiceImpl.java
...ic/enterprise/service/impl/BillingAccountServiceImpl.java
+3
-2
PayStrategy.java
...om/gic/enterprise/service/outer/impl/pay/PayStrategy.java
+1
-1
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingAccountServiceImpl.java
View file @
69e22f27
...
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -51,6 +50,7 @@ public class BillingAccountServiceImpl implements BillingAccountService{
...
@@ -51,6 +50,7 @@ public class BillingAccountServiceImpl implements BillingAccountService{
}
}
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
int
updateAccountAfterRechargeOrRefund
(
double
totalFee
,
Integer
enterpriseId
)
{
public
int
updateAccountAfterRechargeOrRefund
(
double
totalFee
,
Integer
enterpriseId
)
{
RedissonClient
redisClient
=
RedisUtil
.
getRedisClient
();
RedissonClient
redisClient
=
RedisUtil
.
getRedisClient
();
...
@@ -58,7 +58,8 @@ public class BillingAccountServiceImpl implements BillingAccountService{
...
@@ -58,7 +58,8 @@ public class BillingAccountServiceImpl implements BillingAccountService{
account
.
addAndGet
(
totalFee
);
account
.
addAndGet
(
totalFee
);
TabBillingAccount
tabBillingAccount
=
tabBillingAccountMapper
.
selectByEnterpriseId
(
enterpriseId
);
TabBillingAccount
tabBillingAccount
=
tabBillingAccountMapper
.
selectByEnterpriseId
(
enterpriseId
);
double
newTotal
=
new
BigDecimal
(
tabBillingAccount
.
getAccountBalance
().
toString
()).
add
(
new
BigDecimal
(
totalFee
+
""
)).
doubleValue
();
// double newTotal = new BigDecimal(tabBillingAccount.getAccountBalance().toString()).add(new BigDecimal(totalFee + "")).doubleValue();
double
newTotal
=
tabBillingAccount
.
getAccountBalance
()
+
totalFee
;
logger
.
info
(
"商户:{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}"
,
enterpriseId
,
tabBillingAccount
.
getAccountBalance
(),
totalFee
,
newTotal
);
logger
.
info
(
"商户:{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}"
,
enterpriseId
,
tabBillingAccount
.
getAccountBalance
(),
totalFee
,
newTotal
);
UserDTO
user
=
userApiService
.
getUserByEnterpriseId
(
enterpriseId
).
getResult
();
UserDTO
user
=
userApiService
.
getUserByEnterpriseId
(
enterpriseId
).
getResult
();
todoItemService
.
finishTodoItem
(
enterpriseId
,
user
.
getUserId
(),
Constants
.
PRODUCT
,
config
.
getHost
()
+
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
todoItemService
.
finishTodoItem
(
enterpriseId
,
user
.
getUserId
(),
Constants
.
PRODUCT
,
config
.
getHost
()
+
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/PayStrategy.java
View file @
69e22f27
...
@@ -51,7 +51,7 @@ public interface PayStrategy {
...
@@ -51,7 +51,7 @@ public interface PayStrategy {
* @Title: callBack
* @Title: callBack
* @Description:
* @Description:
* @author taogs
* @author taogs
* @param resData
* @param resData
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
* @throws
*/
*/
...
...
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