记得上下班打卡 | 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
cf8ba5a1
Commit
cf8ba5a1
authored
May 17, 2021
by
洪全海
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码,会员购买写一半了
parent
6029c94e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
10 deletions
+11
-10
IAdamMemberOrderService.java
...quidnet/service/adam/service/IAdamMemberOrderService.java
+1
-1
AdamMemberController.java
...quidnet/service/adam/controller/AdamMemberController.java
+2
-1
AdamMemberOrderController.java
...et/service/adam/controller/AdamMemberOrderController.java
+5
-5
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+1
-1
application-dev.yml
...net-support-config/src/main/resources/application-dev.yml
+2
-2
No files found.
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java
View file @
cf8ba5a1
...
@@ -16,7 +16,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
...
@@ -16,7 +16,7 @@ public interface IAdamMemberOrderService extends IService<AdamMemberOrder> {
*
*
* @param param
* @param param
*/
*/
AdamMemberOrderResult
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
);
AdamMemberOrderResult
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
)
throws
Exception
;
/**
/**
* 使用会员码
* 使用会员码
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberController.java
View file @
cf8ba5a1
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiSupport
;
import
com.liquidnet.service.base.ErrorMapping
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberVo
;
import
com.liquidnet.service.adam.dto.vo.AdamMemberVo
;
import
com.liquidnet.service.adam.service.IAdamMemberService
;
import
com.liquidnet.service.adam.service.IAdamMemberService
;
...
@@ -26,7 +27,7 @@ public class AdamMemberController {
...
@@ -26,7 +27,7 @@ public class AdamMemberController {
@ApiOperationSupport
(
order
=
0
)
@ApiOperationSupport
(
order
=
0
)
@ApiOperation
(
value
=
"会员信息"
)
@ApiOperation
(
value
=
"会员信息"
)
@GetMapping
(
"info"
)
@GetMapping
(
"info"
)
public
ResponseDto
<
Object
>
query
()
{
public
ResponseDto
<
AdamMemberVo
>
query
()
{
AdamMemberVo
info
=
adamMemberService
.
queryMemberInfo
();
AdamMemberVo
info
=
adamMemberService
.
queryMemberInfo
();
return
ResponseDto
.
success
(
info
);
return
ResponseDto
.
success
(
info
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @
cf8ba5a1
...
@@ -2,11 +2,11 @@ package com.liquidnet.service.adam.controller;
...
@@ -2,11 +2,11 @@ package com.liquidnet.service.adam.controller;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.liquidnet.service.ResponseDto
;
import
com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam
;
import
com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam
;
import
com.liquidnet.service.adam.dto.AdamMemberOrderParam
;
import
com.liquidnet.service.adam.dto.AdamMemberOrderParam
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.entity.AdamMemberOrder
;
import
com.liquidnet.service.adam.service.IAdamMemberOrderService
;
import
com.liquidnet.service.adam.service.IAdamMemberOrderService
;
import
com.liquidnet.service.base.ResponseDto
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -30,10 +30,10 @@ public class AdamMemberOrderController {
...
@@ -30,10 +30,10 @@ public class AdamMemberOrderController {
public
ResponseDto
<
AdamMemberOrder
>
buyMemberOrCode
(
AdamMemberOrderParam
param
)
{
public
ResponseDto
<
AdamMemberOrder
>
buyMemberOrCode
(
AdamMemberOrderParam
param
)
{
try
{
try
{
adamMemberOrderService
.
buyMemberOrMemberCode
(
param
);
adamMemberOrderService
.
buyMemberOrMemberCode
(
param
);
return
new
ResponseDto
()
.
success
();
return
ResponseDto
.
success
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
return
new
ResponseDto
()
.
failure
();
return
ResponseDto
.
failure
();
}
}
}
}
...
@@ -43,10 +43,10 @@ public class AdamMemberOrderController {
...
@@ -43,10 +43,10 @@ public class AdamMemberOrderController {
public
ResponseDto
<
AdamMemberOrder
>
useMemberCode
(
AdamMemberOrderCodeParam
param
)
{
public
ResponseDto
<
AdamMemberOrder
>
useMemberCode
(
AdamMemberOrderCodeParam
param
)
{
try
{
try
{
adamMemberOrderService
.
useMemberCode
(
param
);
adamMemberOrderService
.
useMemberCode
(
param
);
return
new
ResponseDto
()
.
success
();
return
ResponseDto
.
success
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
return
new
ResponseDto
()
.
failure
();
return
ResponseDto
.
failure
();
}
}
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
cf8ba5a1
...
@@ -42,7 +42,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
...
@@ -42,7 +42,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
IAdamMemberService
adamMemberService
;
IAdamMemberService
adamMemberService
;
@Override
@Override
public
AdamMemberOrderResult
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
)
{
public
AdamMemberOrderResult
buyMemberOrMemberCode
(
AdamMemberOrderParam
param
)
throws
Exception
{
AdamMemberOrderResult
result
=
new
AdamMemberOrderResult
();
AdamMemberOrderResult
result
=
new
AdamMemberOrderResult
();
// 判断黑名单,待定(暂不做)
// 判断黑名单,待定(暂不做)
...
...
liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml
View file @
cf8ba5a1
...
@@ -19,8 +19,8 @@ liquidnet:
...
@@ -19,8 +19,8 @@ liquidnet:
username
:
admin
username
:
admin
password
:
admin
password
:
admin
config
:
config
:
#
location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
location
:
/Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
location
:
/app/support-config
#
location: /app/support-config
# end-dev-这里是配置信息基本值
# end-dev-这里是配置信息基本值
spring
:
spring
:
...
...
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