Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-mobile
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
53b29bba
authored
Aug 10, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1:小程序券列表可以过滤分享中的券;分享出去的券可以继续分享;已使用的券去除分享出去的券;查询权分享记录表
parent
e957fcb4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
1 deletions
src/main/java/com/ctrip/fun/golf/api/basic/VoucherMController.java
src/main/java/com/ctrip/fun/golf/service/basic/VoucherMService.java
src/main/resources/rpc.properties
src/main/java/com/ctrip/fun/golf/api/basic/VoucherMController.java
View file @
53b29bba
...
...
@@ -26,6 +26,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import
com.ctrip.fun.common.vo.basic.VoucherQueryDto
;
import
com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO
;
import
com.ctrip.fun.common.vo.basic.VoucherShareLogBean
;
import
com.ctrip.fun.common.vo.basic.VoucherShareLogQuery
;
import
com.ctrip.fun.common.vo.membership.MbsOrderBean
;
import
com.ctrip.fun.golf.secrity.Security
;
import
com.ctrip.fun.golf.secrity.UserContext
;
...
...
@@ -165,8 +166,9 @@ public class VoucherMController {
//获取所有的券
@ResponseBody
@Security
@RequestMapping
(
value
=
"/voucher/queryListForMiniApps"
,
method
=
RequestMethod
.
GET
,
params
=
{
"token"
,
"uid"
,
"used"
,
"expired"
,
"shared"
,
"pagerOffset"
,
"pagerPerPage"
})
@RequestMapping
(
value
=
"/voucher/queryListForMiniApps"
,
method
=
RequestMethod
.
GET
,
params
=
{
"token"
,
"uid"
,
"used"
,
"expired"
,
"
isShare"
,
"
shared"
,
"pagerOffset"
,
"pagerPerPage"
})
public
Object
queryListForMiniApps
(
@RequestParam
String
token
,
VoucherQueryDto
voucherQuery
)
{
voucherQuery
.
setToken
(
token
);
return
voucherService
.
queryListForMiniApps
(
voucherQuery
);
}
...
...
@@ -177,6 +179,16 @@ public class VoucherMController {
public
Object
shareVoucherForMiniApps
(
@PathVariable
String
token
,
@RequestBody
VoucherShareLogBean
voucherShareLogBean
)
{
return
voucherService
.
shareVoucherForMiniApps
(
voucherShareLogBean
);
}
//生成一次分享
@ResponseBody
@Security
@RequestMapping
(
value
=
"/voucher/queryVoucherShareLogListForMiniApps/{token}"
,
method
=
RequestMethod
.
POST
)
public
Object
queryVoucherShareLogListForMiniApps
(
@PathVariable
String
token
,
@RequestBody
VoucherShareLogQuery
query
)
{
query
.
setToken
(
token
);
return
voucherService
.
queryVoucherShareLogListForMiniApps
(
query
);
}
//获取券的分享记录
@ResponseBody
...
...
src/main/java/com/ctrip/fun/golf/service/basic/VoucherMService.java
View file @
53b29bba
...
...
@@ -17,6 +17,7 @@ import com.ctrip.fun.common.vo.basic.VoucherItemDTO;
import
com.ctrip.fun.common.vo.basic.VoucherQueryDto
;
import
com.ctrip.fun.common.vo.basic.VoucherQueryRequestDTO
;
import
com.ctrip.fun.common.vo.basic.VoucherShareLogBean
;
import
com.ctrip.fun.common.vo.basic.VoucherShareLogQuery
;
import
com.ctrip.fun.golf.service.BaseService
;
/*
...
...
@@ -212,6 +213,22 @@ public class VoucherMService extends BaseService {
return
response
.
getBody
();
}
public
PagedResponseBean
<
VoucherShareLogBean
>
queryVoucherShareLogListForMiniApps
(
VoucherShareLogQuery
query
)
{
PagedResponseBean
<
VoucherShareLogBean
>
pagedResponseBean
=
new
PagedResponseBean
<
VoucherShareLogBean
>(
0
,
new
ArrayList
<
VoucherShareLogBean
>());
String
uri
=
super
.
getServiceUri
(
"uri.voucher.queryVoucherShareLogListForMiniApps"
);
HttpEntity
<
Request
<
VoucherShareLogQuery
>>
entity
=
new
HttpEntity
<
Request
<
VoucherShareLogQuery
>>(
new
Request
<
VoucherShareLogQuery
>(
null
,
query
));
Response
<
PagedResponseBean
<
VoucherShareLogBean
>>
response
=
null
;
try
{
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
PagedResponseBean
<
VoucherShareLogBean
>>>()
{}).
getBody
();
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
());
return
pagedResponseBean
;
}
return
response
.
getBody
();
}
public
Object
getShareVoucherLogForMiniApps
(
VoucherShareLogBean
query
)
{
PagedResponseBean
<
VoucherItemDTO
>
pagedResponseBean
=
new
PagedResponseBean
<
VoucherItemDTO
>(
0
,
new
ArrayList
<
VoucherItemDTO
>());
String
uri
=
super
.
getServiceUri
(
"uri.voucher.getShareVoucherLogForMiniApps"
);
...
...
src/main/resources/rpc.properties
View file @
53b29bba
...
...
@@ -102,6 +102,7 @@ uri.district.GetDistrictWeatherForecast=/fun-golf-service/district/weatherForeca
uri.voucher.voucherSearch
=
/fun-golf-service/Voucher/QueryVoucherList
uri.voucher.sendVoucherForMiniAppRegister
=
/fun-golf-service/Voucher/sendVoucherForMiniAppRegister
uri.voucher.queryListForMiniApps
=
/fun-golf-service/Voucher/queryListForMiniApps
uri.voucher.queryVoucherShareLogListForMiniApps
=
/fun-golf-service/Voucher/queryVoucherShareLogListForMiniApps
uri.voucher.shareVoucherForMiniApps
=
/fun-golf-service/Voucher/shareVoucherForMiniApps
uri.voucher.getShareVoucherLogForMiniApps
=
/fun-golf-service/Voucher/getShareVoucherLogForMiniApps
uri.voucher.getSharedVoucherForMiniApps
=
/fun-golf-service/Voucher/getSharedVoucherForMiniApps
...
...
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