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
4e086b13
authored
Nov 17, 2017
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-common into f-6.6.4
parents
b548c356
31873d7a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
406 additions
and
82 deletions
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceBean.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceQuery.java
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceBean.java
View file @
4e086b13
...
...
@@ -48,11 +48,6 @@ public class CourseOrderFinanceBean {
private
Long
orderNo
;
/**
* 打球人数
*/
private
int
playNums
;
/**
* 单人成本
*/
private
double
costForPerson
;
...
...
@@ -133,6 +128,46 @@ public class CourseOrderFinanceBean {
private
Integer
resourceId
;
// 资源ID
private
String
uid
;
private
String
contactName
;
private
String
orderName
;
private
Integer
districtId
;
private
String
districtName
;
private
BigDecimal
actualAmount
;
private
Date
orderDate
;
private
Date
payDate
;
private
Integer
orderSource
;
private
BigDecimal
actualSettleAmout
;
private
String
settleObj
;
private
Date
settleDate
;
private
String
finComment
;
private
BigDecimal
prePayCardAmount
;
private
BigDecimal
voucherAmount
;
private
BigDecimal
refundAmount
;
private
String
outTradeId
;
private
Boolean
onlineOrderFlag
;
private
String
userType
;
private
Double
insuranceAmount
;
private
String
channel1
;
private
String
channel2
;
/**
* 打球人数
*/
private
int
playNums
;
private
String
player1
;
private
String
player2
;
private
String
player3
;
private
String
player4
;
private
String
payeeName
;
private
String
receiver
;
@ExcelTitleName
(
value
=
"球场ID"
,
number
=
5
)
public
Integer
getCourseId
()
{
return
courseId
;
...
...
@@ -170,12 +205,7 @@ public class CourseOrderFinanceBean {
return
orderNo
;
}
@ExcelTitleName
(
value
=
"打球人数"
,
number
=
35
)
public
int
getPlayNums
()
{
return
playNums
;
}
@ExcelTitleName
(
value
=
"单人成本"
,
number
=
45
)
@ExcelTitleName
(
value
=
"单人成本/底价"
,
number
=
45
)
public
double
getCostForPerson
()
{
return
costForPerson
;
}
...
...
@@ -200,6 +230,223 @@ public class CourseOrderFinanceBean {
return
payMode
;
}
@ExcelTitleName
(
value
=
"打球人数"
,
number
=
35
)
public
int
getPlayNums
()
{
return
playNums
;
}
@ExcelTitleName
(
value
=
"打球人1"
,
number
=
12
)
public
String
getPlayer1
()
{
return
player1
;
}
@ExcelTitleName
(
value
=
"打球人2"
,
number
=
12
)
public
String
getPlayer2
()
{
return
player2
;
}
@ExcelTitleName
(
value
=
"打球人3"
,
number
=
12
)
public
String
getPlayer3
()
{
return
player3
;
}
@ExcelTitleName
(
value
=
"打球人4"
,
number
=
12
)
public
String
getPlayer4
()
{
return
player4
;
}
@ExcelTitleName
(
value
=
"保险金额"
,
number
=
12
)
public
Double
getInsuranceAmount
()
{
return
insuranceAmount
;
}
@ExcelTitleName
(
value
=
"后台下单渠道1"
,
number
=
12
)
public
String
getChannel1
()
{
return
channel1
;
}
@ExcelTitleName
(
value
=
"后台下单渠道2"
,
number
=
12
)
public
String
getChannel2
()
{
return
channel2
;
}
@ExcelTitleName
(
value
=
"收款人"
,
number
=
20
)
public
String
getPayeeName
()
{
return
payeeName
;
}
@ExcelTitleName
(
value
=
"接管人"
,
number
=
40
)
public
String
getReceiver
()
{
return
receiver
;
}
@ExcelTitleName
(
value
=
"结算类型"
,
number
=
60
)
public
String
getSettlementTypeMsg
()
{
return
settlementTypeMsg
;
}
@ExcelTitleName
(
value
=
"订单售价"
,
number
=
52
)
public
double
getAmount
()
{
return
amount
;
}
@ExcelTitleName
(
value
=
"单人售价"
,
number
=
51
)
public
double
getSalePrice
()
{
return
salePrice
;
}
@ExcelTitleName
(
value
=
"手动扣款类型"
,
number
=
65
)
public
String
getOfflinePayTypeMsg
()
{
return
offlinePayTypeMsg
;
}
@ExcelTitleName
(
value
=
"产品经理"
,
number
=
18
)
public
String
getProductManager
()
{
return
productManager
;
}
@ExcelTitleName
(
value
=
"返现"
,
number
=
53
)
public
BigDecimal
getCashRebate
()
{
return
cashRebate
;
}
@ExcelTitleName
(
value
=
"返佣"
,
number
=
54
)
public
BigDecimal
getCommission
()
{
return
commission
;
}
@ExcelTitleName
(
value
=
"联系人"
,
number
=
20
)
public
String
getContactName
()
{
return
contactName
;
}
@ExcelTitleName
(
value
=
"订单名称"
,
number
=
100
)
public
String
getOrderName
()
{
return
orderName
;
}
@ExcelTitleName
(
value
=
"城市"
,
number
=
12
)
public
String
getDistrictName
()
{
return
districtName
;
}
@ExcelTitleName
(
value
=
"实付金额"
,
number
=
12
)
public
BigDecimal
getActualAmount
()
{
return
actualAmount
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ExcelTitleName
(
value
=
"下单时间"
,
number
=
20
)
public
Date
getOrderDate
()
{
return
orderDate
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ExcelTitleName
(
value
=
"支付时间"
,
number
=
20
)
public
Date
getPayDate
()
{
return
payDate
;
}
@ExcelTitleName
(
value
=
"实际结算金额"
,
number
=
12
)
public
BigDecimal
getActualSettleAmout
()
{
return
actualSettleAmout
;
}
@ExcelTitleName
(
value
=
"结算对象"
,
number
=
128
)
public
String
getSettleObj
()
{
return
settleObj
;
}
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@ExcelTitleName
(
value
=
"结算日期"
,
number
=
20
)
public
Date
getSettleDate
()
{
return
settleDate
;
}
@ExcelTitleName
(
value
=
"财务备注"
,
number
=
256
)
public
String
getFinComment
()
{
return
finComment
;
}
@ExcelTitleName
(
value
=
"余额"
,
number
=
12
)
public
BigDecimal
getPrePayCardAmount
()
{
return
prePayCardAmount
;
}
@ExcelTitleName
(
value
=
"兑换卷"
,
number
=
12
)
public
BigDecimal
getVoucherAmount
()
{
return
voucherAmount
;
}
@ExcelTitleName
(
value
=
"退款金额"
,
number
=
12
)
public
BigDecimal
getRefundAmount
()
{
return
refundAmount
;
}
@ExcelTitleName
(
value
=
"携程支付订单编号"
,
number
=
64
)
public
String
getOutTradeId
()
{
return
outTradeId
;
}
@ExcelTitleName
(
value
=
"是否线上订单"
,
number
=
12
)
public
Boolean
getOnlineOrderFlag
()
{
return
onlineOrderFlag
;
}
@ExcelTitleName
(
value
=
"用户类型(活跃用户,非活跃用户,新用户未下单)"
,
number
=
20
)
public
String
getUserType
()
{
return
userType
;
}
public
int
getProcessStatus
()
{
return
processStatus
;
}
public
Integer
getInvoiceId
()
{
return
invoiceId
;
}
public
Integer
getOrderType
()
{
return
orderType
;
}
public
Integer
getConfirmType
()
{
return
confirmType
;
}
public
Integer
getOrderId
()
{
return
orderId
;
}
public
Integer
getSettlementType
()
{
return
settlementType
;
}
public
Integer
getOfflinePayType
()
{
return
offlinePayType
;
}
public
Integer
getResourceId
()
{
return
resourceId
;
}
public
String
getUid
()
{
return
uid
;
}
public
Integer
getDistrictId
()
{
return
districtId
;
}
public
Integer
getOrderSource
()
{
return
orderSource
;
}
public
void
setCourseId
(
Integer
courseId
)
{
this
.
courseId
=
courseId
;
}
...
...
@@ -228,10 +475,6 @@ public class CourseOrderFinanceBean {
this
.
orderNo
=
orderNo
;
}
public
void
setPlayNums
(
int
playNums
)
{
this
.
playNums
=
playNums
;
}
public
void
setCostForPerson
(
double
costForPerson
)
{
this
.
costForPerson
=
costForPerson
;
}
...
...
@@ -240,6 +483,14 @@ public class CourseOrderFinanceBean {
this
.
costForOrder
=
costForOrder
;
}
public
void
setAmount
(
double
amount
)
{
this
.
amount
=
amount
;
}
public
void
setSalePrice
(
double
salePrice
)
{
this
.
salePrice
=
salePrice
;
}
public
void
setPlayNames
(
String
playNames
)
{
this
.
playNames
=
playNames
;
}
...
...
@@ -248,135 +499,179 @@ public class CourseOrderFinanceBean {
this
.
orderStatus
=
orderStatus
;
}
public
void
setProcessStatus
(
int
processStatus
)
{
this
.
processStatus
=
processStatus
;
}
public
void
setPayMode
(
String
payMode
)
{
this
.
payMode
=
payMode
;
}
public
int
getProcessStatus
(
)
{
return
processStatus
;
public
void
setInvoiceId
(
Integer
invoiceId
)
{
this
.
invoiceId
=
invoiceId
;
}
public
void
setProcessStatus
(
int
processStatus
)
{
this
.
processStatus
=
processStatus
;
public
void
setOrderType
(
Integer
orderType
)
{
this
.
orderType
=
orderType
;
}
public
Integer
getInvoiceId
(
)
{
return
invoiceId
;
public
void
setConfirmType
(
Integer
confirmType
)
{
this
.
confirmType
=
confirmType
;
}
public
Integer
getOrderType
(
)
{
return
orderType
;
public
void
setOrderId
(
Integer
orderId
)
{
this
.
orderId
=
orderId
;
}
public
Integer
getConfirmType
(
)
{
return
confirm
Type
;
public
void
setSettlementType
(
Integer
settlementType
)
{
this
.
settlementType
=
settlement
Type
;
}
public
void
setInvoiceId
(
Integer
invoiceId
)
{
this
.
invoiceId
=
invoiceId
;
public
void
setSettlementTypeMsg
(
String
settlementTypeMsg
)
{
this
.
settlementTypeMsg
=
settlementTypeMsg
;
}
public
void
setOrderType
(
Integer
order
Type
)
{
this
.
orderType
=
order
Type
;
public
void
setOfflinePayType
(
Integer
offlinePay
Type
)
{
this
.
offlinePayType
=
offlinePay
Type
;
}
public
void
setConfirmType
(
Integer
confirmType
)
{
this
.
confirmType
=
confirmType
;
public
void
setOfflinePayTypeMsg
(
String
offlinePayTypeMsg
)
{
this
.
offlinePayTypeMsg
=
offlinePayTypeMsg
;
}
public
Integer
getOrderId
(
)
{
return
orderId
;
public
void
setProductManager
(
String
productManager
)
{
this
.
productManager
=
productManager
;
}
public
void
setOrderId
(
Integer
orderId
)
{
this
.
orderId
=
orderId
;
public
void
setCashRebate
(
BigDecimal
cashRebate
)
{
this
.
cashRebate
=
cashRebate
;
}
public
Integer
getSettlementType
(
)
{
return
settlementType
;
public
void
setCommission
(
BigDecimal
commission
)
{
this
.
commission
=
commission
;
}
public
void
setSettlementType
(
Integer
settlementType
)
{
this
.
settlementType
=
settlementType
;
public
void
setResourceId
(
Integer
resourceId
)
{
this
.
resourceId
=
resourceId
;
}
@ExcelTitleName
(
value
=
"结算类型"
,
number
=
60
)
public
String
getSettlementTypeMsg
()
{
return
settlementTypeMsg
;
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
public
void
setSettlementTypeMsg
(
String
settlementTypeMsg
)
{
this
.
settlementTypeMsg
=
settlementTypeMsg
;
public
void
setContactName
(
String
contactName
)
{
this
.
contactName
=
contactName
;
}
@ExcelTitleName
(
value
=
"订单售价"
,
number
=
52
)
public
double
getAmount
()
{
return
amount
;
public
void
setOrderName
(
String
orderName
)
{
this
.
orderName
=
orderName
;
}
public
void
setAmount
(
double
amount
)
{
this
.
amount
=
amount
;
public
void
setDistrictId
(
Integer
districtId
)
{
this
.
districtId
=
districtId
;
}
@ExcelTitleName
(
value
=
"单人售价"
,
number
=
51
)
public
double
getSalePrice
()
{
return
salePrice
;
public
void
setDistrictName
(
String
districtName
)
{
this
.
districtName
=
districtName
;
}
public
void
setSalePrice
(
double
salePrice
)
{
this
.
salePrice
=
salePrice
;
public
void
setActualAmount
(
BigDecimal
actualAmount
)
{
this
.
actualAmount
=
actualAmount
;
}
public
Integer
getOfflinePayType
(
)
{
return
offlinePayTyp
e
;
public
void
setOrderDate
(
Date
orderDate
)
{
this
.
orderDate
=
orderDat
e
;
}
public
void
setOfflinePayType
(
Integer
offlinePayTyp
e
)
{
this
.
offlinePayType
=
offlinePayTyp
e
;
public
void
setPayDate
(
Date
payDat
e
)
{
this
.
payDate
=
payDat
e
;
}
@ExcelTitleName
(
value
=
"手动扣款类型"
,
number
=
65
)
public
String
getOfflinePayTypeMsg
()
{
return
offlinePayTypeMsg
;
public
void
setOrderSource
(
Integer
orderSource
)
{
this
.
orderSource
=
orderSource
;
}
public
void
setOfflinePayTypeMsg
(
String
offlinePayTypeMsg
)
{
this
.
offlinePayTypeMsg
=
offlinePayTypeMsg
;
public
void
setActualSettleAmout
(
BigDecimal
actualSettleAmout
)
{
this
.
actualSettleAmout
=
actualSettleAmout
;
}
@ExcelTitleName
(
value
=
"产品经理"
,
number
=
18
)
public
String
getProductManager
()
{
return
productManager
;
public
void
setSettleObj
(
String
settleObj
)
{
this
.
settleObj
=
settleObj
;
}
public
void
setProductManager
(
String
productManager
)
{
this
.
productManager
=
productManager
;
public
void
setSettleDate
(
Date
settleDate
)
{
this
.
settleDate
=
settleDate
;
}
@ExcelTitleName
(
value
=
"返现"
,
number
=
53
)
public
BigDecimal
getCashRebate
()
{
return
cashRebate
;
public
void
setFinComment
(
String
finComment
)
{
this
.
finComment
=
finComment
;
}
public
void
setCashRebate
(
BigDecimal
cashRebate
)
{
this
.
cashRebate
=
cashRebate
;
public
void
setPrePayCardAmount
(
BigDecimal
prePayCardAmount
)
{
this
.
prePayCardAmount
=
prePayCardAmount
;
}
@ExcelTitleName
(
value
=
"返佣"
,
number
=
54
)
public
BigDecimal
getCommission
()
{
return
commission
;
public
void
setVoucherAmount
(
BigDecimal
voucherAmount
)
{
this
.
voucherAmount
=
voucherAmount
;
}
public
void
setCommission
(
BigDecimal
commission
)
{
this
.
commission
=
commission
;
public
void
setRefundAmount
(
BigDecimal
refundAmount
)
{
this
.
refundAmount
=
refundAmount
;
}
public
Integer
getResourceId
(
)
{
return
resourc
eId
;
public
void
setOutTradeId
(
String
outTradeId
)
{
this
.
outTradeId
=
outTrad
eId
;
}
public
void
setResourceId
(
Integer
resourceId
)
{
this
.
resourceId
=
resourceId
;
public
void
setOnlineOrderFlag
(
Boolean
onlineOrderFlag
)
{
this
.
onlineOrderFlag
=
onlineOrderFlag
;
}
public
void
setUserType
(
String
userType
)
{
this
.
userType
=
userType
;
}
public
void
setInsuranceAmount
(
Double
insuranceAmount
)
{
this
.
insuranceAmount
=
insuranceAmount
;
}
public
void
setChannel1
(
String
channel1
)
{
this
.
channel1
=
channel1
;
}
public
void
setChannel2
(
String
channel2
)
{
this
.
channel2
=
channel2
;
}
public
void
setPlayNums
(
int
playNums
)
{
this
.
playNums
=
playNums
;
}
public
void
setPlayer1
(
String
player1
)
{
this
.
player1
=
player1
;
}
public
void
setPlayer2
(
String
player2
)
{
this
.
player2
=
player2
;
}
public
void
setPlayer3
(
String
player3
)
{
this
.
player3
=
player3
;
}
public
void
setPlayer4
(
String
player4
)
{
this
.
player4
=
player4
;
}
public
void
setPayeeName
(
String
payeeName
)
{
this
.
payeeName
=
payeeName
;
}
public
void
setReceiver
(
String
receiver
)
{
this
.
receiver
=
receiver
;
}
}
fun-common-vo/src/main/java/com/ctrip/fun/common/vo/finance/CourseOrderFinanceQuery.java
View file @
4e086b13
...
...
@@ -69,6 +69,11 @@ public class CourseOrderFinanceQuery extends AbstractPagedQuery {
*/
private
String
productManager
;
private
Long
orderNo
;
private
String
contactName
;
private
String
orderName
;
public
Integer
getCourseId
()
{
return
courseId
;
}
...
...
@@ -169,4 +174,28 @@ public class CourseOrderFinanceQuery extends AbstractPagedQuery {
this
.
productManager
=
productManager
;
}
public
Long
getOrderNo
()
{
return
orderNo
;
}
public
void
setOrderNo
(
Long
orderNo
)
{
this
.
orderNo
=
orderNo
;
}
public
String
getContactName
()
{
return
contactName
;
}
public
void
setContactName
(
String
contactName
)
{
this
.
contactName
=
contactName
;
}
public
String
getOrderName
()
{
return
orderName
;
}
public
void
setOrderName
(
String
orderName
)
{
this
.
orderName
=
orderName
;
}
}
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