记得上下班打卡 | 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
db23a2c8
Commit
db23a2c8
authored
Aug 10, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 增加 timeSell
parent
1f665fee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
liquidnet-service-sweet-dev.yml
...s-config/liquidnet-config/liquidnet-service-sweet-dev.yml
+2
-2
RedisDataUtils.java
...ava/com/liquidnet/service/sweet/utils/RedisDataUtils.java
+1
-1
SweetManualMapper.xml
.../com/liquidnet/service/sweet/mapper/SweetManualMapper.xml
+3
-2
SweetManualMdskMapper.xml
.../liquidnet/service/sweet/mapper/SweetManualMdskMapper.xml
+2
-1
No files found.
liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet-dev.yml
View file @
db23a2c8
...
@@ -13,9 +13,9 @@ liquidnet:
...
@@ -13,9 +13,9 @@ liquidnet:
file-max-size
:
200MB
file-max-size
:
200MB
level
:
debug
level
:
debug
mysql
:
mysql
:
database-name
:
dev
_ln_scene
database-name
:
test
_ln_scene
mongodb
:
mongodb
:
sslEnabled
:
false
sslEnabled
:
false
database
:
dev
_ln_scene
database
:
test
_ln_scene
#以下为spring各环境个性配置
#以下为spring各环境个性配置
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @
db23a2c8
...
@@ -51,7 +51,7 @@ public class RedisDataUtils {
...
@@ -51,7 +51,7 @@ public class RedisDataUtils {
List
<
SweetManualAppletDto
>
data
=
sweetManualMapper
.
getManualAppletDto
();
List
<
SweetManualAppletDto
>
data
=
sweetManualMapper
.
getManualAppletDto
();
for
(
SweetManualAppletDto
item
:
data
)
{
for
(
SweetManualAppletDto
item
:
data
)
{
if
(!
item
.
getIsMember
().
equals
(
1
)){
if
(!
item
.
getIsMember
().
equals
(
1
)){
item
.
setTimeSell
(
DateUtil
.
format
(
DateUtil
.
addMin
(
DateUtil
.
parse
(
item
.
getTimeSell
(),
"yyyy-MM-dd HH:mm:ss"
),
-
item
.
getPayCountdownMinute
()),
DateUtil
.
Formatter
.
yyyyMMddHHmmss
));
item
.
setTimeSell
(
DateUtil
.
format
(
DateUtil
.
addMin
(
DateUtil
.
parse
(
item
.
getTimeSell
(),
"yyyy-MM-dd HH:mm:ss"
),
item
.
getPayCountdownMinute
()),
DateUtil
.
Formatter
.
yyyyMMddHHmmss
));
}
}
item
.
setFieldName
((
String
)
redisUtil
.
hget
(
"kylin:fields:id"
+
":"
+
item
.
getFieldId
(),
"name"
));
item
.
setFieldName
((
String
)
redisUtil
.
hget
(
"kylin:fields:id"
+
":"
+
item
.
getFieldId
(),
"name"
));
item
.
setCityName
((
String
)
redisUtil
.
hget
(
"kylin:fields:id"
+
":"
+
item
.
getFieldId
(),
"city_name"
));
item
.
setCityName
((
String
)
redisUtil
.
hget
(
"kylin:fields:id"
+
":"
+
item
.
getFieldId
(),
"city_name"
));
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMapper.xml
View file @
db23a2c8
...
@@ -135,7 +135,8 @@
...
@@ -135,7 +135,8 @@
p.time_start ,
p.time_start ,
p.time_end,
p.time_end,
t1.time_sell,
t1.time_sell,
t1.pay_countdown_minute
t1.pay_countdown_minute,
t1.is_member
FROM
FROM
kylin_performances AS p
kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
...
@@ -162,7 +163,7 @@
...
@@ -162,7 +163,7 @@
LEFT JOIN(
LEFT JOIN(
SELECT
SELECT
ttr.performance_id ,
ttr.performance_id ,
ts.is_member
ts.is_member
,
pay_countdown_minute,
pay_countdown_minute,
sum(ts.total_general) AS 'total_general' ,
sum(ts.total_general) AS 'total_general' ,
MIN(
MIN(
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMdskMapper.xml
View file @
db23a2c8
...
@@ -135,7 +135,8 @@
...
@@ -135,7 +135,8 @@
p.time_start ,
p.time_start ,
p.time_end,
p.time_end,
t1.time_sell,
t1.time_sell,
t1.pay_countdown_minute
t1.pay_countdown_minute,
t1.is_member
FROM
FROM
kylin_performances AS p
kylin_performances AS p
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
...
...
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