记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
18e71d4f
Commit
18e71d4f
authored
Jul 14, 2022
by
zhengfuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
做ar活动开发。
parent
2fb1c431
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
17 deletions
+10
-17
IKylinAcitveService.java
...dnet/service/kylin/service/admin/IKylinAcitveService.java
+2
-2
KylinAcitveServiceImpl.java
...n/zhengzai/kylin/service/impl/KylinAcitveServiceImpl.java
+2
-1
KylinArActiveController.java
...net/service/kylin/controller/KylinArActiveController.java
+6
-14
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinAcitveService.java
→
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/
admin/
IKylinAcitveService.java
View file @
18e71d4f
package
com
.
liquidnet
.
service
.
kylin
.
service
;
package
com
.
liquidnet
.
service
.
kylin
.
service
.
admin
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.
github.pagehelper.PageInf
o
;
import
com.
liquidnet.service.base.ResponseDt
o
;
import
com.liquidnet.service.kylin.dao.KylinAcitve
;
import
com.liquidnet.service.kylin.dao.KylinAcitve
;
import
java.util.List
;
import
java.util.List
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinAcitveServiceImpl.java
View file @
18e71d4f
...
@@ -11,8 +11,8 @@ import com.liquidnet.service.kylin.dao.KylinAcitve;
...
@@ -11,8 +11,8 @@ import com.liquidnet.service.kylin.dao.KylinAcitve;
import
com.liquidnet.service.kylin.dao.KylinTicketActive
;
import
com.liquidnet.service.kylin.dao.KylinTicketActive
;
import
com.liquidnet.service.kylin.mapper.KylinAcitveMapper
;
import
com.liquidnet.service.kylin.mapper.KylinAcitveMapper
;
import
com.liquidnet.service.kylin.mapper.KylinTicketActiveMapper
;
import
com.liquidnet.service.kylin.mapper.KylinTicketActiveMapper
;
import
com.liquidnet.service.kylin.service.IKylinAcitveService
;
import
com.liquidnet.service.kylin.service.IKylinTicketActiveService
;
import
com.liquidnet.service.kylin.service.IKylinTicketActiveService
;
import
com.liquidnet.service.kylin.service.admin.IKylinAcitveService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -62,6 +62,7 @@ public class KylinAcitveServiceImpl extends ServiceImpl<KylinAcitveMapper, Kylin
...
@@ -62,6 +62,7 @@ public class KylinAcitveServiceImpl extends ServiceImpl<KylinAcitveMapper, Kylin
return
list
;
return
list
;
}
}
public
List
<
KylinTicketActive
>
getKylinTicketActive
(
int
number
,
String
activeId
){
public
List
<
KylinTicketActive
>
getKylinTicketActive
(
int
number
,
String
activeId
){
List
<
KylinTicketActive
>
list
=
new
ArrayList
<>();
List
<
KylinTicketActive
>
list
=
new
ArrayList
<>();
if
(
number
>
0
){
if
(
number
>
0
){
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinArActiveController.java
View file @
18e71d4f
...
@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.controller;
...
@@ -3,7 +3,6 @@ package com.liquidnet.service.kylin.controller;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.kylin.service.impl.BannersServiceImpl
;
import
com.liquidnet.service.kylin.utils.DataUtils
;
import
com.liquidnet.service.kylin.utils.DataUtils
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
...
@@ -11,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
...
@@ -11,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
/**
/**
...
@@ -26,14 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -26,14 +24,13 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping
(
"arActive"
)
@RequestMapping
(
"arActive"
)
@Slf4j
@Slf4j
public
class
KylinArActiveController
{
public
class
KylinArActiveController
{
/*@Autowired
@Autowired
private IKylinAcitveService iKylinAcitveService;*/
private
BannersServiceImpl
bannersServiceImpl
;
@Autowired
@Autowired
private
DataUtils
dataUtils
;
private
DataUtils
dataUtils
;
@PostMapping
(
"getUserStatus"
)
@PostMapping
(
"getUserStatus"
)
@ApiOperation
(
"查看用户是否绑定(0没有绑定、1绑定了、2失效
,目前失效没有用)
"
)
@ApiOperation
(
"查看用户是否绑定(0没有绑定、1绑定了、2失效
[目前失效没有用]
"
)
public
ResponseDto
<
String
>
getUserStatus
()
{
public
ResponseDto
<
String
>
getUserStatus
()
{
String
uid
=
CurrentUtil
.
getCurrentUid
();
String
uid
=
CurrentUtil
.
getCurrentUid
();
if
(
null
==
dataUtils
.
getUserStatus
(
uid
)){
if
(
null
==
dataUtils
.
getUserStatus
(
uid
)){
...
@@ -42,18 +39,13 @@ public class KylinArActiveController {
...
@@ -42,18 +39,13 @@ public class KylinArActiveController {
return
ResponseDto
.
success
(
dataUtils
.
getUserStatus
(
uid
));
return
ResponseDto
.
success
(
dataUtils
.
getUserStatus
(
uid
));
}
}
}
}
@PostMapping
(
"exchangeCode"
)
/*
@PostMapping("exchangeCode")
@ApiOperation("兑换码兑换")
@ApiOperation("兑换码兑换")
public ResponseDto<String> exchangeCode(@RequestParam(value = "code")String code) {
public ResponseDto<String> exchangeCode(@RequestParam(value = "code")String code) {
String uid = CurrentUtil.getCurrentUid();
String uid = CurrentUtil.getCurrentUid();
return iKylinAcitveService.exchange(code,uid);
if
(
null
==
dataUtils
.
getUserStatus
(
uid
)){
return
ResponseDto
.
success
(
"0"
);
}
else
{
return
ResponseDto
.
success
(
dataUtils
.
getUserStatus
(
uid
));
}
}
}
*/
}
}
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