记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
2709f11b
Commit
2709f11b
authored
Nov 30, 2022
by
zhanggb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:正在下单:活动订单数据导出-周焕:活动ID+ZZ前缀;
parent
cc50c382
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
GoblinExportDataController.java
...latform/controller/goblin/GoblinExportDataController.java
+2
-1
No files found.
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/GoblinExportDataController.java
View file @
2709f11b
...
@@ -9,6 +9,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
...
@@ -9,6 +9,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiMarketOrderExcelDto
;
import
com.liquidnet.service.goblin.dto.GoblinZhengzaiMarketOrderExcelDto
;
import
com.liquidnet.service.goblin.service.IGoblinExportService
;
import
com.liquidnet.service.goblin.service.IGoblinExportService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -95,7 +96,7 @@ public class GoblinExportDataController {
...
@@ -95,7 +96,7 @@ public class GoblinExportDataController {
HashMap
<
String
,
Object
>
paramMap
=
CollectionUtil
.
mapStringObject
();
HashMap
<
String
,
Object
>
paramMap
=
CollectionUtil
.
mapStringObject
();
paramMap
.
put
(
"storeId"
,
storeId
);
paramMap
.
put
(
"storeId"
,
storeId
);
paramMap
.
put
(
"marketId"
,
marketId
);
paramMap
.
put
(
"marketId"
,
GoblinStatusConst
.
MarketPreStatus
.
MARKET_PRE_ZHENGZAI
.
getValue
()
+
marketId
);
LocalDate
beginLocalDate
=
DateUtil
.
Formatter
.
yyyy_MM_dd
.
parse2LocalDate
(
beginDate
);
LocalDate
beginLocalDate
=
DateUtil
.
Formatter
.
yyyy_MM_dd
.
parse2LocalDate
(
beginDate
);
LocalDate
endLocalDate
=
DateUtil
.
Formatter
.
yyyy_MM_dd
.
parse2LocalDate
(
endDate
);
LocalDate
endLocalDate
=
DateUtil
.
Formatter
.
yyyy_MM_dd
.
parse2LocalDate
(
endDate
);
paramMap
.
put
(
"beginTime"
,
null
==
beginLocalDate
?
beginLocalDate
:
LocalDateTime
.
of
(
beginLocalDate
,
LocalTime
.
MIN
));
paramMap
.
put
(
"beginTime"
,
null
==
beginLocalDate
?
beginLocalDate
:
LocalDateTime
.
of
(
beginLocalDate
,
LocalTime
.
MIN
));
...
...
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