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
92b42a4b
authored
Sep 20, 2022
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员专享抵扣劵
parent
4b84ea4a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
0 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/java/com/ctrip/fun/golf/service/user/UserMService.java
src/main/resources/rpc.properties
src/main/java/com/ctrip/fun/golf/api/basic/VoucherMController.java
View file @
92b42a4b
...
@@ -3,10 +3,13 @@ package com.ctrip.fun.golf.api.basic;
...
@@ -3,10 +3,13 @@ package com.ctrip.fun.golf.api.basic;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -44,6 +47,7 @@ import com.ctrip.fun.golf.vo.ErrorBean;
...
@@ -44,6 +47,7 @@ import com.ctrip.fun.golf.vo.ErrorBean;
@Controller
@Controller
@RequestMapping
(
value
=
""
)
@RequestMapping
(
value
=
""
)
public
class
VoucherMController
{
public
class
VoucherMController
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
VoucherMService
.
class
);
@Autowired
@Autowired
private
VoucherMService
voucherService
=
null
;
private
VoucherMService
voucherService
=
null
;
...
@@ -220,6 +224,27 @@ public class VoucherMController {
...
@@ -220,6 +224,27 @@ public class VoucherMController {
@ResponseBody
@ResponseBody
@Security
@Security
@RequestMapping
(
value
=
"/voucher/queryListForActivityOrder"
,
method
=
RequestMethod
.
GET
,
params
=
{
"token"
,
"sortField"
,
"sortDirection"
,
"pagerOffset"
,
"pagerPerPage"
})
public
Object
queryListForActivityOrder
(
@RequestParam
String
token
,
VoucherQueryDto
voucherQuery
)
{
voucherQuery
.
setUid
(
UserContext
.
getUserId
());
voucherQuery
.
setPlayDate
(
new
Date
());
if
(
voucherQuery
.
getType
()
==
1
){
voucherQuery
.
setType
(
7
);
}
else
if
(
voucherQuery
.
getType
()
==
2
){
voucherQuery
.
setType
(
8
);
}
else
if
(
voucherQuery
.
getType
()
==
3
){
voucherQuery
.
setType
(
6
);
}
else
if
(
voucherQuery
.
getType
()
==
4
){
voucherQuery
.
setType
(
5
);
}
return
voucherService
.
queryListForActivityOrder
(
voucherQuery
);
}
@ResponseBody
@Security
@RequestMapping
(
value
=
"/voucher/queryListForCourseOrder"
,
method
=
RequestMethod
.
GET
,
params
=
{
"token"
,
"resourceId"
,
"playDate"
,
"sortField"
,
"sortDirection"
,
"pagerOffset"
,
@RequestMapping
(
value
=
"/voucher/queryListForCourseOrder"
,
method
=
RequestMethod
.
GET
,
params
=
{
"token"
,
"resourceId"
,
"playDate"
,
"sortField"
,
"sortDirection"
,
"pagerOffset"
,
"pagerPerPage"
})
"pagerPerPage"
})
public
Object
queryListForCourseOrder
(
@RequestParam
String
token
,
VoucherQueryDto
voucherQuery
)
{
public
Object
queryListForCourseOrder
(
@RequestParam
String
token
,
VoucherQueryDto
voucherQuery
)
{
...
...
src/main/java/com/ctrip/fun/golf/service/basic/VoucherMService.java
View file @
92b42a4b
...
@@ -62,6 +62,27 @@ public class VoucherMService extends BaseService {
...
@@ -62,6 +62,27 @@ public class VoucherMService extends BaseService {
return
response
.
getBody
();
return
response
.
getBody
();
}
}
public
PagedResponseBean
<
VoucherItemDTO
>
queryListForActivityOrder
(
VoucherQueryDto
query
)
{
PagedResponseBean
<
VoucherItemDTO
>
pagedResponseBean
=
new
PagedResponseBean
<
VoucherItemDTO
>(
0
,
new
ArrayList
<
VoucherItemDTO
>());
if
(!
StringUtils
.
hasText
(
query
.
getUid
()))
{
return
pagedResponseBean
;
}
String
uri
=
super
.
getServiceUri
(
"uri.voucher.queryListForActivityOrder"
);
HttpEntity
<
Request
<
VoucherQueryDto
>>
entity
=
new
HttpEntity
<
Request
<
VoucherQueryDto
>>(
new
Request
<
VoucherQueryDto
>(
null
,
query
));
Response
<
PagedResponseBean
<
VoucherItemDTO
>>
response
=
null
;
try
{
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
PagedResponseBean
<
VoucherItemDTO
>>>()
{
}).
getBody
();
}
catch
(
Exception
e
)
{
logger
.
error
(
e
.
getMessage
());
return
pagedResponseBean
;
}
if
(
response
==
null
||
response
.
getStatus
()
!=
0
||
response
.
getBody
()
==
null
)
{
return
pagedResponseBean
;
}
return
response
.
getBody
();
}
public
PagedResponseBean
<
VoucherItemDTO
>
queryListForCourseOrder
(
VoucherQueryDto
query
)
{
public
PagedResponseBean
<
VoucherItemDTO
>
queryListForCourseOrder
(
VoucherQueryDto
query
)
{
PagedResponseBean
<
VoucherItemDTO
>
pagedResponseBean
=
new
PagedResponseBean
<
VoucherItemDTO
>(
0
,
new
ArrayList
<
VoucherItemDTO
>());
PagedResponseBean
<
VoucherItemDTO
>
pagedResponseBean
=
new
PagedResponseBean
<
VoucherItemDTO
>(
0
,
new
ArrayList
<
VoucherItemDTO
>());
if
(!
StringUtils
.
hasText
(
query
.
getUid
()))
{
if
(!
StringUtils
.
hasText
(
query
.
getUid
()))
{
...
...
src/main/java/com/ctrip/fun/golf/service/user/UserMService.java
View file @
92b42a4b
...
@@ -66,6 +66,7 @@ public class UserMService extends BaseService {
...
@@ -66,6 +66,7 @@ public class UserMService extends BaseService {
Request
<
UserQuery
>
request
=
new
Request
<
UserQuery
>(
""
,
userQuery
);
Request
<
UserQuery
>
request
=
new
Request
<
UserQuery
>(
""
,
userQuery
);
HttpEntity
<
Request
<
UserQuery
>>
entity
=
new
HttpEntity
<
Request
<
UserQuery
>>(
request
);
HttpEntity
<
Request
<
UserQuery
>>
entity
=
new
HttpEntity
<
Request
<
UserQuery
>>(
request
);
UserBean
responseBean
=
null
;
UserBean
responseBean
=
null
;
System
.
out
.
println
(
this
.
getServiceUri
(
"uri.user.userDetailByToken"
));
Response
<
UserBean
>
response
=
super
.
exchange
(
Response
<
UserBean
>
response
=
super
.
exchange
(
this
.
getServiceUri
(
"uri.user.userDetailByToken"
),
HttpMethod
.
POST
,
entity
,
this
.
getServiceUri
(
"uri.user.userDetailByToken"
),
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
UserBean
>>()
{
new
ParameterizedTypeReference
<
Response
<
UserBean
>>()
{
...
...
src/main/resources/rpc.properties
View file @
92b42a4b
...
@@ -132,6 +132,7 @@ uri.voucher.getShareVoucherLogForMiniApps=/fun-golf-service/Voucher/getShareVouc
...
@@ -132,6 +132,7 @@ uri.voucher.getShareVoucherLogForMiniApps=/fun-golf-service/Voucher/getShareVouc
uri.voucher.getSharedVoucherForMiniApps
=
/fun-golf-service/Voucher/getSharedVoucherForMiniApps
uri.voucher.getSharedVoucherForMiniApps
=
/fun-golf-service/Voucher/getSharedVoucherForMiniApps
uri.voucher.cancelShareVoucherForMiniApps
=
/fun-golf-service/Voucher/cancelShareVoucherForMiniApps
uri.voucher.cancelShareVoucherForMiniApps
=
/fun-golf-service/Voucher/cancelShareVoucherForMiniApps
uri.voucher.queryListForPersonalCenter
=
/fun-golf-service/Voucher/queryListForPersonalCenter
uri.voucher.queryListForPersonalCenter
=
/fun-golf-service/Voucher/queryListForPersonalCenter
uri.voucher.queryListForActivityOrder
=
/fun-golf-service/Voucher/queryListForActivityOrder
uri.voucher.queryListForCourseOrder
=
/fun-golf-service/Voucher/queryListForCourseOrder
uri.voucher.queryListForCourseOrder
=
/fun-golf-service/Voucher/queryListForCourseOrder
uri.voucher.queryListForTourOrder
=
/fun-golf-service/Voucher/queryListForTourOrder
uri.voucher.queryListForTourOrder
=
/fun-golf-service/Voucher/queryListForTourOrder
uri.voucher.queryListForEventActivityOrder
=
/fun-golf-service/Voucher/queryListForEventActivityOrder
uri.voucher.queryListForEventActivityOrder
=
/fun-golf-service/Voucher/queryListForEventActivityOrder
...
...
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