Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
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
6d1bda0c
authored
Oct 15, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
f-6.7.1
parent
5e2c944f
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
1679 additions
and
1359 deletions
src/main/java/com/ctrip/fun/golf/.gitignore
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderController.java
src/main/java/com/ctrip/fun/golf/domain/order/CommuneOrderItem.java
src/main/java/com/ctrip/fun/golf/domain/order/Order.java
src/main/java/com/ctrip/fun/golf/domain/user/UserWorker.java
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
src/main/resources/basic.spring.xml
src/main/resources/hibernate.cfg.xml
src/main/webapp/WEB-INF/web.xml
src/main/java/com/ctrip/fun/golf/.gitignore
0 → 100644
View file @
6d1bda0c
/dao
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderController.java
View file @
6d1bda0c
...
...
@@ -70,7 +70,7 @@ public class CommuneOrderController extends AbstractOrderController<CommuneOrder
@SuppressWarnings
(
"unchecked"
)
@ResponseBody
@RequestMapping
(
value
=
"/voucherPlaceOrderForMiniApp"
,
method
=
RequestMethod
.
POST
)
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
{
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
throws
Exception
{
ResponseMp
<
JSONObject
>
response
=
new
ResponseMp
<
JSONObject
>();
JSONObject
jSONObject
;
jSONObject
=
communeOrderService
.
voucherPlaceOrderForMiniApp
(
request
.
getBody
());
...
...
src/main/java/com/ctrip/fun/golf/domain/order/CommuneOrderItem.java
View file @
6d1bda0c
...
...
@@ -89,6 +89,9 @@ public class CommuneOrderItem implements java.io.Serializable {
@Column
(
name
=
"recommendUid"
)
private
String
recommendUid
;
@Column
(
name
=
"userWorkerId"
)
private
Integer
userWorkerId
;
public
Integer
getId
()
{
return
id
;
...
...
@@ -186,6 +189,13 @@ public class CommuneOrderItem implements java.io.Serializable {
this
.
recommendUid
=
recommendUid
;
}
public
Integer
getUserWorkerId
()
{
return
userWorkerId
;
}
public
void
setUserWorkerId
(
Integer
userWorkerId
)
{
this
.
userWorkerId
=
userWorkerId
;
}
}
src/main/java/com/ctrip/fun/golf/domain/order/Order.java
View file @
6d1bda0c
...
...
@@ -27,1343 +27,1392 @@ import com.ctrip.fun.common.vo.order.OrderStatusEnum;
@org
.
hibernate
.
annotations
.
Entity
(
dynamicInsert
=
true
,
dynamicUpdate
=
true
)
public
class
Order
extends
AbstractOrder
implements
java
.
io
.
Serializable
{
/**
/**
*
*/
private
static
final
long
serialVersionUID
=
6494942152302929396L
;
private
Integer
orderId
;
private
BigDecimal
actualAmount
;
private
BigDecimal
adjustAmount
;
private
BigDecimal
amount
;
private
int
confirmType
;
private
String
contactAddress
;
private
String
contactEmail
;
private
String
contactMobile
;
private
String
contactName
;
private
String
contactTel
;
private
String
ctripCardNo
;
private
String
currency
;
private
BigDecimal
discountAmount
;
private
BigDecimal
exchangeRate
;
private
String
externalNo
;
private
Date
finishDate
;
private
int
firstRiskStatus
;
private
BigDecimal
limitedEmoneyAmount
;
private
BigDecimal
onPayAmount
;
private
Date
orderDate
;
private
String
orderName
;
private
long
orderNo
;
private
String
orderStatus
;
private
int
orderType
;
private
int
orderUserStatus
;
private
String
payMode
;
private
BigDecimal
prePayAmount
;
private
BigDecimal
prePayCardAmount
;
private
BigDecimal
voucherAmount
;
private
int
processStatus
;
private
Date
provConfirmTime
;
private
String
remark
;
private
int
riskCheckStatus
;
private
int
secondRiskStatus
;
private
String
tempOrderNo
;
private
BigDecimal
tmoney
;
private
BigDecimal
totalAmount
;
private
String
uid
;
private
BigDecimal
unlimitedEmoneyAmount
;
private
int
orderSource
;
private
BigDecimal
preAuthAmount
;
private
BigDecimal
deductByPreAuthAmount
;
private
Date
payDate
;
private
int
orderCategory
;
private
BigDecimal
guaranteeAmount
;
private
BigDecimal
deductByGuaranteeAmount
;
private
BigDecimal
prePayCardRefundAmount
;
private
BigDecimal
voucherRefundAmount
;
private
BigDecimal
launchRefundAmount
;
private
BigDecimal
refundAmount
;
private
Date
applyTime
;
private
Date
launchRefundTime
;
private
Date
refundTime
;
private
Date
launchDeductByGuaranteeTime
;
private
Date
deductByGuaranteeTime
;
private
Date
launchDeductByPreAuthTime
;
private
Date
deductByPreAuthTime
;
private
String
applyFailReason
;
private
String
refundFailReason
;
private
String
deductByGuaranteeFailReason
;
private
String
deductByPreAuthFailReason
;
private
String
releasePreAuthFailReason
;
private
Date
launchReleasePreAuthTime
;
private
Date
releasePreAuthTime
;
private
int
isThird
;
// 1已扣掉,0未扣
private
int
prePayCardDeductFlag
;
private
String
voucherIDList
;
private
int
voucherCount
;
private
String
paymentRequestID
;
// 0:非扣款订单中的取消,1:扣款中订单的取消(用户或后台发起的)
private
int
cancelStatus
;
private
int
campaignID
;
private
BigDecimal
sponsorUnitAmount
;
private
Boolean
useMemberPrice
;
private
BigDecimal
memberUnitAmount
;
private
BigDecimal
invoiceAmount
;
private
BigDecimal
postageAmount
;
private
BigDecimal
insuranceAmount
;
// 保险费用
private
int
insuranceStatus
;
// 保险状态
/**
* 返现金额
*/
private
double
cashRebate
;
private
static
final
long
serialVersionUID
=
6494942152302929396L
;
private
Integer
orderId
;
private
BigDecimal
actualAmount
;
private
BigDecimal
adjustAmount
;
private
BigDecimal
amount
;
private
int
confirmType
;
private
String
contactAddress
;
private
String
contactEmail
;
private
String
contactMobile
;
private
String
contactName
;
private
String
contactTel
;
private
String
ctripCardNo
;
private
String
currency
;
private
BigDecimal
discountAmount
;
private
BigDecimal
exchangeRate
;
private
String
externalNo
;
private
Date
finishDate
;
private
int
firstRiskStatus
;
private
BigDecimal
limitedEmoneyAmount
;
private
BigDecimal
onPayAmount
;
private
Date
orderDate
;
private
String
orderName
;
private
long
orderNo
;
private
String
orderStatus
;
private
int
orderType
;
private
int
orderUserStatus
;
private
String
payMode
;
private
BigDecimal
prePayAmount
;
private
BigDecimal
prePayCardAmount
;
private
BigDecimal
voucherAmount
;
private
int
processStatus
;
private
Date
provConfirmTime
;
private
String
remark
;
private
int
riskCheckStatus
;
private
int
secondRiskStatus
;
private
String
tempOrderNo
;
private
BigDecimal
tmoney
;
private
BigDecimal
totalAmount
;
private
String
uid
;
private
BigDecimal
unlimitedEmoneyAmount
;
private
int
orderSource
;
private
BigDecimal
preAuthAmount
;
private
BigDecimal
deductByPreAuthAmount
;
private
Date
payDate
;
private
int
orderCategory
;
private
BigDecimal
guaranteeAmount
;
private
BigDecimal
deductByGuaranteeAmount
;
private
BigDecimal
prePayCardRefundAmount
;
private
BigDecimal
voucherRefundAmount
;
private
BigDecimal
launchRefundAmount
;
private
BigDecimal
refundAmount
;
private
Date
applyTime
;
private
Date
launchRefundTime
;
private
Date
refundTime
;
private
Date
launchDeductByGuaranteeTime
;
private
Date
deductByGuaranteeTime
;
private
Date
launchDeductByPreAuthTime
;
private
Date
deductByPreAuthTime
;
private
String
applyFailReason
;
private
String
refundFailReason
;
private
String
deductByGuaranteeFailReason
;
private
String
deductByPreAuthFailReason
;
private
String
releasePreAuthFailReason
;
private
Date
launchReleasePreAuthTime
;
private
Date
releasePreAuthTime
;
private
int
isThird
;
// 1已扣掉,0未扣
private
int
prePayCardDeductFlag
;
private
String
voucherIDList
;
private
int
voucherCount
;
private
String
paymentRequestID
;
// 0:非扣款订单中的取消,1:扣款中订单的取消(用户或后台发起的)
private
int
cancelStatus
;
private
int
campaignID
;
private
BigDecimal
sponsorUnitAmount
;
private
Boolean
useMemberPrice
;
private
BigDecimal
memberUnitAmount
;
private
BigDecimal
invoiceAmount
;
private
BigDecimal
postageAmount
;
private
BigDecimal
insuranceAmount
;
// 保险费用
private
int
insuranceStatus
;
// 保险状态
/**
* 返现金额
*/
private
double
cashRebate
;
/**
* 返现状态(0:未返现,1:未返现,枚举待定)
*/
private
int
cashRebateStatus
;
// 价格变动通知标志 0未通知 1已通知
private
String
notifyFlag
;
/**
* 实际结算金额
*/
private
BigDecimal
actualSettleAmout
;
/**
* 结算对象
*/
private
String
settleObj
;
/**
* 结算日期
*/
private
Date
settleDate
;
/**
* 财务备注
*/
private
String
finComment
;
/**
* 订单来源(一级)(目前就offline使用)
*/
private
String
channel1
;
/**
* 订单来源(二级)(目前就offline使用)
*/
private
String
channel2
;
private
int
orderIntegralStatus
;
private
int
shareIntegralStatus
;
private
boolean
hasInvoice
;
private
BigDecimal
giftCardAmount
;
/**
* 支付的版本
*/
private
Integer
paymentVersion
=
2
;
/**
* 最终订单来源 即商户使用何种方式调用携程支付H5/Online/Native SDK/Offline
*/
private
String
platform
;
/**
* 外部编号
*/
private
String
outTradeId
;
/**
* 继续预订关联的订单编号
*/
private
long
relationOrderNo
;
/**
* 客户端是否可见
*/
private
boolean
enable
;
/**
* 手动扣款成功类型:1 支付宝;2 微信;3 银行卡;4 其他
*/
private
Integer
offlinePayType
;
private
Boolean
deleteFlag
;
private
Boolean
sendNotifyMsg
=
true
;
private
Boolean
onlineOrderFlag
=
true
;
/**
* 用户类型(活跃用户,非活跃用户,新用户未下单)
*/
private
String
userType
;
/** 订单总的立减金额 */
private
BigDecimal
vipmemberDiscount
;
/** 订单总的随机立减折扣 */
private
BigDecimal
vipmemberDiscountRate
;
// 关联订单发票表id
private
Integer
invoiceId
;
// 可开发票时间---赛事和单定场订单在打球之后;其它的规则待定
private
Date
canInvoiceDate
;
/**
* 返现状态(0:未返现,1:未返现,枚举待定)
*/
private
int
cashRebateStatus
;
// 价格变动通知标志 0未通知 1已通知
private
String
notifyFlag
;
public
Order
()
{
}
/**
* 实际结算金额
*/
private
BigDecimal
actualSettleAmout
;
public
Order
(
BigDecimal
actualAmount
,
BigDecimal
adjustAmount
,
BigDecimal
amount
,
int
confirmType
,
String
contactAddress
,
String
contactEmail
,
String
contactMobile
,
String
contactName
,
String
contactTel
,
String
ctripCardNo
,
String
currency
,
BigDecimal
discountAmount
,
BigDecimal
exchangeRate
,
String
externalNo
,
int
firstRiskStatus
,
BigDecimal
limitedEmoneyAmount
,
BigDecimal
onPayAmount
,
Date
orderDate
,
String
orderName
,
long
orderNo
,
String
orderStatus
,
int
orderType
,
int
orderUserStatus
,
String
payMode
,
BigDecimal
prePayAmount
,
BigDecimal
prePayCardAmount
,
int
processStatus
,
String
remark
,
int
riskCheckStatus
,
int
secondRiskStatus
,
String
tempOrderNo
,
BigDecimal
tmoney
,
BigDecimal
totalAmount
,
String
uid
,
BigDecimal
unlimitedEmoneyAmount
,
Date
dataChangeLastTime
,
int
orderSource
,
BigDecimal
preAuthAmount
,
BigDecimal
deductByPreAuthAmount
,
int
orderCategory
,
BigDecimal
guaranteeAmount
,
BigDecimal
deductByGuaranteeAmount
,
BigDecimal
prePayCardRefundAmount
,
BigDecimal
launchRefundAmount
,
BigDecimal
refundAmount
,
String
applyFailReason
,
String
refundFailReason
,
String
deductByGuaranteeFailReason
,
String
deductByPreAuthFailReason
,
String
releasePreAuthFailReason
,
int
isThird
,
BigDecimal
voucherAmount
,
BigDecimal
voucherRefundAmount
,
int
prePayCardDeductFlag
,
String
voucherIDList
,
int
voucherCount
,
String
paymentRequestID
,
BigDecimal
giftCardAmount
)
{
this
.
actualAmount
=
actualAmount
;
this
.
adjustAmount
=
adjustAmount
;
this
.
amount
=
amount
;
this
.
confirmType
=
confirmType
;
this
.
contactAddress
=
contactAddress
;
this
.
contactEmail
=
contactEmail
;
this
.
contactMobile
=
contactMobile
;
this
.
contactName
=
contactName
;
this
.
contactTel
=
contactTel
;
this
.
ctripCardNo
=
ctripCardNo
;
this
.
currency
=
currency
;
this
.
discountAmount
=
discountAmount
;
this
.
exchangeRate
=
exchangeRate
;
this
.
externalNo
=
externalNo
;
this
.
firstRiskStatus
=
firstRiskStatus
;
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
this
.
onPayAmount
=
onPayAmount
;
this
.
orderDate
=
orderDate
;
this
.
orderName
=
orderName
;
this
.
orderNo
=
orderNo
;
this
.
orderStatus
=
orderStatus
;
this
.
orderType
=
orderType
;
this
.
orderUserStatus
=
orderUserStatus
;
this
.
payMode
=
payMode
;
this
.
prePayAmount
=
prePayAmount
;
this
.
prePayCardAmount
=
prePayCardAmount
;
this
.
processStatus
=
processStatus
;
this
.
remark
=
remark
;
this
.
riskCheckStatus
=
riskCheckStatus
;
this
.
secondRiskStatus
=
secondRiskStatus
;
this
.
tempOrderNo
=
tempOrderNo
;
this
.
tmoney
=
tmoney
;
this
.
totalAmount
=
totalAmount
;
this
.
uid
=
uid
;
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
this
.
orderSource
=
orderSource
;
this
.
preAuthAmount
=
preAuthAmount
;
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
this
.
orderCategory
=
orderCategory
;
this
.
guaranteeAmount
=
guaranteeAmount
;
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
this
.
launchRefundAmount
=
launchRefundAmount
;
this
.
refundAmount
=
refundAmount
;
this
.
applyFailReason
=
applyFailReason
;
this
.
refundFailReason
=
refundFailReason
;
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
this
.
isThird
=
isThird
;
this
.
voucherAmount
=
voucherAmount
;
this
.
voucherRefundAmount
=
voucherRefundAmount
;
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
this
.
voucherIDList
=
voucherIDList
;
this
.
voucherCount
=
voucherCount
;
this
.
giftCardAmount
=
giftCardAmount
;
this
.
setPaymentRequestID
(
paymentRequestID
);
}
/**
* 结算对象
*/
private
String
settleObj
;
public
Order
(
BigDecimal
actualAmount
,
BigDecimal
adjustAmount
,
BigDecimal
amount
,
int
confirmType
,
String
contactAddress
,
String
contactEmail
,
String
contactMobile
,
String
contactName
,
String
contactTel
,
String
ctripCardNo
,
String
currency
,
BigDecimal
discountAmount
,
BigDecimal
exchangeRate
,
String
externalNo
,
Date
finishDate
,
int
firstRiskStatus
,
BigDecimal
limitedEmoneyAmount
,
BigDecimal
onPayAmount
,
Date
orderDate
,
String
orderName
,
long
orderNo
,
String
orderStatus
,
int
orderType
,
int
orderUserStatus
,
String
payMode
,
BigDecimal
prePayAmount
,
BigDecimal
prePayCardAmount
,
int
processStatus
,
Date
provConfirmTime
,
String
remark
,
int
riskCheckStatus
,
int
secondRiskStatus
,
String
tempOrderNo
,
BigDecimal
tmoney
,
BigDecimal
totalAmount
,
String
uid
,
BigDecimal
unlimitedEmoneyAmount
,
Date
dataChangeLastTime
,
int
orderSource
,
BigDecimal
preAuthAmount
,
BigDecimal
deductByPreAuthAmount
,
Date
payDate
,
int
orderCategory
,
BigDecimal
guaranteeAmount
,
BigDecimal
deductByGuaranteeAmount
,
BigDecimal
prePayCardRefundAmount
,
BigDecimal
launchRefundAmount
,
BigDecimal
refundAmount
,
Date
applyTime
,
Date
launchRefundTime
,
Date
refundTime
,
Date
launchDeductByGuaranteeTime
,
Date
deductByGuaranteeTime
,
Date
launchDeductByPreAuthTime
,
Date
deductByPreAuthTime
,
String
applyFailReason
,
String
refundFailReason
,
String
deductByGuaranteeFailReason
,
String
deductByPreAuthFailReason
,
String
releasePreAuthFailReason
,
Date
launchReleasePreAuthTime
,
Date
releasePreAuthTime
,
int
isThird
,
BigDecimal
voucherAmount
,
BigDecimal
voucherRefundAmount
,
int
prePayCardDeductFlag
,
String
voucherIDList
,
int
voucherCount
,
String
paymentRequestID
,
BigDecimal
giftCardAmount
)
{
this
.
actualAmount
=
actualAmount
;
this
.
adjustAmount
=
adjustAmount
;
this
.
amount
=
amount
;
this
.
confirmType
=
confirmType
;
this
.
contactAddress
=
contactAddress
;
this
.
contactEmail
=
contactEmail
;
this
.
contactMobile
=
contactMobile
;
this
.
contactName
=
contactName
;
this
.
contactTel
=
contactTel
;
this
.
ctripCardNo
=
ctripCardNo
;
this
.
currency
=
currency
;
this
.
discountAmount
=
discountAmount
;
this
.
exchangeRate
=
exchangeRate
;
this
.
externalNo
=
externalNo
;
this
.
finishDate
=
finishDate
;
this
.
firstRiskStatus
=
firstRiskStatus
;
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
this
.
onPayAmount
=
onPayAmount
;
this
.
orderDate
=
orderDate
;
this
.
orderName
=
orderName
;
this
.
orderNo
=
orderNo
;
this
.
orderStatus
=
orderStatus
;
this
.
orderType
=
orderType
;
this
.
orderUserStatus
=
orderUserStatus
;
this
.
payMode
=
payMode
;
this
.
prePayAmount
=
prePayAmount
;
this
.
prePayCardAmount
=
prePayCardAmount
;
this
.
processStatus
=
processStatus
;
this
.
provConfirmTime
=
provConfirmTime
;
this
.
remark
=
remark
;
this
.
riskCheckStatus
=
riskCheckStatus
;
this
.
secondRiskStatus
=
secondRiskStatus
;
this
.
tempOrderNo
=
tempOrderNo
;
this
.
tmoney
=
tmoney
;
this
.
totalAmount
=
totalAmount
;
this
.
uid
=
uid
;
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
this
.
orderSource
=
orderSource
;
this
.
preAuthAmount
=
preAuthAmount
;
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
this
.
payDate
=
payDate
;
this
.
orderCategory
=
orderCategory
;
this
.
guaranteeAmount
=
guaranteeAmount
;
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
this
.
launchRefundAmount
=
launchRefundAmount
;
this
.
refundAmount
=
refundAmount
;
this
.
applyTime
=
applyTime
;
this
.
launchRefundTime
=
launchRefundTime
;
this
.
refundTime
=
refundTime
;
this
.
launchDeductByGuaranteeTime
=
launchDeductByGuaranteeTime
;
this
.
deductByGuaranteeTime
=
deductByGuaranteeTime
;
this
.
launchDeductByPreAuthTime
=
launchDeductByPreAuthTime
;
this
.
deductByPreAuthTime
=
deductByPreAuthTime
;
this
.
applyFailReason
=
applyFailReason
;
this
.
refundFailReason
=
refundFailReason
;
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
this
.
launchReleasePreAuthTime
=
launchReleasePreAuthTime
;
this
.
releasePreAuthTime
=
releasePreAuthTime
;
this
.
isThird
=
isThird
;
this
.
voucherAmount
=
voucherAmount
;
this
.
voucherRefundAmount
=
voucherRefundAmount
;
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
this
.
voucherIDList
=
voucherIDList
;
this
.
voucherCount
=
voucherCount
;
this
.
giftCardAmount
=
giftCardAmount
;
this
.
setPaymentRequestID
(
paymentRequestID
);
}
/**
* 结算日期
*/
private
Date
settleDate
;
@Id
@GeneratedValue
(
strategy
=
IDENTITY
)
@Column
(
name
=
"OrderID"
,
unique
=
true
,
nullable
=
false
)
public
Integer
getOrderId
()
{
return
this
.
orderId
;
}
/**
* 财务备注
*/
private
String
finComment
;
public
void
setOrderId
(
Integer
orderId
)
{
this
.
orderId
=
orderId
;
}
/**
* 订单来源(一级)(目前就offline使用)
*/
private
String
channel1
;
@Column
(
name
=
"ActualAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getActualAmount
()
{
return
this
.
actualAmount
;
}
/**
* 订单来源(二级)(目前就offline使用)
*/
private
String
channel2
;
public
void
setActualAmount
(
BigDecimal
actualAmount
)
{
this
.
actualAmount
=
actualAmount
;
}
private
int
orderIntegralStatus
;
@Column
(
name
=
"AdjustAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getAdjustAmount
()
{
return
this
.
adjustAmount
;
}
private
int
shareIntegralStatus
;
public
void
setAdjustAmount
(
BigDecimal
adjustAmount
)
{
this
.
adjustAmount
=
adjustAmount
;
}
private
boolean
hasInvoice
;
@Column
(
name
=
"Amount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getAmount
()
{
return
this
.
amount
;
}
private
BigDecimal
giftCardAmount
;
/**
* 支付的版本
*/
private
Integer
paymentVersion
=
2
;
/**
* 最终订单来源 即商户使用何种方式调用携程支付H5/Online/Native SDK/Offline
*/
private
String
platform
;
/**
* 外部编号
*/
private
String
outTradeId
;
/**
* 继续预订关联的订单编号
*/
private
long
relationOrderNo
;
/**
* 客户端是否可见
*/
private
boolean
enable
;
/**
* 手动扣款成功类型:1 支付宝;2 微信;3 银行卡;4 其他
*/
private
Integer
offlinePayType
;
public
void
setAmount
(
BigDecimal
amount
)
{
this
.
amount
=
amount
;
}
@Column
(
name
=
"ConfirmType"
,
nullable
=
false
)
public
int
getConfirmType
()
{
return
this
.
confirmType
;
}
private
Boolean
deleteFlag
;
private
Boolean
sendNotifyMsg
=
true
;
public
void
setConfirmType
(
int
confirmType
)
{
this
.
confirmType
=
confirmType
;
}
private
Boolean
onlineOrderFlag
=
true
;
@Column
(
name
=
"ContactAddress"
,
nullable
=
false
,
length
=
256
)
public
String
getContactAddress
()
{
return
this
.
contactAddress
;
}
/**
* 用户类型(活跃用户,非活跃用户,新用户未下单)
*/
private
String
userType
;
/**订单总的立减金额*/
private
BigDecimal
vipmemberDiscount
;
/**订单总的随机立减折扣*/
private
BigDecimal
vipmemberDiscountRate
;
//关联订单发票表id
private
Integer
invoiceId
;
//可开发票时间---赛事和单定场订单在打球之后;其它的规则待定
private
Date
canInvoiceDate
;
public
Order
()
{
}
public
Order
(
BigDecimal
actualAmount
,
BigDecimal
adjustAmount
,
BigDecimal
amount
,
int
confirmType
,
String
contactAddress
,
String
contactEmail
,
String
contactMobile
,
String
contactName
,
String
contactTel
,
String
ctripCardNo
,
String
currency
,
BigDecimal
discountAmount
,
BigDecimal
exchangeRate
,
String
externalNo
,
int
firstRiskStatus
,
BigDecimal
limitedEmoneyAmount
,
BigDecimal
onPayAmount
,
Date
orderDate
,
String
orderName
,
long
orderNo
,
String
orderStatus
,
int
orderType
,
int
orderUserStatus
,
String
payMode
,
BigDecimal
prePayAmount
,
BigDecimal
prePayCardAmount
,
int
processStatus
,
String
remark
,
int
riskCheckStatus
,
int
secondRiskStatus
,
String
tempOrderNo
,
BigDecimal
tmoney
,
BigDecimal
totalAmount
,
String
uid
,
BigDecimal
unlimitedEmoneyAmount
,
Date
dataChangeLastTime
,
int
orderSource
,
BigDecimal
preAuthAmount
,
BigDecimal
deductByPreAuthAmount
,
int
orderCategory
,
BigDecimal
guaranteeAmount
,
BigDecimal
deductByGuaranteeAmount
,
BigDecimal
prePayCardRefundAmount
,
BigDecimal
launchRefundAmount
,
BigDecimal
refundAmount
,
String
applyFailReason
,
String
refundFailReason
,
String
deductByGuaranteeFailReason
,
String
deductByPreAuthFailReason
,
String
releasePreAuthFailReason
,
int
isThird
,
BigDecimal
voucherAmount
,
BigDecimal
voucherRefundAmount
,
int
prePayCardDeductFlag
,
String
voucherIDList
,
int
voucherCount
,
String
paymentRequestID
,
BigDecimal
giftCardAmount
)
{
this
.
actualAmount
=
actualAmount
;
this
.
adjustAmount
=
adjustAmount
;
this
.
amount
=
amount
;
this
.
confirmType
=
confirmType
;
this
.
contactAddress
=
contactAddress
;
this
.
contactEmail
=
contactEmail
;
this
.
contactMobile
=
contactMobile
;
this
.
contactName
=
contactName
;
this
.
contactTel
=
contactTel
;
this
.
ctripCardNo
=
ctripCardNo
;
this
.
currency
=
currency
;
this
.
discountAmount
=
discountAmount
;
this
.
exchangeRate
=
exchangeRate
;
this
.
externalNo
=
externalNo
;
this
.
firstRiskStatus
=
firstRiskStatus
;
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
this
.
onPayAmount
=
onPayAmount
;
this
.
orderDate
=
orderDate
;
this
.
orderName
=
orderName
;
this
.
orderNo
=
orderNo
;
this
.
orderStatus
=
orderStatus
;
this
.
orderType
=
orderType
;
this
.
orderUserStatus
=
orderUserStatus
;
this
.
payMode
=
payMode
;
this
.
prePayAmount
=
prePayAmount
;
this
.
prePayCardAmount
=
prePayCardAmount
;
this
.
processStatus
=
processStatus
;
this
.
remark
=
remark
;
this
.
riskCheckStatus
=
riskCheckStatus
;
this
.
secondRiskStatus
=
secondRiskStatus
;
this
.
tempOrderNo
=
tempOrderNo
;
this
.
tmoney
=
tmoney
;
this
.
totalAmount
=
totalAmount
;
this
.
uid
=
uid
;
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
this
.
orderSource
=
orderSource
;
this
.
preAuthAmount
=
preAuthAmount
;
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
this
.
orderCategory
=
orderCategory
;
this
.
guaranteeAmount
=
guaranteeAmount
;
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
this
.
launchRefundAmount
=
launchRefundAmount
;
this
.
refundAmount
=
refundAmount
;
this
.
applyFailReason
=
applyFailReason
;
this
.
refundFailReason
=
refundFailReason
;
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
this
.
isThird
=
isThird
;
this
.
voucherAmount
=
voucherAmount
;
this
.
voucherRefundAmount
=
voucherRefundAmount
;
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
this
.
voucherIDList
=
voucherIDList
;
this
.
voucherCount
=
voucherCount
;
this
.
giftCardAmount
=
giftCardAmount
;
this
.
setPaymentRequestID
(
paymentRequestID
);
}
public
Order
(
BigDecimal
actualAmount
,
BigDecimal
adjustAmount
,
BigDecimal
amount
,
int
confirmType
,
String
contactAddress
,
String
contactEmail
,
String
contactMobile
,
String
contactName
,
String
contactTel
,
String
ctripCardNo
,
String
currency
,
BigDecimal
discountAmount
,
BigDecimal
exchangeRate
,
String
externalNo
,
Date
finishDate
,
int
firstRiskStatus
,
BigDecimal
limitedEmoneyAmount
,
BigDecimal
onPayAmount
,
Date
orderDate
,
String
orderName
,
long
orderNo
,
String
orderStatus
,
int
orderType
,
int
orderUserStatus
,
String
payMode
,
BigDecimal
prePayAmount
,
BigDecimal
prePayCardAmount
,
int
processStatus
,
Date
provConfirmTime
,
String
remark
,
int
riskCheckStatus
,
int
secondRiskStatus
,
String
tempOrderNo
,
BigDecimal
tmoney
,
BigDecimal
totalAmount
,
String
uid
,
BigDecimal
unlimitedEmoneyAmount
,
Date
dataChangeLastTime
,
int
orderSource
,
BigDecimal
preAuthAmount
,
BigDecimal
deductByPreAuthAmount
,
Date
payDate
,
int
orderCategory
,
BigDecimal
guaranteeAmount
,
BigDecimal
deductByGuaranteeAmount
,
BigDecimal
prePayCardRefundAmount
,
BigDecimal
launchRefundAmount
,
BigDecimal
refundAmount
,
Date
applyTime
,
Date
launchRefundTime
,
Date
refundTime
,
Date
launchDeductByGuaranteeTime
,
Date
deductByGuaranteeTime
,
Date
launchDeductByPreAuthTime
,
Date
deductByPreAuthTime
,
String
applyFailReason
,
String
refundFailReason
,
String
deductByGuaranteeFailReason
,
String
deductByPreAuthFailReason
,
String
releasePreAuthFailReason
,
Date
launchReleasePreAuthTime
,
Date
releasePreAuthTime
,
int
isThird
,
BigDecimal
voucherAmount
,
BigDecimal
voucherRefundAmount
,
int
prePayCardDeductFlag
,
String
voucherIDList
,
int
voucherCount
,
String
paymentRequestID
,
BigDecimal
giftCardAmount
)
{
this
.
actualAmount
=
actualAmount
;
this
.
adjustAmount
=
adjustAmount
;
this
.
amount
=
amount
;
this
.
confirmType
=
confirmType
;
this
.
contactAddress
=
contactAddress
;
this
.
contactEmail
=
contactEmail
;
this
.
contactMobile
=
contactMobile
;
this
.
contactName
=
contactName
;
this
.
contactTel
=
contactTel
;
this
.
ctripCardNo
=
ctripCardNo
;
this
.
currency
=
currency
;
this
.
discountAmount
=
discountAmount
;
this
.
exchangeRate
=
exchangeRate
;
this
.
externalNo
=
externalNo
;
this
.
finishDate
=
finishDate
;
this
.
firstRiskStatus
=
firstRiskStatus
;
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
this
.
onPayAmount
=
onPayAmount
;
this
.
orderDate
=
orderDate
;
this
.
orderName
=
orderName
;
this
.
orderNo
=
orderNo
;
this
.
orderStatus
=
orderStatus
;
this
.
orderType
=
orderType
;
this
.
orderUserStatus
=
orderUserStatus
;
this
.
payMode
=
payMode
;
this
.
prePayAmount
=
prePayAmount
;
this
.
prePayCardAmount
=
prePayCardAmount
;
this
.
processStatus
=
processStatus
;
this
.
provConfirmTime
=
provConfirmTime
;
this
.
remark
=
remark
;
this
.
riskCheckStatus
=
riskCheckStatus
;
this
.
secondRiskStatus
=
secondRiskStatus
;
this
.
tempOrderNo
=
tempOrderNo
;
this
.
tmoney
=
tmoney
;
this
.
totalAmount
=
totalAmount
;
this
.
uid
=
uid
;
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
this
.
orderSource
=
orderSource
;
this
.
preAuthAmount
=
preAuthAmount
;
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
this
.
payDate
=
payDate
;
this
.
orderCategory
=
orderCategory
;
this
.
guaranteeAmount
=
guaranteeAmount
;
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
this
.
launchRefundAmount
=
launchRefundAmount
;
this
.
refundAmount
=
refundAmount
;
this
.
applyTime
=
applyTime
;
this
.
launchRefundTime
=
launchRefundTime
;
this
.
refundTime
=
refundTime
;
this
.
launchDeductByGuaranteeTime
=
launchDeductByGuaranteeTime
;
this
.
deductByGuaranteeTime
=
deductByGuaranteeTime
;
this
.
launchDeductByPreAuthTime
=
launchDeductByPreAuthTime
;
this
.
deductByPreAuthTime
=
deductByPreAuthTime
;
this
.
applyFailReason
=
applyFailReason
;
this
.
refundFailReason
=
refundFailReason
;
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
this
.
launchReleasePreAuthTime
=
launchReleasePreAuthTime
;
this
.
releasePreAuthTime
=
releasePreAuthTime
;
this
.
isThird
=
isThird
;
this
.
voucherAmount
=
voucherAmount
;
this
.
voucherRefundAmount
=
voucherRefundAmount
;
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
this
.
voucherIDList
=
voucherIDList
;
this
.
voucherCount
=
voucherCount
;
this
.
giftCardAmount
=
giftCardAmount
;
this
.
setPaymentRequestID
(
paymentRequestID
);
}
@Id
@GeneratedValue
(
strategy
=
IDENTITY
)
@Column
(
name
=
"OrderID"
,
unique
=
true
,
nullable
=
false
)
public
Integer
getOrderId
()
{
return
this
.
orderId
;
}
public
void
setOrderId
(
Integer
orderId
)
{
this
.
orderId
=
orderId
;
}
@Column
(
name
=
"ActualAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getActualAmount
()
{
return
this
.
actualAmount
;
}
public
void
setActualAmount
(
BigDecimal
actualAmount
)
{
this
.
actualAmount
=
actualAmount
;
}
@Column
(
name
=
"AdjustAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getAdjustAmount
()
{
return
this
.
adjustAmount
;
}
public
void
setAdjustAmount
(
BigDecimal
adjustAmount
)
{
this
.
adjustAmount
=
adjustAmount
;
}
@Column
(
name
=
"Amount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getAmount
()
{
return
this
.
amount
;
}
public
void
setAmount
(
BigDecimal
amount
)
{
this
.
amount
=
amount
;
}
@Column
(
name
=
"ConfirmType"
,
nullable
=
false
)
public
int
getConfirmType
()
{
return
this
.
confirmType
;
}
public
void
setConfirmType
(
int
confirmType
)
{
this
.
confirmType
=
confirmType
;
}
@Column
(
name
=
"ContactAddress"
,
nullable
=
false
,
length
=
256
)
public
String
getContactAddress
()
{
return
this
.
contactAddress
;
}
public
void
setContactAddress
(
String
contactAddress
)
{
this
.
contactAddress
=
contactAddress
;
}
@Column
(
name
=
"ContactEMail"
,
nullable
=
false
,
length
=
30
)
public
String
getContactEmail
()
{
return
this
.
contactEmail
;
}
public
void
setContactEmail
(
String
contactEmail
)
{
this
.
contactEmail
=
contactEmail
;
}
@Column
(
name
=
"ContactMobile"
,
nullable
=
false
,
length
=
30
)
public
String
getContactMobile
()
{
return
this
.
contactMobile
;
}
public
void
setContactMobile
(
String
contactMobile
)
{
this
.
contactMobile
=
contactMobile
;
}
@Column
(
name
=
"ContactName"
,
nullable
=
false
,
length
=
20
)
public
String
getContactName
()
{
return
this
.
contactName
;
}
public
void
setContactName
(
String
contactName
)
{
this
.
contactName
=
contactName
;
}
@Column
(
name
=
"ContactTel"
,
nullable
=
false
,
length
=
30
)
public
String
getContactTel
()
{
return
this
.
contactTel
;
}
public
void
setContactTel
(
String
contactTel
)
{
this
.
contactTel
=
contactTel
;
}
@Column
(
name
=
"CtripCardNo"
,
nullable
=
false
,
length
=
20
)
public
String
getCtripCardNo
()
{
return
this
.
ctripCardNo
;
}
public
void
setCtripCardNo
(
String
ctripCardNo
)
{
this
.
ctripCardNo
=
ctripCardNo
;
}
@Column
(
name
=
"Currency"
,
nullable
=
false
,
length
=
20
)
public
String
getCurrency
()
{
return
this
.
currency
;
}
public
void
setCurrency
(
String
currency
)
{
this
.
currency
=
currency
;
}
@Column
(
name
=
"DiscountAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDiscountAmount
()
{
return
this
.
discountAmount
;
}
public
void
setDiscountAmount
(
BigDecimal
discountAmount
)
{
this
.
discountAmount
=
discountAmount
;
}
@Column
(
name
=
"ExchangeRate"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getExchangeRate
()
{
return
this
.
exchangeRate
;
}
public
void
setExchangeRate
(
BigDecimal
exchangeRate
)
{
this
.
exchangeRate
=
exchangeRate
;
}
@Column
(
name
=
"ExternalNo"
,
nullable
=
false
,
length
=
50
)
public
String
getExternalNo
()
{
return
this
.
externalNo
;
}
public
void
setExternalNo
(
String
externalNo
)
{
this
.
externalNo
=
externalNo
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"FinishDate"
,
length
=
19
)
public
Date
getFinishDate
()
{
return
this
.
finishDate
;
}
public
void
setFinishDate
(
Date
finishDate
)
{
this
.
finishDate
=
finishDate
;
}
@Column
(
name
=
"FirstRiskStatus"
,
nullable
=
false
)
public
int
getFirstRiskStatus
()
{
return
this
.
firstRiskStatus
;
}
public
void
setFirstRiskStatus
(
int
firstRiskStatus
)
{
this
.
firstRiskStatus
=
firstRiskStatus
;
}
@Column
(
name
=
"LimitedEMoneyAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getLimitedEmoneyAmount
()
{
return
this
.
limitedEmoneyAmount
;
}
public
void
setLimitedEmoneyAmount
(
BigDecimal
limitedEmoneyAmount
)
{
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
}
@Column
(
name
=
"OnPayAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getOnPayAmount
()
{
return
this
.
onPayAmount
;
}
public
void
setOnPayAmount
(
BigDecimal
onPayAmount
)
{
this
.
onPayAmount
=
onPayAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"OrderDate"
,
nullable
=
false
,
length
=
19
)
public
Date
getOrderDate
()
{
return
this
.
orderDate
;
}
public
void
setOrderDate
(
Date
orderDate
)
{
this
.
orderDate
=
orderDate
;
}
@Column
(
name
=
"OrderName"
,
nullable
=
false
,
length
=
100
)
public
String
getOrderName
()
{
return
this
.
orderName
;
}
public
void
setOrderName
(
String
orderName
)
{
this
.
orderName
=
orderName
;
}
@Column
(
name
=
"OrderNo"
,
nullable
=
false
)
public
long
getOrderNo
()
{
return
this
.
orderNo
;
}
public
void
setOrderNo
(
long
orderNo
)
{
this
.
orderNo
=
orderNo
;
}
@Column
(
name
=
"OrderStatus"
,
nullable
=
false
,
length
=
2
)
public
String
getOrderStatus
()
{
return
this
.
orderStatus
;
}
public
void
setOrderStatus
(
String
orderStatus
)
{
this
.
orderStatus
=
orderStatus
;
}
@Column
(
name
=
"OrderType"
,
nullable
=
false
)
public
int
getOrderType
()
{
return
this
.
orderType
;
}
public
void
setOrderType
(
int
orderType
)
{
this
.
orderType
=
orderType
;
}
@Column
(
name
=
"OrderUserStatus"
,
nullable
=
false
)
public
int
getOrderUserStatus
()
{
return
this
.
orderUserStatus
;
}
public
void
setOrderUserStatus
(
int
orderUserStatus
)
{
this
.
orderUserStatus
=
orderUserStatus
;
}
@Column
(
name
=
"PayMode"
,
nullable
=
false
)
public
String
getPayMode
()
{
return
this
.
payMode
;
}
public
void
setPayMode
(
String
payMode
)
{
this
.
payMode
=
payMode
;
}
@Column
(
name
=
"PrePayAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayAmount
()
{
return
this
.
prePayAmount
;
}
public
void
setPrePayAmount
(
BigDecimal
prePayAmount
)
{
this
.
prePayAmount
=
prePayAmount
;
}
@Column
(
name
=
"PrePayCardAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayCardAmount
()
{
return
this
.
prePayCardAmount
;
}
public
void
setPrePayCardAmount
(
BigDecimal
prePayCardAmount
)
{
this
.
prePayCardAmount
=
prePayCardAmount
;
}
@Column
(
name
=
"ProcessStatus"
,
nullable
=
false
)
public
int
getProcessStatus
()
{
return
this
.
processStatus
;
}
public
void
setProcessStatus
(
int
processStatus
)
{
this
.
processStatus
=
processStatus
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ProvConfirmTime"
,
length
=
19
)
public
Date
getProvConfirmTime
()
{
return
this
.
provConfirmTime
;
}
public
void
setProvConfirmTime
(
Date
provConfirmTime
)
{
this
.
provConfirmTime
=
provConfirmTime
;
}
@Column
(
name
=
"Remark"
,
nullable
=
false
,
length
=
512
)
public
String
getRemark
()
{
return
this
.
remark
;
}
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
;
}
@Column
(
name
=
"RiskCheckStatus"
,
nullable
=
false
)
public
int
getRiskCheckStatus
()
{
return
this
.
riskCheckStatus
;
}
public
void
setRiskCheckStatus
(
int
riskCheckStatus
)
{
this
.
riskCheckStatus
=
riskCheckStatus
;
}
@Column
(
name
=
"SecondRiskStatus"
,
nullable
=
false
)
public
int
getSecondRiskStatus
()
{
return
this
.
secondRiskStatus
;
}
public
void
setSecondRiskStatus
(
int
secondRiskStatus
)
{
this
.
secondRiskStatus
=
secondRiskStatus
;
}
@Column
(
name
=
"TempOrderNo"
,
nullable
=
false
,
length
=
50
)
public
String
getTempOrderNo
()
{
return
this
.
tempOrderNo
;
}
public
void
setTempOrderNo
(
String
tempOrderNo
)
{
this
.
tempOrderNo
=
tempOrderNo
;
}
@Column
(
name
=
"Tmoney"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getTmoney
()
{
return
this
.
tmoney
;
}
public
void
setTmoney
(
BigDecimal
tmoney
)
{
this
.
tmoney
=
tmoney
;
}
@Column
(
name
=
"TotalAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getTotalAmount
()
{
return
this
.
totalAmount
;
}
public
void
setTotalAmount
(
BigDecimal
totalAmount
)
{
this
.
totalAmount
=
totalAmount
;
}
@Column
(
name
=
"Uid"
,
nullable
=
false
,
length
=
20
)
public
String
getUid
()
{
return
this
.
uid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
@Column
(
name
=
"UnlimitedEMoneyAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getUnlimitedEmoneyAmount
()
{
return
this
.
unlimitedEmoneyAmount
;
}
public
void
setUnlimitedEmoneyAmount
(
BigDecimal
unlimitedEmoneyAmount
)
{
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
}
@Column
(
name
=
"OrderSource"
,
nullable
=
false
)
public
int
getOrderSource
()
{
return
this
.
orderSource
;
}
public
void
setOrderSource
(
int
orderSource
)
{
this
.
orderSource
=
orderSource
;
}
@Column
(
name
=
"PreAuthAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPreAuthAmount
()
{
return
this
.
preAuthAmount
;
}
public
void
setPreAuthAmount
(
BigDecimal
preAuthAmount
)
{
this
.
preAuthAmount
=
preAuthAmount
;
}
@Column
(
name
=
"DeductByPreAuthAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDeductByPreAuthAmount
()
{
return
this
.
deductByPreAuthAmount
;
}
public
void
setDeductByPreAuthAmount
(
BigDecimal
deductByPreAuthAmount
)
{
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"PayDate"
,
length
=
19
)
public
Date
getPayDate
()
{
return
this
.
payDate
;
}
public
void
setPayDate
(
Date
payDate
)
{
this
.
payDate
=
payDate
;
}
@Column
(
name
=
"OrderCategory"
,
nullable
=
false
)
public
int
getOrderCategory
()
{
return
this
.
orderCategory
;
}
public
void
setOrderCategory
(
int
orderCategory
)
{
this
.
orderCategory
=
orderCategory
;
}
@Column
(
name
=
"GuaranteeAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getGuaranteeAmount
()
{
return
this
.
guaranteeAmount
;
}
public
void
setGuaranteeAmount
(
BigDecimal
guaranteeAmount
)
{
this
.
guaranteeAmount
=
guaranteeAmount
;
}
@Column
(
name
=
"DeductByGuaranteeAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDeductByGuaranteeAmount
()
{
return
this
.
deductByGuaranteeAmount
;
}
public
void
setDeductByGuaranteeAmount
(
BigDecimal
deductByGuaranteeAmount
)
{
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
}
@Column
(
name
=
"PrePayCardRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayCardRefundAmount
()
{
return
this
.
prePayCardRefundAmount
;
}
public
void
setPrePayCardRefundAmount
(
BigDecimal
prePayCardRefundAmount
)
{
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
}
@Column
(
name
=
"RefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getRefundAmount
()
{
return
this
.
refundAmount
;
}
public
void
setRefundAmount
(
BigDecimal
refundAmount
)
{
this
.
refundAmount
=
refundAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ApplyTime"
,
length
=
19
)
public
Date
getApplyTime
()
{
return
this
.
applyTime
;
}
public
void
setApplyTime
(
Date
applyTime
)
{
this
.
applyTime
=
applyTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchRefundTime"
,
length
=
19
)
public
Date
getLaunchRefundTime
()
{
return
this
.
launchRefundTime
;
}
public
void
setLaunchRefundTime
(
Date
launchRefundTime
)
{
this
.
launchRefundTime
=
launchRefundTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"RefundTime"
,
length
=
19
)
public
Date
getRefundTime
()
{
return
this
.
refundTime
;
}
public
void
setRefundTime
(
Date
refundTime
)
{
this
.
refundTime
=
refundTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchDeductByGuaranteeTime"
,
length
=
19
)
public
Date
getLaunchDeductByGuaranteeTime
()
{
return
this
.
launchDeductByGuaranteeTime
;
}
public
void
setLaunchDeductByGuaranteeTime
(
Date
launchDeductByGuaranteeTime
)
{
this
.
launchDeductByGuaranteeTime
=
launchDeductByGuaranteeTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"DeductByGuaranteeTime"
,
length
=
19
)
public
Date
getDeductByGuaranteeTime
()
{
return
this
.
deductByGuaranteeTime
;
}
public
void
setDeductByGuaranteeTime
(
Date
deductByGuaranteeTime
)
{
this
.
deductByGuaranteeTime
=
deductByGuaranteeTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchDeductByPreAuthTime"
,
length
=
19
)
public
Date
getLaunchDeductByPreAuthTime
()
{
return
this
.
launchDeductByPreAuthTime
;
}
public
void
setLaunchDeductByPreAuthTime
(
Date
launchDeductByPreAuthTime
)
{
this
.
launchDeductByPreAuthTime
=
launchDeductByPreAuthTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"DeductByPreAuthTime"
,
length
=
19
)
public
Date
getDeductByPreAuthTime
()
{
return
this
.
deductByPreAuthTime
;
}
public
void
setDeductByPreAuthTime
(
Date
deductByPreAuthTime
)
{
this
.
deductByPreAuthTime
=
deductByPreAuthTime
;
}
@Column
(
name
=
"ApplyFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getApplyFailReason
()
{
return
this
.
applyFailReason
;
}
public
void
setApplyFailReason
(
String
applyFailReason
)
{
this
.
applyFailReason
=
applyFailReason
;
}
@Column
(
name
=
"RefundFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getRefundFailReason
()
{
return
this
.
refundFailReason
;
}
public
void
setRefundFailReason
(
String
refundFailReason
)
{
this
.
refundFailReason
=
refundFailReason
;
}
@Column
(
name
=
"DeductByGuaranteeFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getDeductByGuaranteeFailReason
()
{
return
this
.
deductByGuaranteeFailReason
;
}
public
void
setDeductByGuaranteeFailReason
(
String
deductByGuaranteeFailReason
)
{
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
}
@Column
(
name
=
"DeductByPreAuthFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getDeductByPreAuthFailReason
()
{
return
this
.
deductByPreAuthFailReason
;
}
public
void
setDeductByPreAuthFailReason
(
String
deductByPreAuthFailReason
)
{
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
}
@Column
(
name
=
"ReleasePreAuthFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getReleasePreAuthFailReason
()
{
return
this
.
releasePreAuthFailReason
;
}
public
void
setReleasePreAuthFailReason
(
String
releasePreAuthFailReason
)
{
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchReleasePreAuthTime"
,
length
=
19
)
public
Date
getLaunchReleasePreAuthTime
()
{
return
this
.
launchReleasePreAuthTime
;
}
public
void
setLaunchReleasePreAuthTime
(
Date
launchReleasePreAuthTime
)
{
this
.
launchReleasePreAuthTime
=
launchReleasePreAuthTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ReleasePreAuthTime"
,
length
=
19
)
public
Date
getReleasePreAuthTime
()
{
return
this
.
releasePreAuthTime
;
}
public
void
setReleasePreAuthTime
(
Date
releasePreAuthTime
)
{
this
.
releasePreAuthTime
=
releasePreAuthTime
;
}
@Column
(
name
=
"LaunchRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getLaunchRefundAmount
()
{
return
launchRefundAmount
;
}
public
void
setLaunchRefundAmount
(
BigDecimal
launchRefundAmount
)
{
this
.
launchRefundAmount
=
launchRefundAmount
;
}
@Column
(
name
=
"IsThird"
,
nullable
=
false
)
public
int
getIsThird
()
{
return
isThird
;
}
public
void
setIsThird
(
int
isThird
)
{
this
.
isThird
=
isThird
;
}
@Column
(
name
=
"VoucherAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getVoucherAmount
()
{
return
voucherAmount
;
}
public
void
setVoucherAmount
(
BigDecimal
voucherAmount
)
{
this
.
voucherAmount
=
voucherAmount
;
}
@Column
(
name
=
"VoucherRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getVoucherRefundAmount
()
{
return
voucherRefundAmount
;
}
public
void
setVoucherRefundAmount
(
BigDecimal
voucherRefundAmount
)
{
this
.
voucherRefundAmount
=
voucherRefundAmount
;
}
@Column
(
name
=
"PrePayCardDeductFlag"
,
nullable
=
false
)
public
int
getPrePayCardDeductFlag
()
{
return
prePayCardDeductFlag
;
}
public
void
setPrePayCardDeductFlag
(
int
prePayCardDeductFlag
)
{
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
}
@Column
(
name
=
"VoucherIDList"
,
nullable
=
false
,
length
=
512
)
public
String
getVoucherIDList
()
{
return
voucherIDList
;
}
public
void
setVoucherIDList
(
String
voucherIDList
)
{
this
.
voucherIDList
=
voucherIDList
;
}
@Column
(
name
=
"VoucherCount"
,
nullable
=
false
)
public
int
getVoucherCount
()
{
return
voucherCount
;
}
public
void
setVoucherCount
(
int
voucherCount
)
{
this
.
voucherCount
=
voucherCount
;
}
@Column
(
name
=
"PaymentRequestID"
,
nullable
=
false
,
length
=
50
)
public
String
getPaymentRequestID
()
{
return
paymentRequestID
;
}
public
void
setPaymentRequestID
(
String
paymentRequestID
)
{
this
.
paymentRequestID
=
paymentRequestID
;
}
@Column
(
name
=
"cancelStatus"
)
public
int
getCancelStatus
()
{
return
cancelStatus
;
}
public
void
setCancelStatus
(
int
cancelStatus
)
{
this
.
cancelStatus
=
cancelStatus
;
}
@Column
(
name
=
"notifyFlag"
)
public
String
getNotifyFlag
()
{
return
notifyFlag
;
}
public
void
setNotifyFlag
(
String
notifyFlag
)
{
this
.
notifyFlag
=
notifyFlag
;
}
/**
* 用户是否成功付款
*
* @return
*/
@Transient
public
boolean
isPaied
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
orderStatusEnum
==
OrderStatusEnum
.
PARTIAL_REFUND
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_DEAL
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY_PARTY
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY_CASH
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_DEAL_CASH
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_INVOICE
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户是否付款
*
* @return
*/
@Transient
public
boolean
isPay
()
{
// 付款成功或者等待中返回true,付款失败返回false
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
this
.
isPaied
()
||
orderStatusEnum
==
OrderStatusEnum
.
CHARGING
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户在付款途中
*
* @return
*/
@Transient
public
boolean
isPayOnTheWay
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
this
.
isNotPay
()
||
orderStatusEnum
==
OrderStatusEnum
.
CHARGING
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户是否待支付
*
* @return
*/
@Transient
public
boolean
isNotPay
()
{
// 付款成功或者等待中返回true,付款失败返回false
if
(
this
.
getOrderStatusEnum
()
==
OrderStatusEnum
.
NOT_PAY
)
return
true
;
else
return
false
;
}
/**
* 得到订单状态,没有考虑发票递送的情况
*
* @return OrderStatusEnum
*/
@Transient
public
OrderStatusEnum
getOrderStatusEnum
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
return
orderStatusEnum
;
}
@Column
(
name
=
"CashRebate"
)
public
double
getCashRebate
()
{
return
cashRebate
;
}
@Column
(
name
=
"CashRebateStatus"
)
public
int
getCashRebateStatus
()
{
return
cashRebateStatus
;
}
public
void
setCashRebate
(
double
cashRebate
)
{
this
.
cashRebate
=
cashRebate
;
}
public
void
setCashRebateStatus
(
int
cashRebateStatus
)
{
this
.
cashRebateStatus
=
cashRebateStatus
;
}
/**
* 企业赞助活动ID
*
* @return campaignID
*/
@Column
(
name
=
"CampaignID"
)
public
int
getCampaignID
()
{
return
campaignID
;
}
public
void
setCampaignID
(
int
campaignID
)
{
this
.
campaignID
=
campaignID
;
}
@Column
(
name
=
"SponsorUnitAmount"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getSponsorUnitAmount
()
{
return
sponsorUnitAmount
;
}
public
void
setSponsorUnitAmount
(
BigDecimal
sponsorUnitAmount
)
{
this
.
sponsorUnitAmount
=
sponsorUnitAmount
;
}
@Column
(
name
=
"actualSettleAmout"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getActualSettleAmout
()
{
return
actualSettleAmout
;
}
public
void
setActualSettleAmout
(
BigDecimal
actualSettleAmout
)
{
this
.
actualSettleAmout
=
actualSettleAmout
;
}
@Column
(
name
=
"settleObj"
)
public
String
getSettleObj
()
{
return
settleObj
;
}
public
void
setSettleObj
(
String
settleObj
)
{
this
.
settleObj
=
settleObj
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"settleDate"
,
length
=
19
)
public
Date
getSettleDate
()
{
return
settleDate
;
}
public
void
setSettleDate
(
Date
settleDate
)
{
this
.
settleDate
=
settleDate
;
}
@Column
(
name
=
"finComment"
)
public
String
getFinComment
()
{
return
finComment
;
}
public
void
setFinComment
(
String
finComment
)
{
this
.
finComment
=
finComment
;
}
@Column
(
name
=
"orderIntegralStatus"
,
nullable
=
false
)
public
int
getOrderIntegralStatus
()
{
return
this
.
orderIntegralStatus
;
}
public
void
setOrderIntegralStatus
(
int
orderIntegralStatus
)
{
this
.
orderIntegralStatus
=
orderIntegralStatus
;
}
@Column
(
name
=
"shareIntegralStatus"
,
nullable
=
false
)
public
int
getShareIntegralStatus
()
{
return
this
.
shareIntegralStatus
;
}
public
void
setShareIntegralStatus
(
int
shareIntegralStatus
)
{
this
.
shareIntegralStatus
=
shareIntegralStatus
;
}
@Column
(
name
=
"channel1"
)
public
String
getChannel1
()
{
return
channel1
;
}
public
void
setChannel1
(
String
channel1
)
{
this
.
channel1
=
channel1
;
}
@Column
(
name
=
"channel2"
)
public
String
getChannel2
()
{
return
channel2
;
}
public
void
setChannel2
(
String
channel2
)
{
this
.
channel2
=
channel2
;
}
@Column
(
name
=
"giftCardAmount"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getGiftCardAmount
()
{
return
giftCardAmount
;
}
public
void
setGiftCardAmount
(
BigDecimal
giftCardAmount
)
{
this
.
giftCardAmount
=
giftCardAmount
;
}
@Column
(
name
=
"hasInvoice"
)
public
boolean
isHasInvoice
()
{
return
hasInvoice
;
}
public
void
setHasInvoice
(
boolean
hasInvoice
)
{
this
.
hasInvoice
=
hasInvoice
;
}
public
Integer
getPaymentVersion
()
{
return
paymentVersion
;
}
public
void
setPaymentVersion
(
Integer
paymentVersion
)
{
this
.
paymentVersion
=
paymentVersion
;
}
@Column
(
name
=
"platform"
)
public
String
getPlatform
()
{
return
platform
;
}
public
void
setPlatform
(
String
platform
)
{
this
.
platform
=
platform
;
}
@Column
(
name
=
"outTradeId"
)
public
String
getOutTradeId
()
{
return
outTradeId
;
}
public
void
setOutTradeId
(
String
outTradeId
)
{
this
.
outTradeId
=
outTradeId
;
}
@Column
(
name
=
"relationOrderNo"
)
public
long
getRelationOrderNo
()
{
return
relationOrderNo
;
}
@Column
(
name
=
"enable"
)
public
boolean
isEnable
()
{
return
enable
;
}
public
void
setRelationOrderNo
(
long
relationOrderNo
)
{
this
.
relationOrderNo
=
relationOrderNo
;
}
public
void
setEnable
(
boolean
enable
)
{
this
.
enable
=
enable
;
}
@Column
(
name
=
"useMemberPrice"
)
public
Boolean
getUseMemberPrice
()
{
return
useMemberPrice
;
}
@Column
(
name
=
"memberUnitAmount"
)
public
BigDecimal
getMemberUnitAmount
()
{
return
memberUnitAmount
;
}
public
void
setUseMemberPrice
(
Boolean
useMemberPrice
)
{
this
.
useMemberPrice
=
useMemberPrice
;
}
public
void
setMemberUnitAmount
(
BigDecimal
memberUnitAmount
)
{
this
.
memberUnitAmount
=
memberUnitAmount
;
}
@Column
(
name
=
"invoiceAmount"
,
precision
=
10
)
public
BigDecimal
getInvoiceAmount
()
{
return
invoiceAmount
;
}
public
void
setInvoiceAmount
(
BigDecimal
invoiceAmount
)
{
this
.
invoiceAmount
=
invoiceAmount
;
}
@Column
(
name
=
"postageAmount"
,
precision
=
10
)
public
BigDecimal
getPostageAmount
()
{
return
postageAmount
;
}
public
void
setPostageAmount
(
BigDecimal
postageAmount
)
{
this
.
postageAmount
=
postageAmount
;
}
@Column
(
name
=
"insuranceAmount"
,
precision
=
10
)
public
BigDecimal
getInsuranceAmount
()
{
return
insuranceAmount
;
}
public
void
setInsuranceAmount
(
BigDecimal
insuranceAmount
)
{
this
.
insuranceAmount
=
insuranceAmount
;
}
@Column
(
name
=
"insuranceStatus"
)
public
int
getInsuranceStatus
()
{
return
insuranceStatus
;
}
public
void
setInsuranceStatus
(
int
insuranceStatus
)
{
this
.
insuranceStatus
=
insuranceStatus
;
}
@Column
(
name
=
"offlinePayType"
)
public
Integer
getOfflinePayType
()
{
return
offlinePayType
;
}
public
void
setOfflinePayType
(
Integer
offlinePayType
)
{
this
.
offlinePayType
=
offlinePayType
;
}
public
Boolean
getDeleteFlag
()
{
return
deleteFlag
;
}
public
void
setDeleteFlag
(
Boolean
deleteFlag
)
{
this
.
deleteFlag
=
deleteFlag
;
}
@Column
(
name
=
"sendNotifyMsg"
)
public
Boolean
getSendNotifyMsg
()
{
return
sendNotifyMsg
;
}
public
void
setSendNotifyMsg
(
Boolean
sendNotifyMsg
)
{
this
.
sendNotifyMsg
=
sendNotifyMsg
;
}
@Column
(
name
=
"onlineOrderFlag"
)
public
Boolean
getOnlineOrderFlag
()
{
return
onlineOrderFlag
;
}
public
void
setOnlineOrderFlag
(
Boolean
onlineOrderFlag
)
{
this
.
onlineOrderFlag
=
onlineOrderFlag
;
}
@Column
(
name
=
"userType"
)
public
String
getUserType
()
{
return
userType
;
}
public
void
setUserType
(
String
userType
)
{
this
.
userType
=
userType
;
}
public
void
setContactAddress
(
String
contactAddress
)
{
this
.
contactAddress
=
contactAddress
;
}
@Column
(
name
=
"ContactEMail"
,
nullable
=
false
,
length
=
30
)
public
String
getContactEmail
()
{
return
this
.
contactEmail
;
}
public
void
setContactEmail
(
String
contactEmail
)
{
this
.
contactEmail
=
contactEmail
;
}
@Column
(
name
=
"ContactMobile"
,
nullable
=
false
,
length
=
30
)
public
String
getContactMobile
()
{
return
this
.
contactMobile
;
}
public
void
setContactMobile
(
String
contactMobile
)
{
this
.
contactMobile
=
contactMobile
;
}
@Column
(
name
=
"ContactName"
,
nullable
=
false
,
length
=
20
)
public
String
getContactName
()
{
return
this
.
contactName
;
}
public
void
setContactName
(
String
contactName
)
{
this
.
contactName
=
contactName
;
}
@Column
(
name
=
"ContactTel"
,
nullable
=
false
,
length
=
30
)
public
String
getContactTel
()
{
return
this
.
contactTel
;
}
public
void
setContactTel
(
String
contactTel
)
{
this
.
contactTel
=
contactTel
;
}
@Column
(
name
=
"CtripCardNo"
,
nullable
=
false
,
length
=
20
)
public
String
getCtripCardNo
()
{
return
this
.
ctripCardNo
;
}
public
void
setCtripCardNo
(
String
ctripCardNo
)
{
this
.
ctripCardNo
=
ctripCardNo
;
}
@Column
(
name
=
"Currency"
,
nullable
=
false
,
length
=
20
)
public
String
getCurrency
()
{
return
this
.
currency
;
}
public
void
setCurrency
(
String
currency
)
{
this
.
currency
=
currency
;
}
@Column
(
name
=
"DiscountAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDiscountAmount
()
{
return
this
.
discountAmount
;
}
public
void
setDiscountAmount
(
BigDecimal
discountAmount
)
{
this
.
discountAmount
=
discountAmount
;
}
@Column
(
name
=
"ExchangeRate"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getExchangeRate
()
{
return
this
.
exchangeRate
;
}
public
void
setExchangeRate
(
BigDecimal
exchangeRate
)
{
this
.
exchangeRate
=
exchangeRate
;
}
@Column
(
name
=
"ExternalNo"
,
nullable
=
false
,
length
=
50
)
public
String
getExternalNo
()
{
return
this
.
externalNo
;
}
public
void
setExternalNo
(
String
externalNo
)
{
this
.
externalNo
=
externalNo
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"FinishDate"
,
length
=
19
)
public
Date
getFinishDate
()
{
return
this
.
finishDate
;
}
public
void
setFinishDate
(
Date
finishDate
)
{
this
.
finishDate
=
finishDate
;
}
@Column
(
name
=
"FirstRiskStatus"
,
nullable
=
false
)
public
int
getFirstRiskStatus
()
{
return
this
.
firstRiskStatus
;
}
public
void
setFirstRiskStatus
(
int
firstRiskStatus
)
{
this
.
firstRiskStatus
=
firstRiskStatus
;
}
@Column
(
name
=
"LimitedEMoneyAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getLimitedEmoneyAmount
()
{
return
this
.
limitedEmoneyAmount
;
}
public
void
setLimitedEmoneyAmount
(
BigDecimal
limitedEmoneyAmount
)
{
this
.
limitedEmoneyAmount
=
limitedEmoneyAmount
;
}
@Column
(
name
=
"OnPayAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getOnPayAmount
()
{
return
this
.
onPayAmount
;
}
public
void
setOnPayAmount
(
BigDecimal
onPayAmount
)
{
this
.
onPayAmount
=
onPayAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"OrderDate"
,
nullable
=
false
,
length
=
19
)
public
Date
getOrderDate
()
{
return
this
.
orderDate
;
}
public
void
setOrderDate
(
Date
orderDate
)
{
this
.
orderDate
=
orderDate
;
}
@Column
(
name
=
"OrderName"
,
nullable
=
false
,
length
=
100
)
public
String
getOrderName
()
{
return
this
.
orderName
;
}
public
void
setOrderName
(
String
orderName
)
{
this
.
orderName
=
orderName
;
}
@Column
(
name
=
"OrderNo"
,
nullable
=
false
)
public
long
getOrderNo
()
{
return
this
.
orderNo
;
}
public
void
setOrderNo
(
long
orderNo
)
{
this
.
orderNo
=
orderNo
;
}
@Column
(
name
=
"OrderStatus"
,
nullable
=
false
,
length
=
2
)
public
String
getOrderStatus
()
{
return
this
.
orderStatus
;
}
public
void
setOrderStatus
(
String
orderStatus
)
{
this
.
orderStatus
=
orderStatus
;
}
@Column
(
name
=
"OrderType"
,
nullable
=
false
)
public
int
getOrderType
()
{
return
this
.
orderType
;
}
public
void
setOrderType
(
int
orderType
)
{
this
.
orderType
=
orderType
;
}
@Column
(
name
=
"OrderUserStatus"
,
nullable
=
false
)
public
int
getOrderUserStatus
()
{
return
this
.
orderUserStatus
;
}
public
void
setOrderUserStatus
(
int
orderUserStatus
)
{
this
.
orderUserStatus
=
orderUserStatus
;
}
@Column
(
name
=
"PayMode"
,
nullable
=
false
)
public
String
getPayMode
()
{
return
this
.
payMode
;
}
public
void
setPayMode
(
String
payMode
)
{
this
.
payMode
=
payMode
;
}
@Column
(
name
=
"PrePayAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayAmount
()
{
return
this
.
prePayAmount
;
}
public
void
setPrePayAmount
(
BigDecimal
prePayAmount
)
{
this
.
prePayAmount
=
prePayAmount
;
}
@Column
(
name
=
"PrePayCardAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayCardAmount
()
{
return
this
.
prePayCardAmount
;
}
public
void
setPrePayCardAmount
(
BigDecimal
prePayCardAmount
)
{
this
.
prePayCardAmount
=
prePayCardAmount
;
}
@Column
(
name
=
"ProcessStatus"
,
nullable
=
false
)
public
int
getProcessStatus
()
{
return
this
.
processStatus
;
}
public
void
setProcessStatus
(
int
processStatus
)
{
this
.
processStatus
=
processStatus
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ProvConfirmTime"
,
length
=
19
)
public
Date
getProvConfirmTime
()
{
return
this
.
provConfirmTime
;
}
public
void
setProvConfirmTime
(
Date
provConfirmTime
)
{
this
.
provConfirmTime
=
provConfirmTime
;
}
@Column
(
name
=
"Remark"
,
nullable
=
false
,
length
=
512
)
public
String
getRemark
()
{
return
this
.
remark
;
}
public
void
setRemark
(
String
remark
)
{
this
.
remark
=
remark
;
}
@Column
(
name
=
"RiskCheckStatus"
,
nullable
=
false
)
public
int
getRiskCheckStatus
()
{
return
this
.
riskCheckStatus
;
}
public
void
setRiskCheckStatus
(
int
riskCheckStatus
)
{
this
.
riskCheckStatus
=
riskCheckStatus
;
}
@Column
(
name
=
"SecondRiskStatus"
,
nullable
=
false
)
public
int
getSecondRiskStatus
()
{
return
this
.
secondRiskStatus
;
}
public
void
setSecondRiskStatus
(
int
secondRiskStatus
)
{
this
.
secondRiskStatus
=
secondRiskStatus
;
}
@Column
(
name
=
"TempOrderNo"
,
nullable
=
false
,
length
=
50
)
public
String
getTempOrderNo
()
{
return
this
.
tempOrderNo
;
}
public
void
setTempOrderNo
(
String
tempOrderNo
)
{
this
.
tempOrderNo
=
tempOrderNo
;
}
@Column
(
name
=
"Tmoney"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getTmoney
()
{
return
this
.
tmoney
;
}
public
void
setTmoney
(
BigDecimal
tmoney
)
{
this
.
tmoney
=
tmoney
;
}
@Column
(
name
=
"TotalAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getTotalAmount
()
{
return
this
.
totalAmount
;
}
public
void
setTotalAmount
(
BigDecimal
totalAmount
)
{
this
.
totalAmount
=
totalAmount
;
}
@Column
(
name
=
"Uid"
,
nullable
=
false
,
length
=
20
)
public
String
getUid
()
{
return
this
.
uid
;
}
public
void
setUid
(
String
uid
)
{
this
.
uid
=
uid
;
}
@Column
(
name
=
"UnlimitedEMoneyAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getUnlimitedEmoneyAmount
()
{
return
this
.
unlimitedEmoneyAmount
;
}
public
void
setUnlimitedEmoneyAmount
(
BigDecimal
unlimitedEmoneyAmount
)
{
this
.
unlimitedEmoneyAmount
=
unlimitedEmoneyAmount
;
}
@Column
(
name
=
"OrderSource"
,
nullable
=
false
)
public
int
getOrderSource
()
{
return
this
.
orderSource
;
}
public
void
setOrderSource
(
int
orderSource
)
{
this
.
orderSource
=
orderSource
;
}
@Column
(
name
=
"PreAuthAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPreAuthAmount
()
{
return
this
.
preAuthAmount
;
}
public
void
setPreAuthAmount
(
BigDecimal
preAuthAmount
)
{
this
.
preAuthAmount
=
preAuthAmount
;
}
@Column
(
name
=
"DeductByPreAuthAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDeductByPreAuthAmount
()
{
return
this
.
deductByPreAuthAmount
;
}
public
void
setDeductByPreAuthAmount
(
BigDecimal
deductByPreAuthAmount
)
{
this
.
deductByPreAuthAmount
=
deductByPreAuthAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"PayDate"
,
length
=
19
)
public
Date
getPayDate
()
{
return
this
.
payDate
;
}
public
void
setPayDate
(
Date
payDate
)
{
this
.
payDate
=
payDate
;
}
@Column
(
name
=
"OrderCategory"
,
nullable
=
false
)
public
int
getOrderCategory
()
{
return
this
.
orderCategory
;
}
public
void
setOrderCategory
(
int
orderCategory
)
{
this
.
orderCategory
=
orderCategory
;
}
@Column
(
name
=
"GuaranteeAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getGuaranteeAmount
()
{
return
this
.
guaranteeAmount
;
}
public
void
setGuaranteeAmount
(
BigDecimal
guaranteeAmount
)
{
this
.
guaranteeAmount
=
guaranteeAmount
;
}
@Column
(
name
=
"DeductByGuaranteeAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getDeductByGuaranteeAmount
()
{
return
this
.
deductByGuaranteeAmount
;
}
public
void
setDeductByGuaranteeAmount
(
BigDecimal
deductByGuaranteeAmount
)
{
this
.
deductByGuaranteeAmount
=
deductByGuaranteeAmount
;
}
@Column
(
name
=
"PrePayCardRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getPrePayCardRefundAmount
()
{
return
this
.
prePayCardRefundAmount
;
}
public
void
setPrePayCardRefundAmount
(
BigDecimal
prePayCardRefundAmount
)
{
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
}
@Column
(
name
=
"RefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getRefundAmount
()
{
return
this
.
refundAmount
;
}
public
void
setRefundAmount
(
BigDecimal
refundAmount
)
{
this
.
refundAmount
=
refundAmount
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ApplyTime"
,
length
=
19
)
public
Date
getApplyTime
()
{
return
this
.
applyTime
;
}
public
void
setApplyTime
(
Date
applyTime
)
{
this
.
applyTime
=
applyTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchRefundTime"
,
length
=
19
)
public
Date
getLaunchRefundTime
()
{
return
this
.
launchRefundTime
;
}
public
void
setLaunchRefundTime
(
Date
launchRefundTime
)
{
this
.
launchRefundTime
=
launchRefundTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"RefundTime"
,
length
=
19
)
public
Date
getRefundTime
()
{
return
this
.
refundTime
;
}
public
void
setRefundTime
(
Date
refundTime
)
{
this
.
refundTime
=
refundTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchDeductByGuaranteeTime"
,
length
=
19
)
public
Date
getLaunchDeductByGuaranteeTime
()
{
return
this
.
launchDeductByGuaranteeTime
;
}
public
void
setLaunchDeductByGuaranteeTime
(
Date
launchDeductByGuaranteeTime
)
{
this
.
launchDeductByGuaranteeTime
=
launchDeductByGuaranteeTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"DeductByGuaranteeTime"
,
length
=
19
)
public
Date
getDeductByGuaranteeTime
()
{
return
this
.
deductByGuaranteeTime
;
}
public
void
setDeductByGuaranteeTime
(
Date
deductByGuaranteeTime
)
{
this
.
deductByGuaranteeTime
=
deductByGuaranteeTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchDeductByPreAuthTime"
,
length
=
19
)
public
Date
getLaunchDeductByPreAuthTime
()
{
return
this
.
launchDeductByPreAuthTime
;
}
public
void
setLaunchDeductByPreAuthTime
(
Date
launchDeductByPreAuthTime
)
{
this
.
launchDeductByPreAuthTime
=
launchDeductByPreAuthTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"DeductByPreAuthTime"
,
length
=
19
)
public
Date
getDeductByPreAuthTime
()
{
return
this
.
deductByPreAuthTime
;
}
public
void
setDeductByPreAuthTime
(
Date
deductByPreAuthTime
)
{
this
.
deductByPreAuthTime
=
deductByPreAuthTime
;
}
@Column
(
name
=
"ApplyFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getApplyFailReason
()
{
return
this
.
applyFailReason
;
}
public
void
setApplyFailReason
(
String
applyFailReason
)
{
this
.
applyFailReason
=
applyFailReason
;
}
@Column
(
name
=
"RefundFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getRefundFailReason
()
{
return
this
.
refundFailReason
;
}
public
void
setRefundFailReason
(
String
refundFailReason
)
{
this
.
refundFailReason
=
refundFailReason
;
}
@Column
(
name
=
"DeductByGuaranteeFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getDeductByGuaranteeFailReason
()
{
return
this
.
deductByGuaranteeFailReason
;
}
public
void
setDeductByGuaranteeFailReason
(
String
deductByGuaranteeFailReason
)
{
this
.
deductByGuaranteeFailReason
=
deductByGuaranteeFailReason
;
}
@Column
(
name
=
"DeductByPreAuthFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getDeductByPreAuthFailReason
()
{
return
this
.
deductByPreAuthFailReason
;
}
public
void
setDeductByPreAuthFailReason
(
String
deductByPreAuthFailReason
)
{
this
.
deductByPreAuthFailReason
=
deductByPreAuthFailReason
;
}
@Column
(
name
=
"ReleasePreAuthFailReason"
,
nullable
=
false
,
length
=
256
)
public
String
getReleasePreAuthFailReason
()
{
return
this
.
releasePreAuthFailReason
;
}
public
void
setReleasePreAuthFailReason
(
String
releasePreAuthFailReason
)
{
this
.
releasePreAuthFailReason
=
releasePreAuthFailReason
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"LaunchReleasePreAuthTime"
,
length
=
19
)
public
Date
getLaunchReleasePreAuthTime
()
{
return
this
.
launchReleasePreAuthTime
;
}
public
void
setLaunchReleasePreAuthTime
(
Date
launchReleasePreAuthTime
)
{
this
.
launchReleasePreAuthTime
=
launchReleasePreAuthTime
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"ReleasePreAuthTime"
,
length
=
19
)
public
Date
getReleasePreAuthTime
()
{
return
this
.
releasePreAuthTime
;
}
public
void
setReleasePreAuthTime
(
Date
releasePreAuthTime
)
{
this
.
releasePreAuthTime
=
releasePreAuthTime
;
}
@Column
(
name
=
"LaunchRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getLaunchRefundAmount
()
{
return
launchRefundAmount
;
}
public
void
setLaunchRefundAmount
(
BigDecimal
launchRefundAmount
)
{
this
.
launchRefundAmount
=
launchRefundAmount
;
}
@Column
(
name
=
"IsThird"
,
nullable
=
false
)
public
int
getIsThird
()
{
return
isThird
;
}
public
void
setIsThird
(
int
isThird
)
{
this
.
isThird
=
isThird
;
}
@Column
(
name
=
"VoucherAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getVoucherAmount
()
{
return
voucherAmount
;
}
public
void
setVoucherAmount
(
BigDecimal
voucherAmount
)
{
this
.
voucherAmount
=
voucherAmount
;
}
@Column
(
name
=
"VoucherRefundAmount"
,
nullable
=
false
,
precision
=
10
)
public
BigDecimal
getVoucherRefundAmount
()
{
return
voucherRefundAmount
;
}
public
void
setVoucherRefundAmount
(
BigDecimal
voucherRefundAmount
)
{
this
.
voucherRefundAmount
=
voucherRefundAmount
;
}
@Column
(
name
=
"PrePayCardDeductFlag"
,
nullable
=
false
)
public
int
getPrePayCardDeductFlag
()
{
return
prePayCardDeductFlag
;
}
public
void
setPrePayCardDeductFlag
(
int
prePayCardDeductFlag
)
{
this
.
prePayCardDeductFlag
=
prePayCardDeductFlag
;
}
@Column
(
name
=
"VoucherIDList"
,
nullable
=
false
,
length
=
512
)
public
String
getVoucherIDList
()
{
return
voucherIDList
;
}
public
void
setVoucherIDList
(
String
voucherIDList
)
{
this
.
voucherIDList
=
voucherIDList
;
}
@Column
(
name
=
"VoucherCount"
,
nullable
=
false
)
public
int
getVoucherCount
()
{
return
voucherCount
;
}
public
void
setVoucherCount
(
int
voucherCount
)
{
this
.
voucherCount
=
voucherCount
;
}
@Column
(
name
=
"PaymentRequestID"
,
nullable
=
false
,
length
=
50
)
public
String
getPaymentRequestID
()
{
return
paymentRequestID
;
}
public
void
setPaymentRequestID
(
String
paymentRequestID
)
{
this
.
paymentRequestID
=
paymentRequestID
;
}
@Column
(
name
=
"cancelStatus"
)
public
int
getCancelStatus
()
{
return
cancelStatus
;
}
public
void
setCancelStatus
(
int
cancelStatus
)
{
this
.
cancelStatus
=
cancelStatus
;
}
@Column
(
name
=
"notifyFlag"
)
public
String
getNotifyFlag
()
{
return
notifyFlag
;
}
public
void
setNotifyFlag
(
String
notifyFlag
)
{
this
.
notifyFlag
=
notifyFlag
;
}
/**
* 用户是否成功付款
*
* @return
*/
@Transient
public
boolean
isPaied
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
orderStatusEnum
==
OrderStatusEnum
.
PARTIAL_REFUND
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_DEAL
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY_PARTY
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY_CASH
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_PAY
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_DEAL_CASH
||
orderStatusEnum
==
OrderStatusEnum
.
WAITING_INVOICE
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户是否付款
*
* @return
*/
@Transient
public
boolean
isPay
()
{
// 付款成功或者等待中返回true,付款失败返回false
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
this
.
isPaied
()
||
orderStatusEnum
==
OrderStatusEnum
.
CHARGING
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户在付款途中
*
* @return
*/
@Transient
public
boolean
isPayOnTheWay
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
if
(
this
.
isNotPay
()
||
orderStatusEnum
==
OrderStatusEnum
.
CHARGING
)
{
return
true
;
}
else
{
return
false
;
}
}
/**
* 用户是否待支付
*
* @return
*/
@Transient
public
boolean
isNotPay
()
{
// 付款成功或者等待中返回true,付款失败返回false
if
(
this
.
getOrderStatusEnum
()
==
OrderStatusEnum
.
NOT_PAY
)
return
true
;
else
return
false
;
}
/**
* 得到订单状态,没有考虑发票递送的情况
*
* @return OrderStatusEnum
*/
@Transient
public
OrderStatusEnum
getOrderStatusEnum
()
{
OrderStatusEnum
orderStatusEnum
=
OrderStatusEnum
.
getOrderStatus
(
this
.
orderType
,
this
.
payMode
,
this
.
confirmType
,
this
.
processStatus
,
false
);
return
orderStatusEnum
;
}
@Column
(
name
=
"CashRebate"
)
public
double
getCashRebate
()
{
return
cashRebate
;
}
@Column
(
name
=
"CashRebateStatus"
)
public
int
getCashRebateStatus
()
{
return
cashRebateStatus
;
}
public
void
setCashRebate
(
double
cashRebate
)
{
this
.
cashRebate
=
cashRebate
;
}
public
void
setCashRebateStatus
(
int
cashRebateStatus
)
{
this
.
cashRebateStatus
=
cashRebateStatus
;
}
/**
* 企业赞助活动ID
*
* @return campaignID
*/
@Column
(
name
=
"CampaignID"
)
public
int
getCampaignID
()
{
return
campaignID
;
}
public
void
setCampaignID
(
int
campaignID
)
{
this
.
campaignID
=
campaignID
;
}
@Column
(
name
=
"SponsorUnitAmount"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getSponsorUnitAmount
()
{
return
sponsorUnitAmount
;
}
public
void
setSponsorUnitAmount
(
BigDecimal
sponsorUnitAmount
)
{
this
.
sponsorUnitAmount
=
sponsorUnitAmount
;
}
@Column
(
name
=
"actualSettleAmout"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getActualSettleAmout
()
{
return
actualSettleAmout
;
}
public
void
setActualSettleAmout
(
BigDecimal
actualSettleAmout
)
{
this
.
actualSettleAmout
=
actualSettleAmout
;
}
@Column
(
name
=
"settleObj"
)
public
String
getSettleObj
()
{
return
settleObj
;
}
public
void
setSettleObj
(
String
settleObj
)
{
this
.
settleObj
=
settleObj
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"settleDate"
,
length
=
19
)
public
Date
getSettleDate
()
{
return
settleDate
;
}
public
void
setSettleDate
(
Date
settleDate
)
{
this
.
settleDate
=
settleDate
;
}
@Column
(
name
=
"finComment"
)
public
String
getFinComment
()
{
return
finComment
;
}
public
void
setFinComment
(
String
finComment
)
{
this
.
finComment
=
finComment
;
}
@Column
(
name
=
"orderIntegralStatus"
,
nullable
=
false
)
public
int
getOrderIntegralStatus
()
{
return
this
.
orderIntegralStatus
;
}
public
void
setOrderIntegralStatus
(
int
orderIntegralStatus
)
{
this
.
orderIntegralStatus
=
orderIntegralStatus
;
}
@Column
(
name
=
"shareIntegralStatus"
,
nullable
=
false
)
public
int
getShareIntegralStatus
()
{
return
this
.
shareIntegralStatus
;
}
public
void
setShareIntegralStatus
(
int
shareIntegralStatus
)
{
this
.
shareIntegralStatus
=
shareIntegralStatus
;
}
@Column
(
name
=
"channel1"
)
public
String
getChannel1
()
{
return
channel1
;
}
public
void
setChannel1
(
String
channel1
)
{
this
.
channel1
=
channel1
;
}
@Column
(
name
=
"channel2"
)
public
String
getChannel2
()
{
return
channel2
;
}
public
void
setChannel2
(
String
channel2
)
{
this
.
channel2
=
channel2
;
}
@Column
(
name
=
"giftCardAmount"
,
nullable
=
false
,
columnDefinition
=
"decimal(10,2) DEFAULT '0.00'"
)
public
BigDecimal
getGiftCardAmount
()
{
return
giftCardAmount
;
}
public
void
setGiftCardAmount
(
BigDecimal
giftCardAmount
)
{
this
.
giftCardAmount
=
giftCardAmount
;
}
@Column
(
name
=
"hasInvoice"
)
public
boolean
isHasInvoice
()
{
return
hasInvoice
;
}
public
void
setHasInvoice
(
boolean
hasInvoice
)
{
this
.
hasInvoice
=
hasInvoice
;
}
public
Integer
getPaymentVersion
()
{
return
paymentVersion
;
}
public
void
setPaymentVersion
(
Integer
paymentVersion
)
{
this
.
paymentVersion
=
paymentVersion
;
}
@Column
(
name
=
"platform"
)
public
String
getPlatform
()
{
return
platform
;
}
public
void
setPlatform
(
String
platform
)
{
this
.
platform
=
platform
;
}
@Column
(
name
=
"outTradeId"
)
public
String
getOutTradeId
()
{
return
outTradeId
;
}
public
void
setOutTradeId
(
String
outTradeId
)
{
this
.
outTradeId
=
outTradeId
;
}
@Column
(
name
=
"relationOrderNo"
)
public
long
getRelationOrderNo
()
{
return
relationOrderNo
;
}
@Column
(
name
=
"enable"
)
public
boolean
isEnable
()
{
return
enable
;
}
public
void
setRelationOrderNo
(
long
relationOrderNo
)
{
this
.
relationOrderNo
=
relationOrderNo
;
}
public
void
setEnable
(
boolean
enable
)
{
this
.
enable
=
enable
;
}
@Column
(
name
=
"useMemberPrice"
)
public
Boolean
getUseMemberPrice
()
{
return
useMemberPrice
;
}
@Column
(
name
=
"memberUnitAmount"
)
public
BigDecimal
getMemberUnitAmount
()
{
return
memberUnitAmount
;
}
public
void
setUseMemberPrice
(
Boolean
useMemberPrice
)
{
this
.
useMemberPrice
=
useMemberPrice
;
}
public
void
setMemberUnitAmount
(
BigDecimal
memberUnitAmount
)
{
this
.
memberUnitAmount
=
memberUnitAmount
;
}
@Column
(
name
=
"invoiceAmount"
,
precision
=
10
)
public
BigDecimal
getInvoiceAmount
()
{
return
invoiceAmount
;
}
public
void
setInvoiceAmount
(
BigDecimal
invoiceAmount
)
{
this
.
invoiceAmount
=
invoiceAmount
;
}
@Column
(
name
=
"postageAmount"
,
precision
=
10
)
public
BigDecimal
getPostageAmount
()
{
return
postageAmount
;
}
public
void
setPostageAmount
(
BigDecimal
postageAmount
)
{
this
.
postageAmount
=
postageAmount
;
}
@Column
(
name
=
"insuranceAmount"
,
precision
=
10
)
public
BigDecimal
getInsuranceAmount
()
{
return
insuranceAmount
;
}
public
void
setInsuranceAmount
(
BigDecimal
insuranceAmount
)
{
this
.
insuranceAmount
=
insuranceAmount
;
}
@Column
(
name
=
"insuranceStatus"
)
public
int
getInsuranceStatus
()
{
return
insuranceStatus
;
}
public
void
setInsuranceStatus
(
int
insuranceStatus
)
{
this
.
insuranceStatus
=
insuranceStatus
;
}
@Column
(
name
=
"offlinePayType"
)
public
Integer
getOfflinePayType
()
{
return
offlinePayType
;
}
public
void
setOfflinePayType
(
Integer
offlinePayType
)
{
this
.
offlinePayType
=
offlinePayType
;
}
public
Boolean
getDeleteFlag
()
{
return
deleteFlag
;
}
public
void
setDeleteFlag
(
Boolean
deleteFlag
)
{
this
.
deleteFlag
=
deleteFlag
;
}
@Column
(
name
=
"sendNotifyMsg"
)
public
Boolean
getSendNotifyMsg
()
{
return
sendNotifyMsg
;
}
public
void
setSendNotifyMsg
(
Boolean
sendNotifyMsg
)
{
this
.
sendNotifyMsg
=
sendNotifyMsg
;
}
@Column
(
name
=
"onlineOrderFlag"
)
public
Boolean
getOnlineOrderFlag
()
{
return
onlineOrderFlag
;
}
public
void
setOnlineOrderFlag
(
Boolean
onlineOrderFlag
)
{
this
.
onlineOrderFlag
=
onlineOrderFlag
;
}
@Column
(
name
=
"userType"
)
public
String
getUserType
()
{
return
userType
;
}
public
void
setUserType
(
String
userType
)
{
this
.
userType
=
userType
;
}
public
BigDecimal
getVipmemberDiscount
()
{
return
vipmemberDiscount
;
...
...
@@ -1389,9 +1438,9 @@ public class Order extends AbstractOrder implements java.io.Serializable {
public
void
setInvoiceId
(
Integer
invoiceId
)
{
this
.
invoiceId
=
invoiceId
;
}
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"canInvoiceDate"
,
nullable
=
false
,
length
=
19
)
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"canInvoiceDate"
,
nullable
=
false
,
length
=
19
)
public
Date
getCanInvoiceDate
()
{
return
canInvoiceDate
;
}
...
...
@@ -1399,9 +1448,7 @@ public class Order extends AbstractOrder implements java.io.Serializable {
public
void
setCanInvoiceDate
(
Date
canInvoiceDate
)
{
this
.
canInvoiceDate
=
canInvoiceDate
;
}
}
src/main/java/com/ctrip/fun/golf/domain/user/UserWorker.java
0 → 100644
View file @
6d1bda0c
package
com
.
ctrip
.
fun
.
golf
.
domain
.
user
;
import
static
javax
.
persistence
.
GenerationType
.
IDENTITY
;
import
java.util.Date
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
javax.persistence.Temporal
;
import
javax.persistence.TemporalType
;
/**
* 工作号表
* @author 86198
*
*/
@Entity
@Table
(
name
=
"bsc_user_worker"
)
public
class
UserWorker
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
3913215763403925400L
;
@Id
@GeneratedValue
(
strategy
=
IDENTITY
)
@Column
(
name
=
"id"
,
unique
=
true
,
nullable
=
false
)
private
Integer
id
;
/**
* 工作号唯一标识
*/
private
String
uid
;
/**
* 绑定的手机号
*/
@Column
(
name
=
"mobile_phone"
,
unique
=
true
,
nullable
=
false
)
private
String
mobilePhone
;
/**
* 真实姓名
*/
@Column
(
name
=
"real_name"
,
unique
=
true
,
nullable
=
false
)
private
String
realName
;
/**
* 创建时间
*/
@Temporal
(
TemporalType
.
TIMESTAMP
)
@Column
(
name
=
"create_time"
,
length
=
19
)
private
Date
createTime
;
/**
* 父id
*/
private
Integer
level
;
/**
* 部门id
*/
@Column
(
name
=
"dept_id"
)
private
Integer
deptId
;
/**
* 是否在职0:在职;1:不在职
*/
private
Integer
status
;
/**
* 修改时间
*/
private
Date
datachangeTime
;
/**
* 0:销售总监;1:销售经理;2:销售员
*/
@Column
(
name
=
"level_status"
)
private
Integer
levelStatus
;
/**
* 密码
*/
private
String
password
;
/**
* 归属小组
*/
@Column
(
name
=
"group_id"
)
private
Integer
groupId
;
/**
* 区域code
*/
@Column
(
name
=
"region_code"
)
private
String
regionCode
;
/**
* 区域名
*/
@Column
(
name
=
"region_name"
)
private
String
regionName
;
/**
*部门名称
*/
@Column
(
name
=
"dept_name"
)
private
String
deptName
;
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
;
}
public
String
getMobilePhone
()
{
return
mobilePhone
;
}
public
void
setMobilePhone
(
String
mobilePhone
)
{
this
.
mobilePhone
=
mobilePhone
;
}
public
String
getRealName
()
{
return
realName
;
}
public
void
setRealName
(
String
realName
)
{
this
.
realName
=
realName
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Integer
getLevel
()
{
return
level
;
}
public
void
setLevel
(
Integer
level
)
{
this
.
level
=
level
;
}
public
Integer
getDeptId
()
{
return
deptId
;
}
public
void
setDeptId
(
Integer
deptId
)
{
this
.
deptId
=
deptId
;
}
public
Integer
getStatus
()
{
return
status
;
}
public
void
setStatus
(
Integer
status
)
{
this
.
status
=
status
;
}
public
Date
getDatachangeTime
()
{
return
datachangeTime
;
}
public
void
setDatachangeTime
(
Date
datachangeTime
)
{
this
.
datachangeTime
=
datachangeTime
;
}
public
Integer
getLevelStatus
()
{
return
levelStatus
;
}
public
void
setLevelStatus
(
Integer
levelStatus
)
{
this
.
levelStatus
=
levelStatus
;
}
public
String
getPassword
()
{
return
password
;
}
public
void
setPassword
(
String
password
)
{
this
.
password
=
password
;
}
public
Integer
getGroupId
()
{
return
groupId
;
}
public
void
setGroupId
(
Integer
groupId
)
{
this
.
groupId
=
groupId
;
}
public
String
getRegionCode
()
{
return
regionCode
;
}
public
void
setRegionCode
(
String
regionCode
)
{
this
.
regionCode
=
regionCode
;
}
public
String
getRegionName
()
{
return
regionName
;
}
public
void
setRegionName
(
String
regionName
)
{
this
.
regionName
=
regionName
;
}
public
String
getDeptName
()
{
return
deptName
;
}
public
void
setDeptName
(
String
deptName
)
{
this
.
deptName
=
deptName
;
}
}
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
View file @
6d1bda0c
...
...
@@ -1577,7 +1577,7 @@ public class AsmCourseResourceService {
result
.
setSaleStartTime
(
asmCourseresource
.
getFlashSaleStartTime
());
result
.
setSaleEndTime
(
asmCourseresource
.
getFlashSaleEndTime
());
result
.
setPrepaidPrice
(
asmCourseresource
.
getPrepaidPrice
());
result
.
setStartTime
(
asmCourseresource
.
getStartTime
());
result
.
setStartTime
(
asmCourseresource
.
getStartTime
());
result
.
setReserveDay
(
asmCourseresource
.
getReserveDay
());
result
.
setImagePath
(
this
.
imageServer
+
asmCourseresource
.
getImagePath
());
result
.
setCurrentTime
(
new
Date
());
...
...
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
6d1bda0c
...
...
@@ -259,7 +259,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
//社员续费 add by caosy
orderItem
.
setCommuneYears
(
communeOrderBean
.
getCommuneYears
());
orderItem
.
setRecommendUid
(
communeOrderBean
.
getRecommendUid
());
orderItem
.
setUserWorkerId
(
communeOrderBean
.
getUserWorkerId
());
this
.
getOrderDao
().
updateOrdersCanInvoiceDate
(
orderId
,
DateUtil
.
addDays
(
new
Date
(),
1
));
communeOrderItemDao
.
save
(
orderItem
);
...
...
@@ -273,7 +273,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
this
.
saveOrderItems
(
communeOrderBean
,
order
.
getOrderId
());
UserExt
userExt
=
getUserExtDao
().
getByUid
(
communeOrderBean
.
getUid
());
BigDecimal
communeOrderMoney
=
new
BigDecimal
(
0
);
if
(
"15021268738"
.
equals
(
communeOrderBean
.
getUid
())){
if
(
"15021268738"
.
equals
(
communeOrderBean
.
getUid
())
||
"15993911776"
.
equals
(
communeOrderBean
.
getUid
())
){
communeOrderMoney
=
new
BigDecimal
(
"0.01"
);
}
else
{
communeOrderMoney
=
communeOrderBean
.
getAmount
();
...
...
@@ -292,27 +292,32 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
}
public
JSONObject
voucherPlaceOrderForMiniApp
(
CommuneOrderBean
communeOrderBean
){
this
.
voucherCheckParameters
(
communeOrderBean
);
if
(
this
.
voucherBeforePlaceOrder
(
communeOrderBean
))
{
Order
order
=
this
.
saveOrder
(
communeOrderBean
);
this
.
saveOrderItems
(
communeOrderBean
,
order
.
getOrderId
());
UserExt
userExt
=
getUserExtDao
().
getByUid
(
communeOrderBean
.
getUid
());
BigDecimal
communeOrderMoney
=
new
BigDecimal
(
0
);
if
(
"15993911776"
.
equals
(
communeOrderBean
.
getUid
())
||
"19821271996"
.
equals
(
communeOrderBean
.
getUid
())){
communeOrderMoney
=
new
BigDecimal
(
"0.01"
);
}
else
{
communeOrderMoney
=
communeOrderBean
.
getAmount
();
public
JSONObject
voucherPlaceOrderForMiniApp
(
CommuneOrderBean
communeOrderBean
)
throws
Exception
{
if
(
communeOrderBean
.
getAmount
().
compareTo
(
COMMUNE_AMOUNT
)==
0
||
communeOrderBean
.
getAmount
().
compareTo
(
COMMUNE_AMOUNT2
)==
0
){
return
placeOrderForMiniApp
(
communeOrderBean
);
}
else
{
this
.
voucherCheckParameters
(
communeOrderBean
);
if
(
this
.
voucherBeforePlaceOrder
(
communeOrderBean
))
{
Order
order
=
this
.
saveOrder
(
communeOrderBean
);
this
.
saveOrderItems
(
communeOrderBean
,
order
.
getOrderId
());
UserExt
userExt
=
getUserExtDao
().
getByUid
(
communeOrderBean
.
getUid
());
BigDecimal
communeOrderMoney
=
new
BigDecimal
(
0
);
if
(
"15993911776"
.
equals
(
communeOrderBean
.
getUid
())
||
"19821271996"
.
equals
(
communeOrderBean
.
getUid
())||
"18983401147"
.
equals
(
communeOrderBean
.
getUid
())||
"18339836926"
.
equals
(
communeOrderBean
.
getUid
())){
communeOrderMoney
=
new
BigDecimal
(
"0.01"
);
}
else
{
communeOrderMoney
=
communeOrderBean
.
getAmount
();
}
try
{
JSONObject
json
=
WeiXinAtcion
.
weixinPlay
(
userExt
.
getMiniAppOpenId
(),
communeOrderMoney
.
multiply
(
new
BigDecimal
(
"100"
)).
intValue
(),
order
.
getOrderNo
()+
""
,
voucherNotifyUrlForMiniApp
,
"BUYVOUCHER"
);
return
json
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
}
try
{
JSONObject
json
=
WeiXinAtcion
.
weixinPlay
(
userExt
.
getMiniAppOpenId
(),
communeOrderMoney
.
multiply
(
new
BigDecimal
(
"100"
)).
intValue
(),
order
.
getOrderNo
()+
""
,
voucherNotifyUrlForMiniApp
,
"BUYVOUCHER"
);
return
json
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
}
return
null
;
return
null
;
}
}
public
List
<
BuyVoucherActivityBean
>
buyVoucherActivityList
(){
...
...
src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java
View file @
6d1bda0c
...
...
@@ -141,7 +141,7 @@ public abstract class AbstractNotifyService extends CorePaymentService {
order
.
setProcessStatus
(
order
.
getProcessStatus
()
&
(
OrderStatusBitEnum
.
getSumStatusValue
()
-
OrderStatusBitEnum
.
DEDUCT_FAILED
.
getValue
()));
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTED
.
getValue
());
// 5、扣除现金券、账户余额、抵用发票的积分、以及投保动作(此步骤中基本每一步都是重启事务)
// 5.1、扣除现金券
if
(
order
.
getVoucherAmount
().
doubleValue
()
>
0
)
{
...
...
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
View file @
6d1bda0c
...
...
@@ -119,6 +119,7 @@ import com.ctrip.fun.golf.dao.user.UserExtDao;
import
com.ctrip.fun.golf.dao.user.UserFaceDao
;
import
com.ctrip.fun.golf.dao.user.UserTokenDao
;
import
com.ctrip.fun.golf.dao.user.UserVerifyCodeDao
;
import
com.ctrip.fun.golf.dao.user.UserWorkerDao
;
import
com.ctrip.fun.golf.dao.user.VipMemberDiscountDao
;
import
com.ctrip.fun.golf.domain.basic.MobileInfo
;
import
com.ctrip.fun.golf.domain.basic.OperationMessage
;
...
...
@@ -143,6 +144,7 @@ import com.ctrip.fun.golf.domain.user.UserErrorLogin;
import
com.ctrip.fun.golf.domain.user.UserExt
;
import
com.ctrip.fun.golf.domain.user.UserToken
;
import
com.ctrip.fun.golf.domain.user.UserVerifyCode
;
import
com.ctrip.fun.golf.domain.user.UserWorker
;
import
com.ctrip.fun.golf.domain.user.VipMemberDiscount
;
import
com.ctrip.fun.golf.exceptions.UserException
;
import
com.ctrip.fun.golf.service.basic.EntityImageService
;
...
...
@@ -166,7 +168,11 @@ public class UserService {
private
DistrictDao
districtDao
=
null
;
/**
@Autowired
private
UserWorkerDao
userWorkerDao
=
null
;
/**
* 最大值 8
*/
private
int
maxTimes
=
8
;
...
...
@@ -1723,6 +1729,7 @@ public class UserService {
if
(
userExt
==
null
)
{
return
null
;
}
UserBean
userBean
=
new
UserBean
();
BeanConverter
.
copyProperties
(
userBean
,
userExt
);
userBean
.
setBirth
(
userExt
.
getBirth
());
...
...
@@ -1796,6 +1803,12 @@ public class UserService {
userBean
.
setOccupation
(
userExt
.
getOccupation
());
userBean
.
setHobby
(
userExt
.
getHobby
());
UserWorker
userWorker
=
userWorkerDao
.
getUserWorkerByUid
(
userExt
.
getUid
());
if
(
userWorker
!=
null
){
userBean
.
setUserWorkerId
(
userWorker
.
getId
());
}
return
userBean
;
}
...
...
@@ -3362,13 +3375,20 @@ public class UserService {
public
void
setUserFaceDao
(
UserFaceDao
userFaceDao
)
{
this
.
userFaceDao
=
userFaceDao
;
}
public
CourseDeviceDao
getCourseDeviceDao
()
{
return
courseDeviceDao
;
}
public
void
setCourseDeviceDao
(
CourseDeviceDao
courseDeviceDao
)
{
this
.
courseDeviceDao
=
courseDeviceDao
;
}
public
CourseDeviceDao
getCourseDeviceDao
()
{
return
courseDeviceDao
;
}
public
void
setCourseDeviceDao
(
CourseDeviceDao
courseDeviceDao
)
{
this
.
courseDeviceDao
=
courseDeviceDao
;
}
public
UserWorkerDao
getUserWorkerDao
()
{
return
userWorkerDao
;
}
public
void
setUserWorkerDao
(
UserWorkerDao
userWorkerDao
)
{
this
.
userWorkerDao
=
userWorkerDao
;
}
}
src/main/resources/basic.spring.xml
View file @
6d1bda0c
...
...
@@ -19,6 +19,7 @@
<bean
name=
"outsideUserDao"
class=
"com.ctrip.fun.golf.dao.basic.OutsideUserDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
</bean>
<bean
name=
"recommendDao"
class=
"com.ctrip.fun.golf.dao.recommend.RecommendDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
...
...
@@ -36,6 +37,9 @@
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
</bean>
<bean
name =
"userWorkerDao"
class=
"com.ctrip.fun.golf.dao.user.UserWorkerDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
</bean>
<bean
name=
"entityImageDao"
class=
"com.ctrip.fun.golf.dao.basic.EntityImageDao"
>
<property
name=
"sessionFactory"
ref=
"sessionFactory"
></property>
...
...
@@ -94,6 +98,9 @@
<property
name=
"userExtDao"
ref=
"userExtDao"
></property>
</bean>
<bean
name=
"userService"
class=
"com.ctrip.fun.golf.service.user.UserService"
>
<property
name=
"userWorkerDao"
ref=
"userWorkerDao"
></property>
</bean>
<bean
name=
"voucherService"
class=
"com.ctrip.fun.golf.service.basic.VoucherService"
>
<property
name=
"voucherGetLogDao"
ref=
"voucherGetLogDao"
></property>
<property
name=
"voucherShareLogDao"
ref=
"voucherShareLogDao"
></property>
...
...
src/main/resources/hibernate.cfg.xml
View file @
6d1bda0c
...
...
@@ -142,6 +142,7 @@
<mapping
class=
"com.ctrip.fun.golf.domain.user.IdentifyingCode"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.VipMemberLog"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.VipMemberDiscount"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.user.UserWorker"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.adminUser.AdminUser"
/>
<mapping
class=
"com.ctrip.fun.golf.domain.adminUser.AdminAuthority"
/>
...
...
@@ -222,6 +223,7 @@
<mapping
class=
"com.ctrip.fun.golf.domain.basic.InvoiceOrderInfo"
/>
<!-- 拼团开始
<mapping class="com.ctrip.fun.golf.domain.basic.PtCode" />
<mapping class="com.ctrip.fun.golf.domain.basic.PtCodeInfo" />
...
...
src/main/webapp/WEB-INF/web.xml
View file @
6d1bda0c
...
...
@@ -45,6 +45,7 @@
<url-pattern>
/
</url-pattern>
</servlet-mapping>
<welcome-file-list>
<welcome-file>
index.jsp
</welcome-file>
</welcome-file-list>
...
...
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