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
b67a3bbc
authored
Aug 06, 2020
by
zhangchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
现付去掉支付时间
parent
5c063a92
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
View file @
b67a3bbc
...
@@ -1287,7 +1287,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
...
@@ -1287,7 +1287,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
response
.
setBody
(
jSONObject
);
response
.
setBody
(
jSONObject
);
}
}
}
else
{
}
else
{
//如果订单走现付O 存 ProcessStatus = 4 OrderUserStatus = 1
//如果订单走现付O 存 ProcessStatus = 4 OrderUserStatus = 1
,否则走预付
if
(
order
.
getPayMode
().
equalsIgnoreCase
(
"O"
)){
if
(
order
.
getPayMode
().
equalsIgnoreCase
(
"O"
)){
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTING
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTING
.
getValue
());
order
.
setOrderUserStatus
(
1
);
order
.
setOrderUserStatus
(
1
);
...
@@ -1295,10 +1295,10 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
...
@@ -1295,10 +1295,10 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
}
else
{
}
else
{
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTED
.
getValue
());
order
.
setProcessStatus
(
order
.
getProcessStatus
()
|
OrderStatusBitEnum
.
DEDUCTED
.
getValue
());
order
.
setOrderUserStatus
(
4
);
order
.
setOrderUserStatus
(
4
);
order
.
setPayDate
(
new
Date
());
}
}
order
.
setOrderType
(
1
);
order
.
setOrderType
(
1
);
order
.
setOrderStatus
(
"A"
);
order
.
setOrderStatus
(
"A"
);
order
.
setPayDate
(
new
Date
());
getOrderDao
().
update
(
order
);
getOrderDao
().
update
(
order
);
if
((
order
.
getProcessStatus
()
&
(
OrderStatusBitEnum
.
CONFIRM_CUSTOMER
.
getValue
()
+
OrderStatusBitEnum
.
CONFIRM_PRODUCT
.
getValue
()))
==
(
OrderStatusBitEnum
.
CONFIRM_CUSTOMER
if
((
order
.
getProcessStatus
()
&
(
OrderStatusBitEnum
.
CONFIRM_CUSTOMER
.
getValue
()
+
OrderStatusBitEnum
.
CONFIRM_PRODUCT
.
getValue
()))
==
(
OrderStatusBitEnum
.
CONFIRM_CUSTOMER
.
getValue
()
+
OrderStatusBitEnum
.
CONFIRM_PRODUCT
.
getValue
()))
{
.
getValue
()
+
OrderStatusBitEnum
.
CONFIRM_PRODUCT
.
getValue
()))
{
...
...
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