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
da587402
authored
Nov 17, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退单
parent
9c2645c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
1 deletions
src/main/java/com/ctrip/fun/golf/api/order/AbstractOpOrderController.java
src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java
src/main/java/com/ctrip/fun/golf/api/order/AbstractOpOrderController.java
View file @
da587402
...
...
@@ -4,6 +4,9 @@
package
com
.
ctrip
.
fun
.
golf
.
api
.
order
;
import
java.io.Serializable
;
import
java.text.SimpleDateFormat
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.List
;
import
org.slf4j.Logger
;
...
...
@@ -98,6 +101,30 @@ public abstract class AbstractOpOrderController<H extends AbstractOrderProcessBe
Integer
orderId
=
request
.
getBody
();
Response
<
T
>
response
=
new
Response
<
T
>();
T
orderBean
=
(
T
)
this
.
getOpOrderService
().
getOrderDtail
(
orderId
);
// 判断订单退款是否显示
SimpleDateFormat
formatt
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
Date
day
=
new
Date
();
Calendar
rightNow
=
Calendar
.
getInstance
();
rightNow
.
setTime
(
day
);
rightNow
.
add
(
Calendar
.
MONTH
,-
3
);
//订场
if
(
orderBean
.
getOrderCategory
()
==
1
){
if
(
orderBean
.
getPlayDate
().
compareTo
(
rightNow
.
getTime
())<
0
){
orderBean
.
setCanRefund
(
1
);
}
else
{
orderBean
.
setCanRefund
(
2
);
}
}
if
(
orderBean
.
getOrderCategory
()
==
14
){
if
(
orderBean
.
getPlayDate
().
compareTo
(
rightNow
.
getTime
())<
0
){
orderBean
.
setCanRefund
(
1
);
}
else
{
orderBean
.
setCanRefund
(
2
);
}
}
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
SUCCESS
.
getMsg
());
response
.
setBody
(
orderBean
);
...
...
src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java
View file @
da587402
...
...
@@ -245,7 +245,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
public
void
setGrossPrice
(
BigDecimal
grossPrice
)
{
this
.
grossPrice
=
grossPrice
;
}
@Column
(
name
=
"regionCode"
)
public
String
getRegionCode
()
{
return
regionCode
;
}
...
...
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