Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
farming
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
郑云飞
farming
Commits
41fdf221
Commit
41fdf221
authored
May 29, 2023
by
郑云飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团购时间选择器修改
parent
8a25eb6f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
26 deletions
+29
-26
src/main/java/com/yunniu/farming/webadmin/controller/TaskJob.java
+2
-2
src/main/java/com/yunniu/farming/webadmin/model/GroupBuy.java
+4
-4
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupBuyServiceimpl.java
+2
-15
src/main/resources/application.properties
+5
-1
src/main/resources/templates/groupBuy/addOrEdit.html
+16
-4
No files found.
src/main/java/com/yunniu/farming/webadmin/controller/TaskJob.java
View file @
41fdf221
...
...
@@ -65,7 +65,7 @@ public class TaskJob {
/**
* 定时修改团购订单状态
*/
@Scheduled
(
cron
=
"
59 59 23
* * ? "
)
@Scheduled
(
cron
=
"
0 0 *
* * ? "
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
successGroup
()
throws
Exception
{
// 查询待成团并到期的团购订单
...
...
@@ -92,7 +92,7 @@ public class TaskJob {
/**
* 定时失效团购活动
*/
@Scheduled
(
cron
=
"
59 59 23
* * ? "
)
@Scheduled
(
cron
=
"
0 0 *
* * ? "
)
public
void
activityFailure
()
{
groupBuyDao
.
activityFailure
();
}
...
...
src/main/java/com/yunniu/farming/webadmin/model/GroupBuy.java
View file @
41fdf221
...
...
@@ -47,8 +47,8 @@ public class GroupBuy {
/**
* 拼团开始时间
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
Date
startTime
;
@TableField
(
exist
=
false
)
private
String
startDate
;
...
...
@@ -56,8 +56,8 @@ public class GroupBuy {
/**
* 拼团结束时间
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
Date
endTime
;
@TableField
(
exist
=
false
)
private
String
endDate
;
...
...
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupBuyServiceimpl.java
View file @
41fdf221
...
...
@@ -69,13 +69,7 @@ public class GroupBuyServiceimpl implements GroupBuyService {
// 设置小区id集合的值
item
.
setAreaIds
(
JSON
.
toJSONString
(
item
.
getAreaIdList
()));
item
.
setGroupStatus
(
3
);
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
setTime
(
item
.
getEndTime
());
cal
.
set
(
Calendar
.
HOUR_OF_DAY
,
23
);
//时
cal
.
set
(
Calendar
.
MINUTE
,
59
);
//分
cal
.
set
(
Calendar
.
SECOND
,
59
);
//秒
cal
.
set
(
Calendar
.
MILLISECOND
,
0
);
//毫秒
item
.
setEndTime
(
cal
.
getTime
());
// 保存活动基础信息
this
.
mapper
.
insert
(
item
);
// 判断活动商品是否有值
...
...
@@ -85,13 +79,6 @@ public class GroupBuyServiceimpl implements GroupBuyService {
}
return
Result
.
success
();
}
else
{
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
setTime
(
item
.
getEndTime
());
cal
.
set
(
Calendar
.
HOUR_OF_DAY
,
23
);
//时
cal
.
set
(
Calendar
.
MINUTE
,
59
);
//分
cal
.
set
(
Calendar
.
SECOND
,
59
);
//秒
cal
.
set
(
Calendar
.
MILLISECOND
,
0
);
//毫秒
item
.
setEndTime
(
cal
.
getTime
());
this
.
mapper
.
updateEndTime
(
item
);
return
Result
.
success
();
}
...
...
@@ -108,7 +95,7 @@ public class GroupBuyServiceimpl implements GroupBuyService {
public
GroupBuy
findById
(
Long
id
)
{
// 团购基础信息
GroupBuy
groupBuy
=
this
.
mapper
.
selectById
(
id
);
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"yyyy-MM-dd
HH:mm:ss
"
);
groupBuy
.
setStartDate
(
formatter
.
format
(
groupBuy
.
getStartTime
()));
groupBuy
.
setEndDate
(
formatter
.
format
(
groupBuy
.
getEndTime
()));
// 团购商品
...
...
src/main/resources/application.properties
View file @
41fdf221
#spring.datasource.url=jdbc:mysql://152.136.113.101:3306/farming?autoReconnect=true&useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#spring.datasource.username=root
#spring.datasource.password=Root_123456
spring.datasource.url
=
jdbc:mysql://
1.15.43.240:3306/farming?autoReconnect=true&useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
spring.datasource.url
=
jdbc:mysql://
localhost:3306/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username
=
farming
spring.datasource.password
=
PKWB6psxa7FBApZB
#spring.datasource.url=jdbc:mysql://db1.prd.jianghuxx.com:3317/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#spring.datasource.username=root
#spring.datasource.password=4f9fa23639242790
#7LwimZ27FqEnzIPg
##47.101.199.10
spring.datasource.driverClassName
=
com.mysql.cj.jdbc.Driver
...
...
src/main/resources/templates/groupBuy/addOrEdit.html
View file @
41fdf221
...
...
@@ -52,13 +52,13 @@
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
><span
style=
"color: red"
>
*
</span>
团购活动有效期
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"
datetime
"
class=
"layui-input"
name=
"startDate"
id=
"startDate"
th:value=
"${obj.startDate}"
required=
"required"
>
<input
type=
"
text
"
class=
"layui-input"
name=
"startDate"
id=
"startDate"
th:value=
"${obj.startDate}"
required=
"required"
lay-verify=
"datetime"
>
</div>
<label
class=
"layui-form-label"
>
至
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"
datetime
"
class=
"layui-input"
name=
"endDate"
id=
"endDate"
th:value=
"${obj.endDate}"
required=
"required"
>
<input
type=
"
text
"
class=
"layui-input"
name=
"endDate"
id=
"endDate"
th:value=
"${obj.endDate}"
required=
"required"
lay-verify=
"datetime"
>
</div>
</div>
<div
class=
"layui-form-item"
>
...
...
@@ -166,6 +166,18 @@
}
}
layui
.
use
([
'laydate'
],
function
()
{
var
laydate
=
layui
.
laydate
;
laydate
.
render
({
elem
:
'#endDate'
,
type
:
'datetime'
// 设置日期时间类型,带时分秒
});
laydate
.
render
({
elem
:
'#startDate'
,
type
:
'datetime'
// 设置日期时间类型,带时分秒
});
});
layui
.
use
(
'form'
,
function
()
{
var
form
=
layui
.
form
;
form
.
render
();
...
...
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