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
b6acc0f5
Commit
b6acc0f5
authored
Jun 23, 2020
by
任国军
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redeemClass remove address check
parent
8ee17664
Pipeline
#25453
passed with stage
in 4 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
user.js
app/service/course/v5/user.js
+2
-8
No files found.
app/service/course/v5/user.js
View file @
b6acc0f5
...
...
@@ -479,12 +479,6 @@ class UserService extends Service {
ctx
.
failed
(
'兑换码已被使用'
);
}
// 获取用户地址
const
address
=
await
ctx
.
classModel
.
V5
.
CourseUserAddress
.
findOne
({
where
:
{
user_uuid
:
ctx
.
userUuid
,
is_deleted
:
0
},
attributes
:
[
'province'
,
'city'
,
'area'
,
'address'
,
'name'
,
'phone'
],
raw
:
true
});
if
(
ctx
.
isEmpty
(
address
))
{
ctx
.
failed
(
'地址不能为空'
);
}
const
classInfo
=
await
ctx
.
classModel
.
V5
.
CourseV5Class
.
findOne
({
where
:
{
id
:
codeInfo
.
class_id
,
status
:
1
,
is_deleted
:
0
},
attributes
:
[
'id'
,
'institution_id'
,
'name'
,
'button_url'
]
});
if
(
ctx
.
isEmpty
(
classInfo
))
{
ctx
.
failed
(
'课程不存在'
);
...
...
@@ -504,12 +498,12 @@ class UserService extends Service {
const
orderInfo
=
await
ctx
.
classModel
.
V5
.
CourseUserOrder
.
findOne
({
where
:
{
user_uuid
:
userUuid
,
class_id
:
codeInfo
.
class_id
,
is_deleted
:
0
}
});
if
(
ctx
.
isEmpty
(
orderInfo
))
{
const
orderNo
=
'12'
+
moment
().
format
(
'YYYYMMDDHHMMSS'
)
+
await
this
.
getRandomNumber
(
6
);
await
ctx
.
classModel
.
V5
.
CourseUserOrder
.
create
({
user_uuid
:
userUuid
,
order_no
:
orderNo
,
class_id
:
codeInfo
.
class_id
,
pay
:
0
,
pay_time
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
pay_result
:
''
,
type
:
2
,
redeem
:
redeemCode
,
address
:
JSON
.
stringify
(
address
)
,
status
:
1
});
await
ctx
.
classModel
.
V5
.
CourseUserOrder
.
create
({
user_uuid
:
userUuid
,
order_no
:
orderNo
,
class_id
:
codeInfo
.
class_id
,
pay
:
0
,
pay_time
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
pay_result
:
''
,
type
:
2
,
redeem
:
redeemCode
,
address
:
''
,
status
:
1
});
}
else
{
if
(
orderInfo
.
status
===
1
)
{
ctx
.
failed
(
'您已购买过该课程'
);
}
else
{
await
ctx
.
classModel
.
V5
.
CourseUserOrder
.
update
({
pay
:
0
,
pay_time
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
pay_result
:
''
,
type
:
2
,
redeem
:
redeemCode
,
address
:
JSON
.
stringify
(
address
)
,
status
:
1
},
{
where
:
{
id
:
orderInfo
.
id
}
});
await
ctx
.
classModel
.
V5
.
CourseUserOrder
.
update
({
pay
:
0
,
pay_time
:
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
),
pay_result
:
''
,
type
:
2
,
redeem
:
redeemCode
,
address
:
''
,
status
:
1
},
{
where
:
{
id
:
orderInfo
.
id
}
});
}
}
...
...
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