记得上下班打卡 | 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
8fb39ecd
Commit
8fb39ecd
authored
Sep 14, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
领取券返回值调整;
parent
d3bb9693
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ICandyCouponService.java
.../liquidnet/service/candy/service/ICandyCouponService.java
+1
-1
CandyCouponController.java
...idnet/service/candy/controller/CandyCouponController.java
+1
-1
CandyCouponServiceImpl.java
...et/service/candy/service/impl/CandyCouponServiceImpl.java
+2
-2
No files found.
liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/service/ICandyCouponService.java
View file @
8fb39ecd
...
@@ -44,7 +44,7 @@ public interface ICandyCouponService {
...
@@ -44,7 +44,7 @@ public interface ICandyCouponService {
Boolean
useBackCoupon
(
List
<
BackCouponParam
>
backCouponParam
);
Boolean
useBackCoupon
(
List
<
BackCouponParam
>
backCouponParam
);
ResponseDto
<
Boolean
>
receiveCoupon
(
String
ccode
);
ResponseDto
<
String
>
receiveCoupon
(
String
ccode
);
ResponseDto
<
CandyCouponVo
>
receiveCouponDetails
(
String
ccode
);
ResponseDto
<
CandyCouponVo
>
receiveCouponDetails
(
String
ccode
);
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java
View file @
8fb39ecd
...
@@ -208,7 +208,7 @@ public class CandyCouponController {
...
@@ -208,7 +208,7 @@ public class CandyCouponController {
@ApiImplicitParams
({
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"ccode"
,
value
=
"兑换码"
,
required
=
true
),
@ApiImplicitParam
(
type
=
"form"
,
dataType
=
"String"
,
name
=
"ccode"
,
value
=
"兑换码"
,
required
=
true
),
})
})
public
ResponseDto
<
Boolean
>
receiveCoupon
(
@RequestParam
(
"ccode"
)
@NotNull
@NotBlank
String
ccode
)
{
public
ResponseDto
<
String
>
receiveCoupon
(
@RequestParam
(
"ccode"
)
@NotNull
@NotBlank
String
ccode
)
{
return
candyCouponService
.
receiveCoupon
(
ccode
);
return
candyCouponService
.
receiveCoupon
(
ccode
);
// if (result) {
// if (result) {
// return ResponseDto.success();
// return ResponseDto.success();
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java
View file @
8fb39ecd
...
@@ -380,7 +380,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -380,7 +380,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
}
}
@Override
@Override
public
ResponseDto
<
Boolean
>
receiveCoupon
(
String
ccode
)
{
public
ResponseDto
<
String
>
receiveCoupon
(
String
ccode
)
{
String
uid
=
CurrentUtil
.
getCurrentUid
();
String
uid
=
CurrentUtil
.
getCurrentUid
();
CandyCouponCodeDto
dto
=
redisDataUtils
.
getCouponByCode
(
ccode
);
CandyCouponCodeDto
dto
=
redisDataUtils
.
getCouponByCode
(
ccode
);
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
...
@@ -406,10 +406,10 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
...
@@ -406,10 +406,10 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
uCouponId
,
uid
,
1
,
infoDto
.
getCouponId
(),
ccode
,
now
,
now
,
now
.
plusDays
(
infoDto
.
getRedeemValidity
())
uCouponId
,
uid
,
1
,
infoDto
.
getCouponId
(),
ccode
,
now
,
now
,
now
.
plusDays
(
infoDto
.
getRedeemValidity
())
)
)
);
);
return
ResponseDto
.
success
(
uCouponId
);
}
else
{
}
else
{
return
ResponseDto
.
failure
(
"兑换失败,请稍后再试"
);
return
ResponseDto
.
failure
(
"兑换失败,请稍后再试"
);
}
}
return
ResponseDto
.
success
(
true
);
}
}
@Override
@Override
...
...
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