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
e0136541
authored
Oct 11, 2018
by
chongli
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
d62a4793
a6e408b9
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
299 additions
and
0 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpOrderQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpVoucherOrderBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderListBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderListExcelBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderMenuEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderProcessBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/VoucherOrderStatistics.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpOrderQuery.java
View file @
e0136541
...
...
@@ -57,6 +57,9 @@ public class OpOrderQuery extends AbstractPagedQuery {
private
Boolean
delayOrder
;
private
Integer
vipmemberType
;
private
String
recommendUserName
;
private
String
recommendPhone
;
/**
* @return the userId
*/
...
...
@@ -285,5 +288,21 @@ public class OpOrderQuery extends AbstractPagedQuery {
this
.
vipmemberType
=
vipmemberType
;
}
public
String
getRecommendUserName
()
{
return
recommendUserName
;
}
public
void
setRecommendUserName
(
String
recommendUserName
)
{
this
.
recommendUserName
=
recommendUserName
;
}
public
String
getRecommendPhone
()
{
return
recommendPhone
;
}
public
void
setRecommendPhone
(
String
recommendPhone
)
{
this
.
recommendPhone
=
recommendPhone
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpVoucherOrderBean.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
order
;
public
class
OpVoucherOrderBean
extends
AbstractOpOrderBean
{
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderListBean.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
order
;
public
class
VoucherOrderListBean
extends
AbstractOrderListBean
{
/**
* 下单人手机号码
*/
private
String
orderPhone
;
/**
* 下单人姓名
*/
private
String
orderUserName
;
/**
* 促销活动资源ID
*/
private
Integer
activityId
;
/**
* 推荐人UID
*/
private
String
recommendUid
;
/**
* 推荐人姓名
*/
private
String
recommendUserName
;
/**
* 推荐人手机
*/
private
String
recommendPhone
;
private
Integer
orderCategory
;
public
String
getOrderPhone
()
{
return
orderPhone
;
}
public
void
setOrderPhone
(
String
orderPhone
)
{
this
.
orderPhone
=
orderPhone
;
}
public
String
getOrderUserName
()
{
return
orderUserName
;
}
public
void
setOrderUserName
(
String
orderUserName
)
{
this
.
orderUserName
=
orderUserName
;
}
public
Integer
getActivityId
()
{
return
activityId
;
}
public
void
setActivityId
(
Integer
activityId
)
{
this
.
activityId
=
activityId
;
}
public
String
getRecommendUid
()
{
return
recommendUid
;
}
public
void
setRecommendUid
(
String
recommendUid
)
{
this
.
recommendUid
=
recommendUid
;
}
public
String
getRecommendUserName
()
{
return
recommendUserName
;
}
public
void
setRecommendUserName
(
String
recommendUserName
)
{
this
.
recommendUserName
=
recommendUserName
;
}
public
String
getRecommendPhone
()
{
return
recommendPhone
;
}
public
void
setRecommendPhone
(
String
recommendPhone
)
{
this
.
recommendPhone
=
recommendPhone
;
}
public
Integer
getOrderCategory
()
{
return
orderCategory
;
}
public
void
setOrderCategory
(
Integer
orderCategory
)
{
this
.
orderCategory
=
orderCategory
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderListExcelBean.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
order
;
public
class
VoucherOrderListExcelBean
extends
VoucherOrderListBean
{
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderMenuEnum.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
order
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* @content
* @author csleng
* @date
*/
public
enum
VoucherOrderMenuEnum
{
/**
* 全部
*/
LIST_ALL
(
"list_all"
,
"支付成功"
,
"/voucherOrder/orderList/list_all"
,
"voucherOrderListAll"
,
new
ArrayList
<
OrderStatusEnum
>())
;
/**
* 未支付
*/
// LIST_NOPAY("list_nopay", "未支付", "/voucherOrder/orderList/list_nopay", "voucherOrderListNopay", Arrays.asList(OrderStatusEnum.NOT_PAY)),
/**
* 支付中
*/
// LIST_PAYING("list_paying", "支付中", "/voucherOrder/orderList/list_paying", "voucherOrderListPaying", Arrays.asList(OrderStatusEnum.CHAGING)),
/**
* 扣款失败
*/
// LIST_PAY_FAIL("list_payfail", "扣款失败", "/voucherOrder/orderList/list_payfail", "voucherOrderListPayfail", Arrays.asList(OrderStatusEnum.CHARGE_FAILED)),
/**
* 已成交
*/
// LIST_PAY_SUCCESS("list_paysuccess", "已成交", "/voucherOrder/orderList/list_paysuccess", "voucherOrderListPaysuccess", Arrays.asList(
// OrderStatusEnum.WAITING_DEAL, OrderStatusEnum.DEAL_FINISHED)),
/**
* 已取消
*/
// LIST_CANCELED("list_canceled", "已取消", "/voucherOrder/orderList/list_canceled", "voucherOrderListCanceled", Arrays.asList(OrderStatusEnum.CANCEL));
/**
* Menu名称
*/
private
String
menuName
;
/**
* Menu界面显示名称
*/
private
String
showMenuName
;
/**
* Menu链接
*/
private
String
menuLink
;
/**
* 返回的页面名称
*/
private
String
result
;
/**
* 包含的订单状态
*/
private
List
<
OrderStatusEnum
>
statusList
;
VoucherOrderMenuEnum
(
String
menuName
,
String
showMenuName
,
String
menuLink
,
String
result
,
List
<
OrderStatusEnum
>
statusList
)
{
this
.
menuName
=
menuName
;
this
.
showMenuName
=
showMenuName
;
this
.
menuLink
=
menuLink
;
this
.
result
=
result
;
this
.
statusList
=
statusList
;
}
/**
* 根据Menu名称得到Menu枚举值
* @param menuName Menu名称
* @return
*/
public
static
VoucherOrderMenuEnum
getOrderMenuEnumByMenuName
(
String
menuName
)
{
for
(
VoucherOrderMenuEnum
orderMenuEnum
:
VoucherOrderMenuEnum
.
values
())
{
if
(
orderMenuEnum
.
getMenuName
().
equals
(
menuName
))
{
return
orderMenuEnum
;
}
}
return
null
;
}
public
String
getResult
()
{
return
result
;
}
public
void
setResult
(
String
result
)
{
this
.
result
=
result
;
}
public
String
getMenuName
()
{
return
menuName
;
}
public
void
setMenuName
(
String
menuName
)
{
this
.
menuName
=
menuName
;
}
public
String
getShowMenuName
()
{
return
showMenuName
;
}
public
void
setShowMenuName
(
String
showMenuName
)
{
this
.
showMenuName
=
showMenuName
;
}
public
String
getMenuLink
()
{
return
menuLink
;
}
public
void
setMenuLink
(
String
menuLink
)
{
this
.
menuLink
=
menuLink
;
}
public
List
<
OrderStatusEnum
>
getStatusList
()
{
return
statusList
;
}
public
void
setStatusList
(
List
<
OrderStatusEnum
>
statusList
)
{
this
.
statusList
=
statusList
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/VoucherOrderProcessBean.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
order
;
public
class
VoucherOrderProcessBean
extends
AbstractOrderProcessBean
{
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/VoucherOrderStatistics.java
0 → 100644
View file @
e0136541
package
com
.
ctrip
.
fun
.
common
.
vo
.
user
;
/**
* 兑换优惠券活动统计类
* @author lyhuang
*
*/
public
class
VoucherOrderStatistics
{
/** 推荐人Uid **/
private
String
recommendUid
;
/** 推荐人手机号 **/
private
String
BindedMobilePhone
;
/** 推荐人姓名 **/
private
String
userName
;
/** 推荐人昵称 **/
private
String
umNickName
;
/** 推荐人成交数 **/
private
Integer
dealNumber
;
public
String
getRecommendUid
()
{
return
recommendUid
;
}
public
void
setRecommendUid
(
String
recommendUid
)
{
this
.
recommendUid
=
recommendUid
;
}
public
String
getBindedMobilePhone
()
{
return
BindedMobilePhone
;
}
public
void
setBindedMobilePhone
(
String
bindedMobilePhone
)
{
BindedMobilePhone
=
bindedMobilePhone
;
}
public
String
getUserName
()
{
return
userName
;
}
public
void
setUserName
(
String
userName
)
{
this
.
userName
=
userName
;
}
public
String
getUmNickName
()
{
return
umNickName
;
}
public
void
setUmNickName
(
String
umNickName
)
{
this
.
umNickName
=
umNickName
;
}
public
Integer
getDealNumber
()
{
return
dealNumber
;
}
public
void
setDealNumber
(
Integer
dealNumber
)
{
this
.
dealNumber
=
dealNumber
;
}
}
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