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
d709aaa4
authored
Sep 05, 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
6fecf069
dd6fb166
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
10 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/MultipleCourseConditionBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderStatusEnum.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/RecommendRankBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/MultipleCourseConditionBean.java
View file @
d709aaa4
...
...
@@ -15,7 +15,6 @@ public class MultipleCourseConditionBean {
protected
Date
productStartDate
;
// 产品或资源ID的开始时间
protected
Date
productEndDate
;
// 产品或资源的结束时间
protected
Integer
onlyMe
;
// onlyMe:0/1 是否只能本人使用
/**
* Map key值为 productIds,courseIds,amount;
...
...
@@ -146,5 +145,4 @@ public class MultipleCourseConditionBean {
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OrderStatusEnum.java
View file @
d709aaa4
...
...
@@ -6,7 +6,16 @@ package com.ctrip.fun.common.vo.order;
import
com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum
;
/**
* 订单状态枚举值
* 订单状态枚举值,枚举包含9个内容字段,分别代表如下:<br/>
* 1.状态名称 name <br/>
* 2.订单类型 orderType BUY(1,"求购订单"), SELL(2,"出售订单"), ACTIVE_SELL(3,"主动卖"), ACTIVE_BUY(4,"主动买"); 默认1<br/>
* 3.支付方式 payMode 有四种支付方式 预付P 现付O 信用卡担保G 部分预付M, 大部分都是P或者O ProductPaymentTypeEnum <br/>
* 4.确认类型 confirmType 两种方式 手动确认 和 自动确认 两种方式<br/>
* 5.状态值 statusValue <br/>
* 6.比较状态值的操作符operation 全部都是 &<br/>
* 7.计算完操作值的比较关系符号 relation 全部都是 = <br/>
* 8.运算之后的结果 result[]<br/>
* 9.界面显示名称中文字 showStatusName <br/>
*
* @author zgsong
* @version 1.0.0
...
...
@@ -277,7 +286,6 @@ public enum OrderStatusEnum {
/**
* 等待审核
*/
// TODO 暂缓
// WAITING_AUDIT("WAITING_AUDIT", 1, null, null, 131072 + 1024 + 2048 + 33554432, "&", ">", 33554432, "等待审核");
/**
...
...
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/RecommendRankBean.java
View file @
d709aaa4
...
...
@@ -2,12 +2,14 @@ package com.ctrip.fun.common.vo.user;
public
class
RecommendRankBean
{
private
String
inviterUid
;
private
String
inviterUserName
;
private
int
myNum1
;
private
int
myNum2
;
private
int
myNum3
;
private
int
myNum4
;
private
String
inviterUid
;
//微信邀请人
private
String
inviterUserName
;
//邀请人用户名
private
int
myNum1
;
//添加人总数
private
int
myNum2
;
//新客户数
private
int
myNum3
;
//社员数
private
int
myNum4
;
//非社员数
private
int
myNum5
;
//非社员数
private
int
myNum6
;
//非社员数
...
...
@@ -48,5 +50,17 @@ public class RecommendRankBean {
public
void
setMyNum4
(
int
myNum4
)
{
this
.
myNum4
=
myNum4
;
}
public
int
getMyNum5
()
{
return
myNum5
;
}
public
void
setMyNum5
(
int
myNum5
)
{
this
.
myNum5
=
myNum5
;
}
public
int
getMyNum6
()
{
return
myNum6
;
}
public
void
setMyNum6
(
int
myNum6
)
{
this
.
myNum6
=
myNum6
;
}
}
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