Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
方斌
51business
Commits
c9f6fca0
Commit
c9f6fca0
authored
Sep 16, 2019
by
Hsinli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addd
parent
4a5c4a35
Pipeline
#13775
passed with stage
in 46 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
45 deletions
+2
-45
order.js
app/service/credit/order.js
+2
-45
No files found.
app/service/credit/order.js
View file @
c9f6fca0
...
@@ -119,7 +119,7 @@ class OrderService extends Service {
...
@@ -119,7 +119,7 @@ class OrderService extends Service {
}
}
const
slag
=
TypeConfigFlip
[
type
];
const
slag
=
TypeConfigFlip
[
type
];
const
preferential
=
await
this
.
getPreferential
(
slag
);
const
preferential
=
await
ctx
.
service
.
credit
.
preferential
.
getPreferential
(
slag
);
let
preferential_price
=
0
;
let
preferential_price
=
0
;
if
(
preferential
&&
preferential
.
id
)
{
if
(
preferential
&&
preferential
.
id
)
{
preferential_price
=
preferential
.
price
;
preferential_price
=
preferential
.
price
;
...
@@ -198,7 +198,7 @@ class OrderService extends Service {
...
@@ -198,7 +198,7 @@ class OrderService extends Service {
if
(
!
order
||
!
order
.
id
)
{
if
(
!
order
||
!
order
.
id
)
{
ctx
.
failed
(
'error order'
);
ctx
.
failed
(
'error order'
);
}
}
const
preferential
=
await
this
.
getPreferential
(
TypeConfigFlip
[
order
.
type
]);
const
preferential
=
await
ctx
.
service
.
credit
.
preferential
.
getPreferential
(
TypeConfigFlip
[
order
.
type
]);
let
preferential_price
=
0
;
let
preferential_price
=
0
;
let
preferential_title
=
''
;
let
preferential_title
=
''
;
if
(
preferential
&&
preferential
.
id
)
{
if
(
preferential
&&
preferential
.
id
)
{
...
@@ -413,49 +413,6 @@ class OrderService extends Service {
...
@@ -413,49 +413,6 @@ class OrderService extends Service {
return
order
;
return
order
;
}
}
/**
* 获取用户可以享受的优惠类型
* @param {*} type 用户当前操作的订单类型黑名单blacklist通话callrisk
*/
async
getPreferential
(
type
)
{
const
{
ctx
}
=
this
;
//找到用户三日内已支付最新的另一个类型的订单,判断上次使用的优惠类型,互斥即可
if
(
!
TypeConfig
.
hasOwnProperty
(
type
))
{
ctx
.
failed
(
'undefined type in getPreferential'
);
}
let
anotherType
=
type
===
'blacklist'
?
'callrisk'
:
'blacklist'
;
let
historyFilter
=
{
where
:
{
user_id
:
ctx
.
userId
,
type
:
TypeConfig
[
anotherType
],
valid
:
1
,
state
:
'已支付'
,
state_time
:
{
$gte
:
moment
().
subtract
(
3
,
'days'
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
},
order
:
[[
'state_time'
,
'desc'
]]
}
let
userLastOrder
=
await
ctx
.
prometheusModel
.
CreditOrder
.
findOne
(
historyFilter
);
let
preFilter
=
{
where
:
{
alias
:
''
,
type
:
TypeConfig
[
type
],
valid
:
1
,
},
order
:
[[
'id'
,
'desc'
]]
}
if
(
userLastOrder
===
null
)
{
preFilter
.
where
.
alias
=
'limit'
;
}
else
{
let
lastPre
=
await
ctx
.
prometheusModel
.
CreditOrderPreferential
.
findOne
({
where
:
{
id
:
userLastOrder
.
preferential_id
}
});
preFilter
.
where
.
alias
=
lastPre
===
null
?
'limit'
:
(
lastPre
.
alias
===
'combina'
?
'limit'
:
'combina'
);
}
let
preferential
=
await
ctx
.
prometheusModel
.
CreditOrderPreferential
.
findOne
(
preFilter
);
return
preferential
;
}
//记录订单状态
//记录订单状态
async
logOrder
(
order
)
{
async
logOrder
(
order
)
{
...
...
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