Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nyx
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
发现
nyx
Commits
01084876
Commit
01084876
authored
Aug 10, 2020
by
jscat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nyx javaapp: 功能优化
1. 新增 tbl_match表match_status字段 "查询之后更新"的功能 主要用于my-points的扫码操作
parent
028b90f4
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
42 行增加
和
6 行删除
+42
-6
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_keyService.java
+3
-1
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
+19
-1
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/NyxApiController.java
+20
-4
没有找到文件。
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_keyService.java
查看文件 @
01084876
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
;
...
@@ -28,6 +28,8 @@ public interface Rockwell_keyService {
...
@@ -28,6 +28,8 @@ public interface Rockwell_keyService {
// 1. match详情,指定matchId
// 1. match详情,指定matchId
// 2. 查询比赛历史 with pagination, 指定matchTeam, order by create_datetime desc, match_status == 1
// 2. 查询比赛历史 with pagination, 指定matchTeam, order by create_datetime desc, match_status == 1
JSONResult
Rockwell_keyServiceGetT_match_by_matchid
(
String
matchId
);
JSONResult
Rockwell_keyServiceGetT_match_by_matchid
(
String
matchId
);
// only used for checking qrcode mode; 扫码之后, 立即更新match_status='00', 然后返回初次查询结果
JSONResult
Rockwell_keyServiceGetThenUpdateT_match_by_matchid
(
String
matchId
);
JSONResult
Rockwell_keyServiceGetT_match_by_page
(
String
memberId
,
String
userId
,
String
matchStatus
);
JSONResult
Rockwell_keyServiceGetT_match_by_page
(
String
memberId
,
String
userId
,
String
matchStatus
);
void
Rockwell_keyServiceAddT_matchList
(
List
<
Rockwell_keyT_match
>
listRockwell_keyT_match
);
void
Rockwell_keyServiceAddT_matchList
(
List
<
Rockwell_keyT_match
>
listRockwell_keyT_match
);
JSONResult
Rockwell_keyServiceAddT_matchItem
(
String
matchId
,
String
activityId
,
String
memberId
,
String
userId
,
JSONResult
Rockwell_keyServiceAddT_matchItem
(
String
matchId
,
String
activityId
,
String
memberId
,
String
userId
,
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
查看文件 @
01084876
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
service
.
impl
;
...
@@ -155,6 +155,24 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
...
@@ -155,6 +155,24 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
}
}
public
JSONResult
Rockwell_keyServiceGetThenUpdateT_match_by_matchid
(
String
matchId
){
LOGGER
.
debug
(
"find Rockwell_keyServiceGetThenUpdateT_match_by_matchid"
);
List
<
Rockwell_keyT_match
>
listRockwell_keyT_match
=
new
ArrayList
<
Rockwell_keyT_match
>();
Rockwell_keyT_matchQuery
rockwell_keyT_matchQuery
=
new
Rockwell_keyT_matchQuery
();
rockwell_keyT_matchQuery
.
setMatchId
(
matchId
);
listRockwell_keyT_match
=
rockwell_keyMapper
.
getT_match_by_matchid
(
rockwell_keyT_matchQuery
);
int
totalCount
=
listRockwell_keyT_match
.
size
();
JSONResult
jsonResult
=
new
JSONResult
(
totalCount
,
listRockwell_keyT_match
);
if
(
totalCount
>=
1
&&
listRockwell_keyT_match
.
get
(
0
).
getMatchStatus
().
equals
(
"01"
))
{
rockwell_keyMapper
.
updateT_match_status
(
rockwell_keyT_matchQuery
);
}
return
jsonResult
;
}
// 暂时未使用
public
JSONResult
Rockwell_keyServiceGetT_match_by_page
(
String
memberId
,
String
userId
,
String
matchStatus
)
public
JSONResult
Rockwell_keyServiceGetT_match_by_page
(
String
memberId
,
String
userId
,
String
matchStatus
)
{
{
LOGGER
.
debug
(
"find Rockwell_keyServiceGetT_match_by_page"
);
LOGGER
.
debug
(
"find Rockwell_keyServiceGetT_match_by_page"
);
...
...
增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/NyxApiController.java
查看文件 @
01084876
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
web
.
controller
;
packa
ge
cn
.
com
.
fun
.
nyxkey
.
api
.
web
.
controller
;
...
@@ -197,11 +197,12 @@ public class NyxApiController {
...
@@ -197,11 +197,12 @@ public class NyxApiController {
// 2.5 get t_match by matchId
// 2.5 get t_match by matchId
// or check the qrcode
@ApiOperation
(
value
=
"get t_match by matchId"
,
notes
=
"get t_match by matchId"
)
@ApiOperation
(
value
=
"get t_match by matchId"
,
notes
=
"get t_match by matchId"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"matchId"
,
value
=
"竞答id"
,
required
=
true
,
dataType
=
"String"
)
@ApiImplicitParam
(
name
=
"matchId"
,
value
=
"竞答id"
,
required
=
true
,
dataType
=
"String"
)
})
})
@RequestMapping
(
value
=
"/nyx/match/query/
match
id"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/nyx/match/query/id"
,
method
=
RequestMethod
.
GET
)
public
JSONResult
RockwellGetMatchById
(
public
JSONResult
RockwellGetMatchById
(
@RequestParam
(
value
=
"matchId"
,
required
=
true
)
String
matchId
@RequestParam
(
value
=
"matchId"
,
required
=
true
)
String
matchId
)
{
)
{
...
@@ -210,7 +211,7 @@ public class NyxApiController {
...
@@ -210,7 +211,7 @@ public class NyxApiController {
}
}
// 2.6 get v_match_point by page
// 2.6 get v_match_point by page
@ApiOperation
(
value
=
"get
t_match by matchId"
,
notes
=
"get t_match by matchId
"
)
@ApiOperation
(
value
=
"get
v_match_point by page"
,
notes
=
"get v_match_point by page
"
)
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"memberId"
,
value
=
"商家id"
,
required
=
false
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"memberId"
,
value
=
"商家id"
,
required
=
false
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"userId"
,
value
=
"用户id"
,
required
=
false
,
dataType
=
"String"
),
@ApiImplicitParam
(
name
=
"userId"
,
value
=
"用户id"
,
required
=
false
,
dataType
=
"String"
),
...
@@ -218,7 +219,7 @@ public class NyxApiController {
...
@@ -218,7 +219,7 @@ public class NyxApiController {
@ApiImplicitParam
(
name
=
"pageNum"
,
value
=
"页码,从1开始"
,
required
=
false
,
dataType
=
"String"
,
defaultValue
=
"1"
),
@ApiImplicitParam
(
name
=
"pageNum"
,
value
=
"页码,从1开始"
,
required
=
false
,
dataType
=
"String"
,
defaultValue
=
"1"
),
@ApiImplicitParam
(
name
=
"pageCount"
,
value
=
"每页的数据个数,默认是5个"
,
required
=
false
,
dataType
=
"String"
,
defaultValue
=
"5"
)
@ApiImplicitParam
(
name
=
"pageCount"
,
value
=
"每页的数据个数,默认是5个"
,
required
=
false
,
dataType
=
"String"
,
defaultValue
=
"5"
)
})
})
@RequestMapping
(
value
=
"/nyx/match/
point/
query"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/nyx/match/query"
,
method
=
RequestMethod
.
GET
)
public
JSONResult
RockwellGetMatchPointByPage
(
public
JSONResult
RockwellGetMatchPointByPage
(
@RequestParam
(
value
=
"memberId"
,
required
=
false
,
defaultValue
=
"0"
)
String
memberId
,
@RequestParam
(
value
=
"memberId"
,
required
=
false
,
defaultValue
=
"0"
)
String
memberId
,
@RequestParam
(
value
=
"userId"
,
required
=
false
,
defaultValue
=
"0"
)
String
userId
,
@RequestParam
(
value
=
"userId"
,
required
=
false
,
defaultValue
=
"0"
)
String
userId
,
...
@@ -243,6 +244,21 @@ public class NyxApiController {
...
@@ -243,6 +244,21 @@ public class NyxApiController {
return
keyService
.
Rockwell_keyServiceGetT_match_bonus_by_id
(
matchId
);
return
keyService
.
Rockwell_keyServiceGetT_match_bonus_by_id
(
matchId
);
}
}
// 2.8 get t_match by matchId, then update the match_status jscat 2020/08/10
// used for checking the qrcode main process
@ApiOperation
(
value
=
"query then update match_status='00' for t_match by matchId"
,
notes
=
"query then update match_status='00' for t_match by matchId"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"matchId"
,
value
=
"竞答id"
,
required
=
true
,
dataType
=
"String"
)
})
@RequestMapping
(
value
=
"/nyx/match/queryThenUpdate/id"
,
method
=
RequestMethod
.
GET
)
public
JSONResult
RockwellGetThenUpdateMatchById
(
@RequestParam
(
value
=
"matchId"
,
required
=
true
)
String
matchId
)
{
return
keyService
.
Rockwell_keyServiceGetThenUpdateT_match_by_matchid
(
matchId
);
}
// APi3 tbl_activity接口 jscat 20200804
// APi3 tbl_activity接口 jscat 20200804
// 3.1 获取 view_activity_info 的数据 by page, not by activityId
// 3.1 获取 view_activity_info 的数据 by page, not by activityId
// 返回 Rockwell_keyV_activity_info
// 返回 Rockwell_keyV_activity_info
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论