记得上下班打卡 | 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
aa934f36
Commit
aa934f36
authored
Nov 15, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
开始结束时间类型
parent
2bb1eb8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
SweetIntegralActivityVo.java
...t/service/sweet/dto/vo/admin/SweetIntegralActivityVo.java
+4
-4
SweetIntegralActivityServiceImpl.java
.../sweet/service/impl/SweetIntegralActivityServiceImpl.java
+0
-3
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/admin/SweetIntegralActivityVo.java
View file @
aa934f36
...
@@ -45,10 +45,10 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
...
@@ -45,10 +45,10 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
private
Integer
timeType
;
private
Integer
timeType
;
@ApiModelProperty
(
value
=
"如果活动有时间限制 开始时间"
)
@ApiModelProperty
(
value
=
"如果活动有时间限制 开始时间"
)
private
LocalDateTime
startTime
;
private
String
startTime
;
@ApiModelProperty
(
value
=
"如果活动有时间限制 结束时间"
)
@ApiModelProperty
(
value
=
"如果活动有时间限制 结束时间"
)
private
LocalDateTime
endTime
;
private
String
endTime
;
@ApiModelProperty
(
value
=
"快递费用类型 1包邮 2到付"
)
@ApiModelProperty
(
value
=
"快递费用类型 1包邮 2到付"
)
private
Integer
expressFeeType
;
private
Integer
expressFeeType
;
...
@@ -88,8 +88,8 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
...
@@ -88,8 +88,8 @@ public class SweetIntegralActivityVo implements Serializable, Cloneable {
this
.
setActivityType
(
source
.
getActivityType
());
this
.
setActivityType
(
source
.
getActivityType
());
this
.
setActivityNum
(
source
.
getActivityNum
());
this
.
setActivityNum
(
source
.
getActivityNum
());
this
.
setTimeType
(
source
.
getTimeType
());
this
.
setTimeType
(
source
.
getTimeType
());
this
.
setStartTime
(
source
.
getStartTime
(
));
this
.
setStartTime
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
source
.
getStartTime
()
));
this
.
setEndTime
(
source
.
getEndTime
(
));
this
.
setEndTime
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
source
.
getEndTime
()
));
this
.
setExpressFeeType
(
source
.
getExpressFeeType
());
this
.
setExpressFeeType
(
source
.
getExpressFeeType
());
this
.
setActivityRules
(
source
.
getActivityRules
());
this
.
setActivityRules
(
source
.
getActivityRules
());
this
.
setIsOnline
(
source
.
getIsOnline
());
this
.
setIsOnline
(
source
.
getIsOnline
());
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityServiceImpl.java
View file @
aa934f36
...
@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.client.admin.zhengzai.adam.dto.AdamMemberCodeExcelDto
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityService
;
import
com.liquidnet.client.admin.zhengzai.sweet.service.ISweetIntegralActivityService
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetObjectAdminUtil
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.service.stone.entity.StoneScoreItems
;
import
com.liquidnet.service.sweet.dto.SweetIntegralActivityDto
;
import
com.liquidnet.service.sweet.dto.SweetIntegralActivityDto
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
import
com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam
;
...
@@ -30,7 +28,6 @@ import org.springframework.stereotype.Service;
...
@@ -30,7 +28,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
...
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