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
f618315a
authored
Aug 27, 2017
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
miss some file
parent
257908e8
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
28 deletions
src/main/java/com/ctrip/fun/golf/api/game/GameController.java
src/main/java/com/ctrip/fun/golf/api/game/ScoreMatchMController.java
src/main/java/com/ctrip/fun/golf/api/score/ScoreCardController.java
src/main/java/com/ctrip/fun/golf/service/score/ScoreService.java
src/main/resources/rpc.properties
src/main/java/com/ctrip/fun/golf/api/game/GameController.java
View file @
f618315a
...
...
@@ -726,6 +726,12 @@ public class GameController {
return
null
;
}
/**
* 开始记分
* @param token
* @param gameId
* @return
*/
@Security
@ResponseBody
@RequestMapping
(
value
=
"/startScore/{token}"
,
method
=
RequestMethod
.
GET
,
params
=
{
"gameId"
})
...
...
src/main/java/com/ctrip/fun/golf/api/game/ScoreMatchMController.java
View file @
f618315a
...
...
@@ -66,6 +66,13 @@ public class ScoreMatchMController {
return
scoreMatchMService
.
list
(
query
);
}
/**
* 我参与的赛事列表
* @param token
* @param pagerOffset
* @param pagerPerPage
* @return
*/
@Security
@ResponseBody
@RequestMapping
(
value
=
"/myRegisterList/{token}"
,
method
=
RequestMethod
.
GET
,
params
=
{
"pagerOffset"
,
"pagerPerPage"
})
...
...
src/main/java/com/ctrip/fun/golf/api/score/ScoreCardController.java
View file @
f618315a
...
...
@@ -45,58 +45,73 @@ public class ScoreCardController {
@Autowired
private
ScoreService
scoreService
;
/**
* 开始打球
*
*/
@RequestMapping
(
"/
s
tart/{token}"
)
@RequestMapping
(
"/
checkS
tart/{token}"
)
@ResponseBody
public
Response
<
GameScoreBean
>
s
tart
(
@PathVariable
(
"token"
)
String
token
,
public
Response
<
Integer
>
checkS
tart
(
@PathVariable
(
"token"
)
String
token
,
@RequestBody
StartScoreVO
vo
)
{
Response
<
GameScoreBean
>
response
=
new
Response
<
GameScoreBean
>();
Response
response
=
checkParam
(
token
,
vo
);
UserBean
userBean
=
null
;
try
{
userBean
=
userMService
.
getUserBean
(
token
);
}
catch
(
Exception
e
)
{
}
if
(
userBean
==
null
||
StringUtils
.
isEmpty
(
userBean
.
getUid
()))
{
return
new
Response
(-
1
,
"非法token"
,
null
);
}
vo
.
setUid
(
userBean
.
getUid
());
return
scoreService
.
checkStart
(
vo
);
}
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
private
Response
checkParam
(
String
token
,
StartScoreVO
vo
)
{
// 校验参数
if
(
vo
.
getCourseId
()
<
1
)
{
response
.
setMessage
(
"请选择球场"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"请选择球场"
,
null
);
}
if
(
vo
.
getZone1
()
<
1
||
vo
.
getZone2
()
<
1
)
{
response
.
setMessage
(
"请选择2个球区"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"请选择2个球区"
,
null
);
}
if
(
StringUtils
.
isEmpty
(
vo
.
getLocalPlayer
()))
{
response
.
setMessage
(
"请输入打球人姓名"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"请输入打球人姓名"
,
null
);
}
for
(
GamePlayerVO
player
:
vo
.
getPlayers
())
{
if
(
player
==
null
)
{
response
.
setMessage
(
"请完善打球人信息"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"请完善打球人信息"
,
null
);
}
if
(
StringUtils
.
isEmpty
(
player
.
getName
()))
{
response
.
setMessage
(
"打球人姓名不能为空"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"打球人姓名不能为空"
,
null
);
}
if
(!
StringUtils
.
isEmpty
(
player
.
getPhone
())
&&
!
MatcherUtil
.
isPhone
(
player
.
getPhone
()))
{
response
.
setMessage
(
"手机号码格式不正确"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"手机号码格式不正确"
,
null
);
}
if
(
player
.
getTee
()==
null
)
{
response
.
setMessage
(
"参与球员没有选择发球台"
);
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"参与球员没有选择发球台"
,
null
);
}
if
(!
MatcherUtil
.
isTee
(
player
.
getTee
()))
{
response
.
setMessage
(
"您选择了非法的发球台:"
+
player
.
getTee
());
response
.
setStatus
(-
1
);
return
response
;
return
new
Response
(-
1
,
"您选择了非法的发球台:"
+
player
.
getTee
(),
null
);
}
}
return
null
;
}
/**
* 开始打球
*
*/
@SuppressWarnings
({
"unchecked"
,
"rawtypes"
})
@RequestMapping
(
"/start/{token}"
)
@ResponseBody
public
Response
<
GameScoreBean
>
start
(
@PathVariable
(
"token"
)
String
token
,
@RequestBody
StartScoreVO
vo
)
{
// Response<GameScoreBean> response = new Response<GameScoreBean>();
Response
response
=
checkParam
(
token
,
vo
);
if
(
response
==
null
){
response
=
new
Response
<
GameScoreBean
>();
}
UserBean
userBean
=
null
;
try
{
...
...
src/main/java/com/ctrip/fun/golf/service/score/ScoreService.java
View file @
f618315a
...
...
@@ -30,6 +30,24 @@ public class ScoreService extends BaseService {
// private static Logger logger = LoggerFactory.getLogger(ScoreService.class);
/**
* 检查开始打球
*
* @param uid
* 用户编号
*
* @param vo
* 开始打球人和球洞信息
* @return
*/
public
Response
<
Integer
>
checkStart
(
StartScoreVO
vo
)
{
Request
<
StartScoreVO
>
request
=
new
Request
<
StartScoreVO
>(
vo
.
getUid
(),
vo
);
HttpEntity
<
Request
<
StartScoreVO
>>
entity
=
new
HttpEntity
<
Request
<
StartScoreVO
>>(
request
);
Response
<
Integer
>
response
=
super
.
exchange
(
this
.
getServiceUri
(
"uri.scores.checkStart"
),
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
}).
getBody
();
return
response
;
}
/**
* 开始打球
*
* @param uid
...
...
src/main/resources/rpc.properties
View file @
f618315a
...
...
@@ -206,6 +206,7 @@ uri.integral.goods=/fun-golf-service/integralGoods/list
uri.scores.uploadTempScore
=
/fun-golf-service/scores/uploadTempScore
uri.scores.getUserStat
=
/fun-golf-service/scores/getUserStat
uri.scores.checkStart
=
/fun-golf-service/scores/checkStart
uri.scores.start
=
/fun-golf-service/scores/start
uri.scores.record
=
/fun-golf-service/scores/record
uri.scores.finish
=
/fun-golf-service/scores/finish
...
...
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