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
869119f6
Commit
869119f6
authored
Apr 27, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
计费中心:开票、续订设置操作日志调整
parent
6c83161e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
BillingAccountController.java
...c/enterprise/web/controller/BillingAccountController.java
+13
-2
BillingPayInfoController.java
...c/enterprise/web/controller/BillingPayInfoController.java
+1
-1
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingAccountController.java
View file @
869119f6
...
...
@@ -12,6 +12,9 @@ import javax.validation.constraints.NotNull;
import
com.ctrip.framework.apollo.Config
;
import
com.ctrip.framework.apollo.ConfigService
;
import
com.gic.enterprise.constant.billing.AutoRechargeEnum
;
import
com.gic.enterprise.dto.BillingAccountDTO
;
import
com.gic.redis.data.util.RedisUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -114,10 +117,18 @@ public class BillingAccountController {
@RequestMapping
(
"/set-auto-recharge"
)
public
RestResponse
setAutoRecharge
(
@NotBlank
(
message
=
"指定套餐包不能为空"
)
String
smsCode
,
@NotNull
(
message
=
"自动续订条件不能为空"
)
Integer
preNumber
)
{
ServiceResponse
<
BillingAccountDTO
>
billingAccountResponse
=
billingAccountApiService
.
getByEnterpriseId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
String
operationTypeStr
=
"开启"
;
if
(
billingAccountResponse
.
isSuccess
())
{
if
(
billingAccountResponse
.
getResult
().
getAutoRecharge
().
intValue
()
!=
AutoRechargeEnum
.
NO_AUTO
.
getCode
())
{
operationTypeStr
=
"修改"
;
}
}
return
OperationResultUtils
.
operationResult
(
billingAccountApiService
.
setAutoRecharge
(
smsCode
,
preNumber
,
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
()),
"自动续订短信套餐包配置"
,
UserDetailUtils
.
getUserDetail
().
getEnterpriseInfo
().
getEnterpriseName
()
);
operationTypeStr
+
"自动续充设置"
,
"资源监控"
);
}
/**
...
...
@@ -131,7 +142,7 @@ public class BillingAccountController {
public
RestResponse
closeAutoRechargeConfig
()
{
return
OperationResultUtils
.
operationResult
(
billingAccountApiService
.
closeAutoRechargeConfig
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
()),
"关闭自动续
订短信套餐包配置"
,
UserDetailUtils
.
getUserDetail
().
getEnterpriseInfo
().
getEnterpriseName
()
);
"关闭自动续
充设置"
,
"资源监控"
);
}
/**
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingPayInfoController.java
View file @
869119f6
...
...
@@ -156,7 +156,7 @@ public class BillingPayInfoController {
if
(
invoice
.
isSuccess
())
{
ServiceResponse
updateInvoiceStatus
=
billingPayInfoApiService
.
updateInvoiceStatus
(
serialNumbers
);
if
(
updateInvoiceStatus
.
isSuccess
())
{
LogUtils
.
createLog
(
"
开票"
,
serialNumbers
);
LogUtils
.
createLog
(
"
申请开票"
,
"发票管理"
);
return
RestResponse
.
success
();
}
else
{
return
EnterpriseRestResponse
.
failure
(
updateInvoiceStatus
);
...
...
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