记得上下班打卡 | git大法好,push需谨慎

Commit db23a2c8 authored by 胡佳晨's avatar 胡佳晨

fix 增加 timeSell

parent 1f665fee
...@@ -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各环境个性配置
...@@ -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"));
......
...@@ -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(
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment