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
0d724cd0
Commit
0d724cd0
authored
Aug 12, 2020
by
陶光胜
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小程序二维码修改
parent
531536e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
BillListVO.java
...b/src/main/java/com/gic/enterprise/web/vo/BillListVO.java
+4
-1
PushMessageController.java
...m/gic/operation/web/controller/PushMessageController.java
+1
-1
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/BillListVO.java
View file @
0d724cd0
...
...
@@ -3,6 +3,8 @@ package com.gic.enterprise.web.vo;
import
com.gic.commons.util.DateUtil
;
import
com.gic.enterprise.constant.BuyTypeEnum
;
import
com.gic.enterprise.constant.PayTypeEnum
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
java.io.Serializable
;
import
java.text.ParseException
;
...
...
@@ -18,6 +20,7 @@ import java.util.Date;
*/
public
class
BillListVO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
3737832047382825129L
;
private
static
Logger
logger
=
LogManager
.
getLogger
(
BillListVO
.
class
);
/**
* 支付流水号
...
...
@@ -102,7 +105,7 @@ public class BillListVO implements Serializable{
try
{
return
format
.
parse
(
timeEnd
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
(
);
logger
.
warn
(
"e"
,
e
);
}
return
null
;
}
...
...
gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/PushMessageController.java
View file @
0d724cd0
...
...
@@ -85,7 +85,7 @@ public class PushMessageController {
response
=
this
.
pushMessageApiService
.
pagePushMessage
(
search
,
pushStatus
,
StringUtils
.
isBlank
(
startTime
)
?
null
:
simpleDateFormat
.
parse
(
startTime
+
" 00:00:00"
),
StringUtils
.
isBlank
(
endTime
)
?
null
:
simpleDateFormat
.
parse
(
endTime
+
" 23:59:59"
),
pageQO
.
getCurrentPage
(),
pageQO
.
getPageSize
(),
classifyId
);
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
(
);
log
.
warn
(
"e"
,
e
);
}
return
RestResponse
.
success
(
response
.
getResult
());
}
...
...
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