记得上下班打卡 | 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
a3d8ce9a
Commit
a3d8ce9a
authored
Sep 23, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt;
parent
662941a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
PlatformCandyDemoteController.java
...tform/controller/candy/PlatformCandyDemoteController.java
+21
-10
PlatformCandyUserCouponService.java
...rm/service/impl/candy/PlatformCandyUserCouponService.java
+3
-0
No files found.
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/PlatformCandyDemoteController.java
View file @
a3d8ce9a
package
com
.
liquidnet
.
service
.
platform
.
controller
.
candy
;
package
com
.
liquidnet
.
service
.
platform
.
controller
.
candy
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.github.xiaoymin.knife4j.annotations.ApiOperationSupport
;
import
com.liquidnet.commons.lang.
util.CurrentUtil
;
import
com.liquidnet.commons.lang.
constant.LnsRegex
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto
;
import
com.liquidnet.service.candy.dto.CandyCommonCouponBasicDto
;
...
@@ -10,16 +10,18 @@ import com.liquidnet.service.platform.service.impl.candy.PlatformCandyUserCoupon
...
@@ -10,16 +10,18 @@ import com.liquidnet.service.platform.service.impl.candy.PlatformCandyUserCoupon
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
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.
Pos
tMapping
;
import
org.springframework.web.bind.annotation.
Ge
tMapping
;
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.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
java.util.List
;
import
java.util.regex.Pattern
;
@Api
(
tags
=
"券
系统
-数据降级查询"
)
@Api
(
tags
=
"券
列表
-数据降级查询"
)
@Slf4j
@Slf4j
@RestController
@RestController
@RequestMapping
(
"cdemote"
)
@RequestMapping
(
"cdemote"
)
...
@@ -28,18 +30,27 @@ public class PlatformCandyDemoteController {
...
@@ -28,18 +30,27 @@ public class PlatformCandyDemoteController {
private
PlatformCandyUserCouponService
platformCandyUserCouponService
;
private
PlatformCandyUserCouponService
platformCandyUserCouponService
;
@ApiOperationSupport
(
order
=
1
)
@ApiOperationSupport
(
order
=
1
)
@ApiOperation
(
value
=
"
用户
私有券"
)
@ApiOperation
(
value
=
"私有券"
)
@
Pos
tMapping
(
"ucoupon"
)
@
Ge
tMapping
(
"ucoupon"
)
public
ResponseDto
<
List
<
CandyUserCouponBasicDto
>>
queryForUserCouponBasicDto
(
@RequestParam
String
currentUid
)
{
public
ResponseDto
<
List
<
CandyUserCouponBasicDto
>>
queryForUserCouponBasicDto
(
@RequestParam
String
currentUid
)
{
return
ResponseDto
.
success
(
platformCandyUserCouponService
.
ucouponBasicDtoByUidProcessing
(
currentUid
));
List
<
CandyUserCouponBasicDto
>
basicDtoList
=
null
;
if
(
StringUtils
.
isNotBlank
(
currentUid
))
{
basicDtoList
=
platformCandyUserCouponService
.
ucouponBasicDtoByUidProcessing
(
currentUid
);
}
return
ResponseDto
.
success
(
basicDtoList
);
}
}
@ApiOperationSupport
(
order
=
2
)
@ApiOperationSupport
(
order
=
2
)
@ApiOperation
(
value
=
"
用户
公有券"
)
@ApiOperation
(
value
=
"公有券"
)
@
Pos
tMapping
(
"ccoupon"
)
@
Ge
tMapping
(
"ccoupon"
)
public
ResponseDto
<
List
<
CandyCommonCouponBasicDto
>>
queryForCommonCouponBasicDto
(
@RequestParam
String
ucreatedAtStr
)
{
public
ResponseDto
<
List
<
CandyCommonCouponBasicDto
>>
queryForCommonCouponBasicDto
(
@RequestParam
String
ucreatedAtStr
)
{
LocalDateTime
ucreatedAt
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
ucreatedAtStr
);
List
<
CandyCommonCouponBasicDto
>
basicDtoList
=
null
;
return
ResponseDto
.
success
(
platformCandyUserCouponService
.
ccouponBasicDtoByUidProcessing
(
ucreatedAt
));
if
(
StringUtils
.
isNotBlank
(
ucreatedAtStr
)
&&
Pattern
.
matches
(
LnsRegex
.
Valid
.
DATETIME_FULL
,
ucreatedAtStr
))
{
LocalDateTime
ucreatedAt
=
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
ucreatedAtStr
);
basicDtoList
=
platformCandyUserCouponService
.
ccouponBasicDtoByUidProcessing
(
ucreatedAt
);
}
return
ResponseDto
.
success
(
basicDtoList
);
}
}
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java
View file @
a3d8ce9a
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy;
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.service.adam.constant.AdamRedisConst
;
import
com.liquidnet.service.base.OrderCloseMapping
;
import
com.liquidnet.service.base.OrderCloseMapping
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.base.constant.MQConst
;
import
com.liquidnet.service.candy.constant.CandyRedisConst
;
import
com.liquidnet.service.candy.constant.CandyRedisConst
;
...
@@ -69,6 +70,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
...
@@ -69,6 +70,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
}
}
public
List
<
CandyUserCouponBasicDto
>
ucouponBasicDtoByUidProcessing
(
String
uid
)
{
public
List
<
CandyUserCouponBasicDto
>
ucouponBasicDtoByUidProcessing
(
String
uid
)
{
if
(
null
==
redisUtil
.
get
(
AdamRedisConst
.
INFO_USER
.
concat
(
uid
)))
return
null
;
List
<
CandyUserCouponBasicDto
>
basicDtoList
=
candyUserCouponMapper
.
selectMultiForUserCouponBasicDto
(
uid
);
List
<
CandyUserCouponBasicDto
>
basicDtoList
=
candyUserCouponMapper
.
selectMultiForUserCouponBasicDto
(
uid
);
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
if
(!
CollectionUtils
.
isEmpty
(
basicDtoList
))
{
List
<
String
>
couponIdList
=
basicDtoList
.
parallelStream
().
map
(
CandyUserCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
List
<
String
>
couponIdList
=
basicDtoList
.
parallelStream
().
map
(
CandyUserCouponBasicDto:
:
getCouponId
).
collect
(
Collectors
.
toList
());
...
...
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