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
05752a0a
Commit
05752a0a
authored
May 07, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
5409ea70
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
BillingAccountServiceImpl.java
...ic/enterprise/service/impl/BillingAccountServiceImpl.java
+4
-1
AuditLogApiServiceImpl.java
...enterprise/service/outer/impl/AuditLogApiServiceImpl.java
+3
-2
BillingAccountApiServiceImpl.java
...rise/service/outer/impl/BillingAccountApiServiceImpl.java
+1
-1
No files found.
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingAccountServiceImpl.java
View file @
05752a0a
...
...
@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import
com.gic.auth.dto.UserDTO
;
import
com.gic.auth.service.UserApiService
;
import
com.gic.enterprise.config.Config
;
import
com.gic.enterprise.constant.Constants
;
import
com.gic.enterprise.dao.mapper.TabBillingAccountMapper
;
import
com.gic.enterprise.entity.TabBillingAccount
;
...
...
@@ -28,6 +29,8 @@ public class BillingAccountServiceImpl implements BillingAccountService{
private
TodoItemService
todoItemService
;
@Autowired
private
UserApiService
userApiService
;
@Autowired
private
Config
config
;
@Override
public
TabBillingAccount
getByEnterpriseId
(
Integer
enterpriseId
)
{
...
...
@@ -51,7 +54,7 @@ public class BillingAccountServiceImpl implements BillingAccountService{
double
newTotal
=
new
BigDecimal
(
tabBillingAccount
.
getAccountBalance
().
toString
()).
add
(
new
BigDecimal
(
totalFee
+
""
)).
doubleValue
();
logger
.
info
(
"商户:{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}"
,
enterpriseId
,
tabBillingAccount
.
getAccountBalance
(),
totalFee
,
newTotal
);
UserDTO
user
=
userApiService
.
getUserByEnterpriseId
(
enterpriseId
).
getResult
();
todoItemService
.
finishTodoItem
(
enterpriseId
,
user
.
getUserId
(),
Constants
.
PRODUCT
,
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
todoItemService
.
finishTodoItem
(
enterpriseId
,
user
.
getUserId
(),
Constants
.
PRODUCT
,
config
.
getHost
()
+
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
return
tabBillingAccountMapper
.
updateAccountAfterRechargeOrRefund
(
totalFee
,
enterpriseId
);
}
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AuditLogApiServiceImpl.java
View file @
05752a0a
...
...
@@ -170,7 +170,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
// 事项code
todoItemDTO
.
setItemType
(
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT
);
// 事项url
todoItemDTO
.
setItemInfoUrl
(
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT_URL
+
"?auditLogId="
+
auditLogId
);
todoItemDTO
.
setItemInfoUrl
(
co
nfig
.
getHost
()
+
co
m
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT_URL
+
"?auditLogId="
+
auditLogId
);
todoItemApiService
.
saveTodoItem
(
todoItemDTO
);
}
}
...
...
@@ -205,7 +205,8 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ServiceResponse
<
AuditLogDTO
>
audit
(
AuditLogDTO
auditLogDTO
)
{
// 完成待办事项
todoItemApiService
.
finishTodoItem
(
auditLogDTO
.
getEnterpriseId
(),
auditLogDTO
.
getAuditorId
(),
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT
,
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT_URL
+
"?auditLogId="
+
auditLogDTO
.
getAuditLogId
());
todoItemApiService
.
finishTodoItem
(
auditLogDTO
.
getEnterpriseId
(),
auditLogDTO
.
getAuditorId
(),
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT
,
config
+
com
.
gic
.
enterprise
.
constant
.
Constants
.
TODO_ITEM_AUDIT_URL
+
"?auditLogId="
+
auditLogDTO
.
getAuditLogId
());
TabAuditLog
auditLog
=
this
.
auditLogService
.
getAuditById
(
auditLogDTO
.
getAuditLogId
());
if
(
auditLog
==
null
)
{
...
...
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingAccountApiServiceImpl.java
View file @
05752a0a
...
...
@@ -260,7 +260,7 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
// 事项code 在运维后台字典配置 类目:待办事项类型
todoItemDTO
.
setItemType
(
Constants
.
PRODUCT
);
// 跳转地址 待办事项点击后要跳转的地址
todoItemDTO
.
setItemInfoUrl
(
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
todoItemDTO
.
setItemInfoUrl
(
config
.
getHost
()
+
Constants
.
TODO_ITEM_ACCOUNT_BALANCE_URL
);
todoItemApiService
.
saveTodoItem
(
todoItemDTO
);
}
...
...
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