Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-common
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
2
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
dd6fb166
authored
Aug 28, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-common into f-6.6.9
parents
43c9158d
3ab95e07
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
255 additions
and
4 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGetLogQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherShareLogBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherShareLogQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackOperateStatusEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackStatusEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskUserQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGetLogQuery.java
0 → 100644
View file @
dd6fb166
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.util.Date
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
com.ctrip.fun.common.vo.AbstractPagedQuery
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
/**
* @author gaoc
*/
public
class
VoucherGetLogQuery
extends
AbstractPagedQuery
<
VoucherGetLogQuery
>
{
private
static
final
long
serialVersionUID
=
9139646793590664961L
;
/**
* id
*/
private
Integer
id
;
/**
*分享id
*/
private
Integer
shareid
;
/**
*用户uid
*/
private
String
uid
;
/**
*用户token
*/
private
String
token
;
/**
* 抢的券id
*/
private
Integer
voucherid
;
/**
* 抢到券生成的新的券id
*/
private
Integer
newVoucherid
;
/**
* 开始创建时间
*/
private
Date
startCreateTime
;
/**
* 结束创建时间
*/
private
Date
endCreateTime
;
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
public
String
getUid
()
{
return
uid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getStartCreateTime
()
{
return
startCreateTime
;
}
public
void
setStartCreateTime
(
Date
startCreateTime
)
{
this
.
startCreateTime
=
startCreateTime
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getEndCreateTime
()
{
return
endCreateTime
;
}
public
void
setEndCreateTime
(
Date
endCreateTime
)
{
this
.
endCreateTime
=
endCreateTime
;
}
public
String
getToken
()
{
return
token
;
}
public
void
setToken
(
String
token
)
{
this
.
token
=
token
;
}
public
Integer
getShareid
()
{
return
shareid
;
}
public
void
setShareid
(
Integer
shareid
)
{
this
.
shareid
=
shareid
;
}
public
Integer
getVoucherid
()
{
return
voucherid
;
}
public
void
setVoucherid
(
Integer
voucherid
)
{
this
.
voucherid
=
voucherid
;
}
public
Integer
getNewVoucherid
()
{
return
newVoucherid
;
}
public
void
setNewVoucherid
(
Integer
newVoucherid
)
{
this
.
newVoucherid
=
newVoucherid
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java
View file @
dd6fb166
...
...
@@ -45,6 +45,8 @@ public class VoucherItemDTO implements Serializable {
private
String
multiAmount
;
private
Integer
onlyMe
;
//是否本人使用1是本人使用;0是非本人使用
private
Integer
isShare
;
//是否正在分享中
private
String
alreadyShared
;
//是否被抢走
private
String
qiangQuanUid
;
//抢券人UID
public
void
doExecuteNullField
()
{
if
(
description
==
null
)
{
...
...
@@ -280,4 +282,26 @@ public class VoucherItemDTO implements Serializable {
public
void
setIsShare
(
Integer
isShare
)
{
this
.
isShare
=
isShare
;
}
public
String
getAlreadyShared
()
{
return
alreadyShared
;
}
public
void
setAlreadyShared
(
String
alreadyShared
)
{
this
.
alreadyShared
=
alreadyShared
;
}
public
String
getQiangQuanUid
()
{
return
qiangQuanUid
;
}
public
void
setQiangQuanUid
(
String
qiangQuanUid
)
{
this
.
qiangQuanUid
=
qiangQuanUid
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherShareLogBean.java
View file @
dd6fb166
...
...
@@ -30,6 +30,25 @@ public class VoucherShareLogBean implements Serializable {
* 分享发生时间
*/
private
Date
createTime
;
/**
* 状态
*/
private
Integer
status
;
/**
* 1:正常2:取消
*/
private
String
statusDesc
;
/**
* 分享出去的券的数量
*/
private
int
voucherAmount
;
/**
* 被抢走的券的数量
*/
private
int
sharedVoucherAmount
;
public
Integer
getId
()
{
return
id
;
...
...
@@ -71,4 +90,36 @@ public class VoucherShareLogBean implements Serializable {
this
.
voucherList
=
voucherList
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
String
getStatusDesc
()
{
if
(
status
==
null
){
return
"其它"
;
}
return
status
==
1
?
"正常"
:
"取消"
;
}
public
int
getVoucherAmount
()
{
if
(
voucherIds
!=
null
){
String
[]
vIds
=
voucherIds
.
split
(
","
);
return
vIds
.
length
;
}
return
0
;
}
public
int
getSharedVoucherAmount
()
{
return
sharedVoucherAmount
;
}
public
void
setSharedVoucherAmount
(
int
sharedVoucherAmount
)
{
this
.
sharedVoucherAmount
=
sharedVoucherAmount
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherShareLogQuery.java
View file @
dd6fb166
...
...
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
*/
public
class
VoucherShareLogQuery
extends
AbstractPagedQuery
<
VoucherShareLogQuery
>
{
private
static
final
long
serialVersionUID
=
913964679359066496
0
L
;
private
static
final
long
serialVersionUID
=
913964679359066496
1
L
;
/**
* id
...
...
@@ -53,7 +53,7 @@ public class VoucherShareLogQuery extends AbstractPagedQuery<VoucherShareLogQuer
this
.
uid
=
uid
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getStartCreateTime
()
{
return
startCreateTime
;
...
...
@@ -63,7 +63,7 @@ public class VoucherShareLogQuery extends AbstractPagedQuery<VoucherShareLogQuer
this
.
startCreateTime
=
startCreateTime
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getEndCreateTime
()
{
return
endCreateTime
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackOperateStatusEnum.java
View file @
dd6fb166
...
...
@@ -22,6 +22,28 @@ public enum TelTaskDetailFeedBackOperateStatusEnum {
PRE_INTENTION
(
TelTaskDetailFeedBackStatusEnum
.
PRE_INTENTION
,
null
,
null
),
NONE_NEED
(
TelTaskDetailFeedBackStatusEnum
.
NONE_NEED
,
null
,
null
),
NOT_PLAY
(
TelTaskDetailFeedBackStatusEnum
.
NOT_PLAY
,
null
,
null
),
NONLOCAL
(
TelTaskDetailFeedBackStatusEnum
.
NONLOCAL
,
null
,
null
),
OTHERCHANNEL
(
TelTaskDetailFeedBackStatusEnum
.
OTHERCHANNEL
,
null
,
null
),
MALAISE
(
TelTaskDetailFeedBackStatusEnum
.
MALAISE
,
null
,
null
),
NONSPEAK
(
TelTaskDetailFeedBackStatusEnum
.
NONSPEAK
,
null
,
null
),
BUSY
(
TelTaskDetailFeedBackStatusEnum
.
BUSY
,
null
,
null
),
SAMEINDUSTRY
(
TelTaskDetailFeedBackStatusEnum
.
SAMEINDUSTRY
,
null
,
null
),
FOREIGNER
(
TelTaskDetailFeedBackStatusEnum
.
FOREIGNER
,
null
,
null
),
NONCOMMUNE
(
TelTaskDetailFeedBackStatusEnum
.
NONCOMMUNE
,
null
,
null
),
NONLIKE
(
TelTaskDetailFeedBackStatusEnum
.
NONLIKE
,
null
,
null
),
// value大于10的是自定义类型
BOUND
(
null
,
11
,
"绑定"
),
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackStatusEnum.java
View file @
dd6fb166
...
...
@@ -5,7 +5,9 @@ import java.util.Map;
public
enum
TelTaskDetailFeedBackStatusEnum
{
NONE
(
0
,
"未拨打"
),
DEAL
(
1
,
"成交"
),
INTERESTED
(
2
,
"感兴趣"
),
NORESPONSE
(
3
,
"无应答"
),
EMPTY
(
4
,
"空号"
),
REJECTED
(
5
,
"被拒绝"
),
BLACK
(
6
,
"黑名单"
),
PRE_INTENTION
(
7
,
"初步意向"
);
NONE
(
0
,
"未拨打"
),
DEAL
(
1
,
"成交"
),
INTERESTED
(
2
,
"感兴趣"
),
NORESPONSE
(
3
,
"无应答"
),
EMPTY
(
4
,
"空号"
),
REJECTED
(
5
,
"被拒绝"
),
BLACK
(
6
,
"挂断,拒接,黑名单"
),
PRE_INTENTION
(
7
,
"初步意向"
),
NONE_NEED
(
8
,
"不需要"
),
NOT_PLAY
(
9
,
"不打球"
),
NONLOCAL
(
10
,
"在外地"
),
OTHERCHANNEL
(
11
,
"其它渠道(球队,俱乐部等)"
),
MALAISE
(
12
,
"身体不适"
),
NONSPEAK
(
13
,
"接通后没音"
),
BUSY
(
14
,
"没空"
),
SAMEINDUSTRY
(
15
,
"同行,教练"
),
FOREIGNER
(
16
,
"外国人"
),
NONCOMMUNE
(
17
,
"非社员"
),
NONLIKE
(
18
,
"爱玩不好不续费"
);
private
int
value
;
private
String
msg
;
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskUserQuery.java
View file @
dd6fb166
...
...
@@ -55,6 +55,16 @@ public class TelTaskUserQuery implements java.io.Serializable {
private
Date
lastLoginDateEnd
;
/**
* 上一次拨打时间开始
*/
private
Date
lastFeedbackTimeStart
;
/**
* 上一次拨打时间结束
*/
private
Date
lastFeedbackTimeEnd
;
/**
* 账户最小余额
*/
private
BigDecimal
amountMin
;
...
...
@@ -163,6 +173,26 @@ public class TelTaskUserQuery implements java.io.Serializable {
this
.
lastLoginDateEnd
=
lastLoginDateEnd
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getLastFeedbackTimeStart
()
{
return
lastFeedbackTimeStart
;
}
public
void
setLastFeedbackTimeStart
(
Date
lastFeedbackTimeStart
)
{
this
.
lastFeedbackTimeStart
=
lastFeedbackTimeStart
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
,
timezone
=
"GMT+8"
)
public
Date
getLastFeedbackTimeEnd
()
{
return
lastFeedbackTimeEnd
;
}
public
void
setLastFeedbackTimeEnd
(
Date
lastFeedbackTimeEnd
)
{
this
.
lastFeedbackTimeEnd
=
lastFeedbackTimeEnd
;
}
public
BigDecimal
getAmountMin
()
{
return
amountMin
;
}
...
...
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