Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
周少峰
8 years ago
Commit
9b0827171d14d078bec5057c33fd889707f02b79
1 parent
d876e22c
buynow and closeOrder button
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
apps/home/models/orders-service.js
apps/home/models/orders-service.js
View file @
9b08271
...
...
@@ -618,18 +618,18 @@ module.exports = class extends global.yoho.BaseModel {
_getOrderDetailOp
(
orderId
,
payment
,
status
,
isCancel
,
paymentStatus
,
paymentType
,
orderType
,
attribute
,
refundStatus
)
{
orderType
,
attribute
,
refundStatus
,
links
)
{
let
operation
=
{};
// 立刻付款
if
(
paymentType
===
1
&&
paymentStatus
===
'N'
&&
isCancel
===
'N'
&&
payment
!==
19
)
{
if
(
_
.
indexOf
(
links
,
'buyNow'
)
>
-
1
)
{
Object
.
assign
(
operation
,
{
goPay
:
helpers
.
urlFormat
(
'/shopping/newpay'
,
{
ordercode
:
orderId
})
});
}
// 取消订单
if
(
status
<
3
&&
isCancel
===
'N'
&&
paymentStatus
===
'N'
&&
orderType
!==
5
)
{
if
(
_
.
indexOf
(
links
,
'closeOrder'
)
>
-
1
)
{
Object
.
assign
(
operation
,
{
cancelOrder
:
true
});
...
...
@@ -874,7 +874,8 @@ module.exports = class extends global.yoho.BaseModel {
detail
.
operation
=
that
.
_getOrderDetailOp
(
orderDetail
.
order_code
,
+
orderDetail
.
payment
,
+
orderDetail
.
status
,
orderDetail
.
is_cancel
,
orderDetail
.
payment_status
,
orderDetail
.
payment_type
,
+
orderDetail
.
order_type
,
+
orderDetail
.
attribute
,
+
orderDetail
.
refund_status
+
orderDetail
.
order_type
,
+
orderDetail
.
attribute
,
+
orderDetail
.
refund_status
,
orderDetail
.
links
);
detail
.
packageTitle
=
orderDetail
.
package_title
;
...
...
Please
register
or
login
to post a comment