记得上下班打卡 | 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
b294f49d
Commit
b294f49d
authored
Sep 03, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+API:我的会员权益券统计;
parent
5534807d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
80 additions
and
2 deletions
+80
-2
ICandyCouponService.java
.../liquidnet/service/candy/service/ICandyCouponService.java
+3
-0
CandyCouponPreVo.java
...java/com/liquidnet/service/candy/vo/CandyCouponPreVo.java
+43
-0
CandyCouponController.java
...idnet/service/candy/controller/CandyCouponController.java
+10
-1
CandyCouponServiceImpl.java
...et/service/candy/service/impl/CandyCouponServiceImpl.java
+17
-0
ObjectUtil.java
...ain/java/com/liquidnet/service/candy/util/ObjectUtil.java
+6
-0
ObjectUtil.java
...java/com/liquidnet/service/platform/utils/ObjectUtil.java
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/service/ICandyCouponService.java
View file @
b294f49d
...
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.candy.entity.CandyCoupon
;
import
com.liquidnet.service.candy.param.BackCouponParam
;
import
com.liquidnet.service.candy.vo.CandyCouponPreVo
;
import
com.liquidnet.service.candy.vo.CandyCouponVo
;
import
com.liquidnet.service.candy.vo.CandyMyCouponListVo
;
import
com.liquidnet.service.candy.vo.CandyUseResultVo
;
...
...
@@ -23,6 +24,8 @@ public interface ICandyCouponService {
CandyMyCouponListVo
myCoupon
(
Integer
type
);
List
<
CandyCouponPreVo
>
memberCouponPre
(
String
uid
);
List
<
CandyCouponVo
>
memberCoupon
(
String
mCouponId
);
CandyMyCouponListVo
preUsePerformanceCoupon
(
BigDecimal
priceTotal
,
String
performanceId
,
String
timeId
,
String
ticketId
,
Integer
type
);
...
...
liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/vo/CandyCouponPreVo.java
0 → 100644
View file @
b294f49d
package
com
.
liquidnet
.
service
.
candy
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.io.Serializable
;
@ApiModel
(
value
=
"CandyCouponPreVo"
,
description
=
"会员权益券统计"
)
public
class
CandyCouponPreVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
3741851732227825227L
;
@ApiModelProperty
(
value
=
"权益ID"
,
example
=
"权益ID"
)
private
String
mcouponId
;
@ApiModelProperty
(
value
=
"当前可用券数量"
,
example
=
"6"
)
private
Long
availableCt
;
public
String
getMcouponId
()
{
return
mcouponId
;
}
public
CandyCouponPreVo
setMcouponId
(
String
mcouponId
)
{
this
.
mcouponId
=
mcouponId
;
return
this
;
}
public
Long
getAvailableCt
()
{
return
availableCt
;
}
public
CandyCouponPreVo
setAvailableCt
(
Long
availableCt
)
{
this
.
availableCt
=
availableCt
;
return
this
;
}
private
static
final
CandyCouponPreVo
obj
=
new
CandyCouponPreVo
();
public
static
CandyCouponPreVo
getNew
()
{
try
{
return
(
CandyCouponPreVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
CandyCouponPreVo
();
}
}
}
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java
View file @
b294f49d
...
...
@@ -2,9 +2,11 @@ package com.liquidnet.service.candy.controller;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.candy.param.BackCouponParam
;
import
com.liquidnet.service.candy.service.ICandyCouponService
;
import
com.liquidnet.service.candy.vo.CandyCouponPreVo
;
import
com.liquidnet.service.candy.vo.CandyCouponVo
;
import
com.liquidnet.service.candy.vo.CandyMyCouponListVo
;
import
com.liquidnet.service.candy.vo.CandyUseResultVo
;
...
...
@@ -50,7 +52,14 @@ public class CandyCouponController {
return
ResponseDto
.
success
(
candyCouponService
.
myCoupon
(
type
));
}
//我的券列表
//我的会员权益券统计
@GetMapping
(
"member-pre"
)
@ApiOperation
(
"会员权益券统计"
)
public
ResponseDto
<
List
<
CandyCouponPreVo
>>
myCouponPre
()
{
return
ResponseDto
.
success
(
candyCouponService
.
memberCouponPre
(
CurrentUtil
.
getCurrentUid
()));
}
//我的会员权益券列表
@GetMapping
(
"member"
)
@ApiOperation
(
"会员权益券列表"
)
@ApiImplicitParams
({
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java
View file @
b294f49d
...
...
@@ -16,6 +16,7 @@ import com.liquidnet.service.candy.util.CouponBaseUtil;
import
com.liquidnet.service.candy.util.ObjectUtil
;
import
com.liquidnet.service.candy.util.QueueUtils
;
import
com.liquidnet.service.candy.util.RedisDataUtils
;
import
com.liquidnet.service.candy.vo.CandyCouponPreVo
;
import
com.liquidnet.service.candy.vo.CandyCouponVo
;
import
com.liquidnet.service.candy.vo.CandyMyCouponListVo
;
import
com.liquidnet.service.candy.vo.CandyUseResultVo
;
...
...
@@ -25,6 +26,7 @@ import org.springframework.stereotype.Service;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* <p>
...
...
@@ -75,6 +77,21 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
return
vo
;
}
@Override
public
List
<
CandyCouponPreVo
>
memberCouponPre
(
String
uid
)
{
ArrayList
<
CandyCouponPreVo
>
voArrayList
=
ObjectUtil
.
getCandyCouponPreVoArrayList
();
List
<
CandyUserCouponBasicDto
>
dtoList
=
redisDataUtils
.
getCouponByUid
(
uid
);
if
(!
CollectionUtil
.
isEmpty
(
dtoList
))
{
Map
<
String
,
Long
>
mCouponCountMap
=
dtoList
.
parallelStream
()
.
filter
(
r
->
(
r
.
getExclusive
()
==
1
&&
r
.
getState
()
==
1
))
.
collect
(
Collectors
.
groupingBy
(
CandyUserCouponBasicDto:
:
getMcouponId
,
Collectors
.
counting
()));
mCouponCountMap
.
forEach
((
mCouponId
,
ct
)
->
voArrayList
.
add
(
CandyCouponPreVo
.
getNew
().
setMcouponId
(
mCouponId
).
setAvailableCt
(
ct
)));
}
return
voArrayList
;
}
@Override
public
List
<
CandyCouponVo
>
memberCoupon
(
String
mCouponId
)
{
String
uid
=
CurrentUtil
.
getCurrentUid
();
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/ObjectUtil.java
View file @
b294f49d
package
com
.
liquidnet
.
service
.
candy
.
util
;
import
com.liquidnet.service.candy.vo.CandyCouponPreVo
;
import
com.liquidnet.service.candy.vo.CandyCouponRulesVo
;
import
com.liquidnet.service.candy.vo.CandyCouponVo
;
...
...
@@ -7,12 +8,17 @@ import java.util.ArrayList;
public
class
ObjectUtil
{
private
static
final
ArrayList
<
CandyCouponVo
>
candyCouponVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
CandyCouponPreVo
>
candyCouponPreVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
CandyCouponRulesVo
>
candyCouponRulesVos
=
new
ArrayList
<>();
public
static
ArrayList
<
CandyCouponVo
>
getCandyCouponVoArrayList
()
{
return
(
ArrayList
<
CandyCouponVo
>)
candyCouponVoArrayList
.
clone
();
}
public
static
ArrayList
<
CandyCouponPreVo
>
getCandyCouponPreVoArrayList
()
{
return
(
ArrayList
<
CandyCouponPreVo
>)
candyCouponPreVoArrayList
.
clone
();
}
public
static
ArrayList
<
CandyCouponRulesVo
>
getCandyCouponRulesVos
()
{
return
(
ArrayList
<
CandyCouponRulesVo
>)
candyCouponRulesVos
.
clone
();
}
...
...
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java
View file @
b294f49d
...
...
@@ -95,7 +95,7 @@ public class ObjectUtil {
}
public
static
ArrayList
<
CandyUserCoupon
>
getCandyUserCouponArrayList
()
{
return
candyUserCouponArrayList
;
return
(
ArrayList
<
CandyUserCoupon
>)
candyUserCouponArrayList
.
clone
()
;
}
public
static
PagedResult
<
AdamCollectVo
>
getAdamCollectVoPagedResult
()
{
...
...
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