Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-activity-platform
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
huangyi
7 years ago
Commit
9ae4a7209bb226aa8b999b249ed21f7fd267bdad
1 parent
5f257e7a
master
...
feature/add-verify
feature/change-admin-static-url
feature/del-privateIps
feature/new-pro-fes
feature/only-for-test
feature/pressure-test
feature/share-link
feature/timezone
feature/yoluck
hotfix/export
hotfix/fix-appSecret
hotfix/republish
release/6.7.9
release/6.8.3
release/6.9.5
release/9.14
release/yohood-lottrey
release0906
zero-buy-two
tag1.0
领券
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
apps/admin/models/coupon.js
apps/api/models/coupon.js
apps/admin/models/coupon.js
View file @
9ae4a72
...
...
@@ -129,7 +129,7 @@ class CouponModel extends global.yoho.BaseModel {
return
mysqlCli
.
query
(
`
select
cn
.
coupon_id
couponId
,
cn
.
coupon_no
couponNo
,
cn
.
send_flag
sendFlag
,
cu
.
user_id
userId
,
cu
.
create_time
createTime
from
$
{
TABLE_COUPON_NO
}
as
cn
left
join
$
{
TABLE_COUPON_USER
}
as
cu
on
cu
.
coupon_
id
=
cn
.
coupon_
id
where
cn
.
coupon_id
=
:
couponId
`
,
{
couponId
});
on
cu
.
coupon_
no_id
=
cn
.
id
where
cn
.
coupon_id
=
:
couponId
`
,
{
couponId
});
}
couponUserListByCId
(
couponId
)
{
...
...
apps/api/models/coupon.js
View file @
9ae4a72
...
...
@@ -25,7 +25,7 @@ class CouponModel extends global.yoho.BaseModel {
return
mysqlCli
.
query
(
`
select
c
.
id
,
c
.
coupon_name
couponName
,
c
.
coupon_desc
couponDesc
,
c
.
shop_logo_url
shopLogoUrl
,
cn
.
coupon_no
couponNo
from
$
{
TABLE_COUPON
}
c
,
$
{
TABLE_COUPON_NO
}
cn
,
$
{
TABLE_COUPON_USER
}
cu
where
cu
.
user_id
=
:
userId
and
cu
.
coupon_no_id
=
cn
.
id
and
c
.
id
=
cn
.
coupon_id
order
by
c
.
sort
desc
,
c
.
create_time
desc
`
,
{
userId
});
order
by
c
u
.
create_time
desc
`
,
{
userId
});
}
async
coouponUserGet
(
obj
)
{
...
...
Please
register
or
login
to post a comment