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
22d14fd6
authored
Jan 18, 2022
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
过期会员购买限制
parent
4d353a0a
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
119 additions
and
508 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/OverdueCanBuyCodeEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftRuleBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftVo.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/order/AbstractOrderBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderSourceEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityBean.java
View file @
22d14fd6
...
...
@@ -37,7 +37,7 @@ public class BuyVoucherActivityBean implements Serializable {
private
Integer
showPaths
;
//显示途径 1-App 2-小程序 3-全部
private
BigDecimal
realPrice
;
//真实利润
private
Integer
overdueCanBuy
;
//过期会员购买 1-不可以 2-可以
public
Integer
getVoucherType
()
{
return
voucherType
;
...
...
@@ -251,4 +251,12 @@ public class BuyVoucherActivityBean implements Serializable {
this
.
realPrice
=
realPrice
;
}
public
Integer
getOverdueCanBuy
()
{
return
overdueCanBuy
;
}
public
void
setOverdueCanBuy
(
Integer
overdueCanBuy
)
{
this
.
overdueCanBuy
=
overdueCanBuy
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityQuery.java
View file @
22d14fd6
...
...
@@ -24,7 +24,7 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
private
String
regionCode
;
//区域 1-全区域,100-上海 ,110-广州,120-北京
private
Integer
voucherType
;
//卷类型 1 -正常卷 2-体验卷需要身份证
private
Integer
showPaths
;
//显示途径 1-App 2-小程序 3-全部
private
Integer
overdueCanBuy
;
//过期会员购买 1-不可以 2-可以
...
...
@@ -113,4 +113,11 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
this
.
showPaths
=
showPaths
;
}
public
Integer
getOverdueCanBuy
()
{
return
overdueCanBuy
;
}
public
void
setOverdueCanBuy
(
Integer
overdueCanBuy
)
{
this
.
overdueCanBuy
=
overdueCanBuy
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/OverdueCanBuyCodeEnum.java
0 → 100644
View file @
22d14fd6
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.util.HashMap
;
import
java.util.Map
;
public
enum
OverdueCanBuyCodeEnum
{
/**
* 不可购买
*/
NOTCAN
(
1
,
"不可购买"
),
/**
*可以购买
*/
MP
(
2
,
"可以购买"
),
;
private
Integer
value
;
private
String
msg
;
private
OverdueCanBuyCodeEnum
(
int
value
,
String
msg
)
{
this
.
value
=
value
;
this
.
msg
=
msg
;
}
private
static
Map
<
Integer
,
OverdueCanBuyCodeEnum
>
map
=
new
HashMap
<
Integer
,
OverdueCanBuyCodeEnum
>();
static
{
for
(
OverdueCanBuyCodeEnum
it
:
OverdueCanBuyCodeEnum
.
values
())
{
map
.
put
(
it
.
value
,
it
);
}
}
public
Integer
getValue
()
{
return
value
;
}
public
void
setValue
(
Integer
value
)
{
this
.
value
=
value
;
}
public
String
getMsg
()
{
return
msg
;
}
public
void
setMsg
(
String
msg
)
{
this
.
msg
=
msg
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftBean.java
deleted
100644 → 0
View file @
4d353a0a
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.io.Serializable
;
import
java.util.Date
;
public
class
VoucherGiftBean
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
private
Integer
id
;
/**
* 置换规则id
*/
private
Integer
giftRuleId
;
/**
* 置换规则名称
*/
private
String
giftRuleName
;
/**
* 置换张数
*/
private
Integer
number
;
/**
* 状态 0 销售提交 1 客户确认 2 客户取消 3销售取消
*/
private
Integer
status
;
/**
* 客户uid
*/
private
String
clientUid
;
/**
* 销售工作号id
*/
private
Integer
userWorkerId
;
/**
* 销售提交时间
*/
private
Date
createdTime
;
/**
* 客户确认时间
*/
private
Date
affirmTime
;
/**
* 取消时间
*/
private
Date
cancelTime
;
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
public
Integer
getGiftRuleId
()
{
return
giftRuleId
;
}
public
void
setGiftRuleId
(
Integer
giftRuleId
)
{
this
.
giftRuleId
=
giftRuleId
;
}
public
String
getGiftRuleName
()
{
return
giftRuleName
;
}
public
void
setGiftRuleName
(
String
giftRuleName
)
{
this
.
giftRuleName
=
giftRuleName
;
}
public
Integer
getNumber
()
{
return
number
;
}
public
void
setNumber
(
Integer
number
)
{
this
.
number
=
number
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
String
getClientUid
()
{
return
clientUid
;
}
public
void
setClientUid
(
String
clientUid
)
{
this
.
clientUid
=
clientUid
;
}
public
Integer
getUserWorkerId
()
{
return
userWorkerId
;
}
public
void
setUserWorkerId
(
Integer
userWorkerId
)
{
this
.
userWorkerId
=
userWorkerId
;
}
public
Date
getCreatedTime
()
{
return
createdTime
;
}
public
void
setCreatedTime
(
Date
createdTime
)
{
this
.
createdTime
=
createdTime
;
}
public
Date
getAffirmTime
()
{
return
affirmTime
;
}
public
void
setAffirmTime
(
Date
affirmTime
)
{
this
.
affirmTime
=
affirmTime
;
}
public
Date
getCancelTime
()
{
return
cancelTime
;
}
public
void
setCancelTime
(
Date
cancelTime
)
{
this
.
cancelTime
=
cancelTime
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftQuery.java
deleted
100644 → 0
View file @
4d353a0a
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
com.ctrip.fun.common.vo.AbstractPagedQuery
;
@SuppressWarnings
(
"rawtypes"
)
public
class
VoucherGiftQuery
extends
AbstractPagedQuery
{
/**
*
*/
private
static
final
long
serialVersionUID
=
5874854787742050433L
;
private
Integer
id
;
private
String
userId
;
private
Integer
status
;
private
String
uid
;
//查询用户token
private
String
token
;
public
String
getUid
()
{
return
uid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
String
getToken
()
{
return
token
;
}
public
void
setToken
(
String
token
)
{
this
.
token
=
token
;
}
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftRuleBean.java
deleted
100644 → 0
View file @
4d353a0a
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.io.Serializable
;
import
java.util.Date
;
public
class
VoucherGiftRuleBean
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
private
Integer
id
;
/**
* 换卷规则名称
*/
private
String
giftName
;
/**
* 开始时间
*/
private
Date
startTime
;
/**
* 结束时间
*/
private
Date
endTime
;
/**
* 被换的卷规则id
*/
private
Integer
fromRuleId
;
/**
*换成的卷规则id
*/
private
Integer
toRuleId
;
/**
* 规则状态 0 暂停 1 开始
*/
private
Integer
status
;
/**
* 被换的劵名称
*/
private
String
fromRuleName
;
/**
*换成的卷名称
*/
private
String
toRuleName
;
/**
* 劵来源 0 不限 1 线上 2 线下
*/
private
Integer
source
;
/**
* 是否已审核通过 0初始值 1 审核通过 2未通过
*/
private
Integer
isPass
;
/**
* 审核时间
*/
private
Date
passTime
;
/**
* 审核人
*/
private
String
passName
;
/**
* 创建时间
*/
private
Date
createdTime
;
/**
* 创建人
*/
private
String
createdName
;
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
public
String
getGiftName
()
{
return
giftName
;
}
public
void
setGiftName
(
String
giftName
)
{
this
.
giftName
=
giftName
;
}
public
Date
getStartTime
()
{
return
startTime
;
}
public
void
setStartTime
(
Date
startTime
)
{
this
.
startTime
=
startTime
;
}
public
Date
getEndTime
()
{
return
endTime
;
}
public
void
setEndTime
(
Date
endTime
)
{
this
.
endTime
=
endTime
;
}
public
Integer
getFromRuleId
()
{
return
fromRuleId
;
}
public
void
setFromRuleId
(
Integer
fromRuleId
)
{
this
.
fromRuleId
=
fromRuleId
;
}
public
Integer
getToRuleId
()
{
return
toRuleId
;
}
public
void
setToRuleId
(
Integer
toRuleId
)
{
this
.
toRuleId
=
toRuleId
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
String
getFromRuleName
()
{
return
fromRuleName
;
}
public
void
setFromRuleName
(
String
fromRuleName
)
{
this
.
fromRuleName
=
fromRuleName
;
}
public
String
getToRuleName
()
{
return
toRuleName
;
}
public
void
setToRuleName
(
String
toRuleName
)
{
this
.
toRuleName
=
toRuleName
;
}
public
Integer
getSource
()
{
return
source
;
}
public
void
setSource
(
Integer
source
)
{
this
.
source
=
source
;
}
public
Integer
getIsPass
()
{
return
isPass
;
}
public
void
setIsPass
(
Integer
isPass
)
{
this
.
isPass
=
isPass
;
}
public
Date
getPassTime
()
{
return
passTime
;
}
public
void
setPassTime
(
Date
passTime
)
{
this
.
passTime
=
passTime
;
}
public
String
getPassName
()
{
return
passName
;
}
public
void
setPassName
(
String
passName
)
{
this
.
passName
=
passName
;
}
public
Date
getCreatedTime
()
{
return
createdTime
;
}
public
void
setCreatedTime
(
Date
createdTime
)
{
this
.
createdTime
=
createdTime
;
}
public
String
getCreatedName
()
{
return
createdName
;
}
public
void
setCreatedName
(
String
createdName
)
{
this
.
createdName
=
createdName
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherGiftVo.java
deleted
100644 → 0
View file @
4d353a0a
package
com
.
ctrip
.
fun
.
common
.
vo
.
basic
;
import
java.io.Serializable
;
public
class
VoucherGiftVo
implements
Serializable
{
/**
*
*/
private
static
final
long
serialVersionUID
=
2577358588222153067L
;
/**
* 主键
*/
private
Integer
id
;
/**
* 置换规则id
*/
private
String
giftRuleId
;
/**
* 置换规则名称
*/
private
String
giftRuleName
;
/**
* 置换张数
*/
private
Integer
number
;
/**
* 状态 0 销售提交 1 客户确认 2 客户取消 3销售取消
*/
private
Integer
status
;
public
Integer
getId
()
{
return
id
;
}
public
void
setId
(
Integer
id
)
{
this
.
id
=
id
;
}
public
String
getGiftRuleName
()
{
return
giftRuleName
;
}
public
void
setGiftRuleName
(
String
giftRuleName
)
{
this
.
giftRuleName
=
giftRuleName
;
}
public
String
getGiftRuleId
()
{
return
giftRuleId
;
}
public
void
setGiftRuleId
(
String
giftRuleId
)
{
this
.
giftRuleId
=
giftRuleId
;
}
public
Integer
getNumber
()
{
return
number
;
}
public
void
setNumber
(
Integer
number
)
{
this
.
number
=
number
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java
View file @
22d14fd6
...
...
@@ -69,6 +69,8 @@ public class VoucherItemDTO implements Serializable {
// 卷类型 1 -正常卷 2-体验卷需要身份证
private
Integer
voucherType
;
private
Integer
overdueCanBuy
;
//过期会员购买 1-不可以 2-可以
public
Integer
getVoucherType
()
{
return
voucherType
;
...
...
@@ -433,7 +435,13 @@ public class VoucherItemDTO implements Serializable {
this
.
courseID
=
courseID
;
}
public
Integer
getOverdueCanBuy
()
{
return
overdueCanBuy
;
}
public
void
setOverdueCanBuy
(
Integer
overdueCanBuy
)
{
this
.
overdueCanBuy
=
overdueCanBuy
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOrderBean.java
View file @
22d14fd6
...
...
@@ -118,6 +118,10 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
private
BigDecimal
needPayMoney
;
/**
* 支付类型 1 支付宝 2 微信
*/
private
int
payType
;
// ------------------
...
...
@@ -637,4 +641,12 @@ public abstract class AbstractOrderBean<T> extends AbstractBean {
public
void
setNeedPayMoney
(
BigDecimal
needPayMoney
)
{
this
.
needPayMoney
=
needPayMoney
;
}
public
int
getPayType
()
{
return
payType
;
}
public
void
setPayType
(
int
payType
)
{
this
.
payType
=
payType
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderSourceEnum.java
View file @
22d14fd6
...
...
@@ -23,7 +23,8 @@ public enum OrderSourceEnum{
H5WEB
(
7
,
"H5web"
),
H5WEIXIN
(
8
,
"H5weixin"
),
SOHUWEB
(
9
,
"SohuWeb"
),
HOMEBREW
(
10
,
"Homebrew"
);
HOMEBREW
(
10
,
"Homebrew"
),
THIRD_PARTY
(
20
,
"第三方"
);
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java
View file @
22d14fd6
...
...
@@ -309,7 +309,9 @@ public class UserBean implements Serializable {
private
String
occupation
;
/** 爱好 */
private
String
hobby
;
private
String
faceImage
;
private
String
faceImage
;
/**
* 工作号id
...
...
@@ -321,6 +323,16 @@ public class UserBean implements Serializable {
*/
private
Integer
isSales
;
/**
* 超级会员开始时间
*/
private
Date
svipStartTime
;
/**
* 超级会员结束时间
*/
private
Date
svipEndTime
;
public
Integer
getUserWorkerId
()
{
return
userWorkerId
;
}
...
...
@@ -938,5 +950,21 @@ public class UserBean implements Serializable {
public
void
setIsSales
(
Integer
isSales
)
{
this
.
isSales
=
isSales
;
}
public
Date
getSvipStartTime
()
{
return
svipStartTime
;
}
public
void
setSvipStartTime
(
Date
svipStartTime
)
{
this
.
svipStartTime
=
svipStartTime
;
}
public
Date
getSvipEndTime
()
{
return
svipEndTime
;
}
public
void
setSvipEndTime
(
Date
svipEndTime
)
{
this
.
svipEndTime
=
svipEndTime
;
}
}
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