记得上下班打卡 | 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
d2ea3b95
Commit
d2ea3b95
authored
May 24, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+脱敏工具类;
+feign api:查询指定uid的指定入场人、收货地址; +content info vo;
parent
dacf8885
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
234 additions
and
35 deletions
+234
-35
SensitizeUtil.java
...n/java/com/liquidnet/commons/lang/util/SensitizeUtil.java
+63
-0
FeignAdamBaseClient.java
...liquidnet/service/feign/adam/api/FeignAdamBaseClient.java
+26
-0
FeignAdamLoginClient.java
...iquidnet/service/feign/adam/api/FeignAdamLoginClient.java
+1
-1
AdamAddressesVo.java
...va/com/liquidnet/service/adam/dto/vo/AdamAddressesVo.java
+2
-1
AdamCollectBaseVo.java
.../com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java
+0
-3
AdamCollectInfoVo.java
.../com/liquidnet/service/adam/dto/vo/AdamCollectInfoVo.java
+92
-0
AdamCollectVo.java
...java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java
+1
-2
AdamDisposedBaseVo.java
...com/liquidnet/service/adam/dto/vo/AdamDisposedBaseVo.java
+0
-3
AdamDisposedVo.java
...ava/com/liquidnet/service/adam/dto/vo/AdamDisposedVo.java
+1
-2
AdamEntersVo.java
.../java/com/liquidnet/service/adam/dto/vo/AdamEntersVo.java
+4
-3
pom.xml
...iquidnet-service-adam/liquidnet-service-adam-impl/pom.xml
+7
-0
AdamAddressesController.java
...dnet/service/adam/controller/AdamAddressesController.java
+4
-2
AdamEntersController.java
...quidnet/service/adam/controller/AdamEntersController.java
+5
-3
AdamAddressesServiceImpl.java
...t/service/adam/service/impl/AdamAddressesServiceImpl.java
+5
-1
AdamCollectionServiceImpl.java
.../service/adam/service/impl/AdamCollectionServiceImpl.java
+5
-1
AdamDisposedServiceImpl.java
...et/service/adam/service/impl/AdamDisposedServiceImpl.java
+7
-5
AdamEntersServiceImpl.java
...dnet/service/adam/service/impl/AdamEntersServiceImpl.java
+3
-2
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+1
-0
pom.xml
liquidnet-bus-service/liquidnet-service-adam/pom.xml
+0
-6
pom.xml
...uidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
+7
-0
No files found.
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/SensitizeUtil.java
0 → 100644
View file @
d2ea3b95
package
com
.
liquidnet
.
commons
.
lang
.
util
;
import
org.apache.commons.lang3.StringUtils
;
public
class
SensitizeUtil
{
/**
* [中文姓名] 只显示第一个汉字,其他隐藏为星号
*
* @param userName 姓名
* @return 张**
*/
public
static
String
chineseName
(
String
userName
)
{
if
(
StringUtils
.
isBlank
(
userName
))
{
return
""
;
}
return
StringUtils
.
rightPad
(
StringUtils
.
left
(
userName
,
StringUtils
.
length
(
userName
)
>
3
?
2
:
1
),
StringUtils
.
length
(
userName
),
"*"
);
}
/**
* [自定义]隐藏处理,前面保留`index`位明文,后面保留`end`位明文
*
* @param str 待处理字符串
* @param index 前面保留N位
* @param end 后面保留N位
* @return ???****???
*/
public
static
String
custom
(
String
str
,
int
index
,
int
end
)
{
if
(
StringUtils
.
isBlank
(
str
))
{
return
""
;
}
return
StringUtils
.
left
(
str
,
index
).
concat
(
StringUtils
.
removeStart
(
StringUtils
.
leftPad
(
StringUtils
.
right
(
str
,
end
),
StringUtils
.
length
(
str
),
"*"
),
"***"
)
);
}
/**
* [电子邮箱] 邮箱前缀隐藏,用星号代替,@及后面的地址显示
*
* @param email 邮箱地址
* @return ?*****@163.com
*/
public
static
String
email
(
String
email
)
{
if
(
StringUtils
.
isBlank
(
email
))
{
return
""
;
}
int
index
=
StringUtils
.
indexOf
(
email
,
"@"
);
if
(
index
<=
1
)
{
return
email
;
}
else
{
return
StringUtils
.
rightPad
(
StringUtils
.
left
(
email
,
1
),
6
,
"*"
).
concat
(
StringUtils
.
mid
(
email
,
index
,
StringUtils
.
length
(
email
))
);
}
}
}
liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamBaseClient.java
0 → 100644
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
feign
.
adam
.
api
;
import
com.liquidnet.service.adam.dto.vo.AdamAddressesVo
;
import
com.liquidnet.service.adam.dto.vo.AdamEntersVo
;
import
com.liquidnet.service.base.ResponseDto
;
import
feign.hystrix.FallbackFactory
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
@Component
@FeignClient
(
name
=
"liquidnet-service-adam"
,
contextId
=
"FeignAdamBaseClient"
,
path
=
""
,
fallback
=
FallbackFactory
.
Default
.
class
)
public
interface
FeignAdamBaseClient
{
@PostMapping
(
"enters/query/{id}"
)
ResponseDto
<
AdamEntersVo
>
queryEnters
(
@PathVariable
(
name
=
"id"
)
String
entersId
,
@RequestParam
(
name
=
"uid"
,
required
=
false
)
String
uid
);
@PostMapping
(
"addr/query/{id}"
)
ResponseDto
<
AdamAddressesVo
>
queryAddresses
(
@PathVariable
(
name
=
"id"
)
String
addrId
,
@RequestParam
(
name
=
"uid"
,
required
=
false
)
String
uid
);
}
liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-adam/src/main/java/com/liquidnet/service/feign/adam/api/FeignAdamLoginClient.java
View file @
d2ea3b95
...
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
...
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
@Component
@Component
@FeignClient
(
name
=
"liquidnet-service-adam"
,
@FeignClient
(
name
=
"liquidnet-service-adam"
,
contextId
=
""
,
path
=
""
,
contextId
=
"
FeignAdamLoginClient
"
,
path
=
""
,
fallback
=
FallbackFactory
.
Default
.
class
)
fallback
=
FallbackFactory
.
Default
.
class
)
public
interface
FeignAdamLoginClient
{
public
interface
FeignAdamLoginClient
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamAddressesVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.commons.lang.util.SensitizeUtil
;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -41,7 +42,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
...
@@ -41,7 +42,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
if
(
null
==
source
)
return
this
;
if
(
null
==
source
)
return
this
;
this
.
setAddressesId
(
source
.
getAddressesId
());
this
.
setAddressesId
(
source
.
getAddressesId
());
this
.
setName
(
source
.
getName
());
this
.
setName
(
source
.
getName
());
this
.
setPhone
(
source
.
getPhone
(
));
this
.
setPhone
(
SensitizeUtil
.
custom
(
source
.
getPhone
(),
3
,
4
));
this
.
setProvince
(
source
.
getProvince
());
this
.
setProvince
(
source
.
getProvince
());
this
.
setCity
(
source
.
getCity
());
this
.
setCity
(
source
.
getCity
());
this
.
setCounty
(
source
.
getCounty
());
this
.
setCounty
(
source
.
getCounty
());
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -29,8 +28,6 @@ public class AdamCollectBaseVo implements Serializable, Cloneable {
...
@@ -29,8 +28,6 @@ public class AdamCollectBaseVo implements Serializable, Cloneable {
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
position
=
18
,
value
=
"更新时间"
)
@ApiModelProperty
(
position
=
18
,
value
=
"更新时间"
)
private
String
updatedAt
;
private
String
updatedAt
;
@ApiModelProperty
(
position
=
19
,
value
=
"展示信息"
)
private
KylinPerformanceVo
contentInfo
;
private
static
final
AdamCollectBaseVo
obj
=
new
AdamCollectBaseVo
();
private
static
final
AdamCollectBaseVo
obj
=
new
AdamCollectBaseVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectInfoVo.java
0 → 100644
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
@ApiModel
(
value
=
"AdamCollectInfoVo"
,
description
=
"演出详情"
)
@Data
public
class
AdamCollectInfoVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
5217696983635918221L
;
@ApiModelProperty
(
value
=
"主键"
)
private
String
performancesId
;
@ApiModelProperty
(
value
=
"演出名称"
)
private
String
title
;
@ApiModelProperty
(
value
=
"演出图片"
)
private
String
imgPoster
;
@ApiModelProperty
(
value
=
"101音乐节 102小型演出(livehouse演出) 103巡演"
)
// @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private
int
type
;
@ApiModelProperty
(
value
=
"演出开始时间"
)
private
String
timeStart
;
@ApiModelProperty
(
value
=
"演出结束时间"
)
private
String
timeEnd
;
@ApiModelProperty
(
value
=
"停售时间"
)
private
String
stopSellTime
;
@ApiModelProperty
(
value
=
"价格"
)
private
String
price
;
@ApiModelProperty
(
value
=
"开售时间"
)
private
String
sellTime
;
@ApiModelProperty
(
value
=
"城市id"
)
private
Integer
cityId
;
@ApiModelProperty
(
value
=
"城市名称"
)
private
String
cityName
;
@ApiModelProperty
(
value
=
"场地id"
)
private
String
fieldId
;
@ApiModelProperty
(
value
=
"场地名称"
)
private
String
fieldName
;
@ApiModelProperty
(
value
=
"经度"
)
private
String
longitude
;
@ApiModelProperty
(
value
=
"纬度"
)
private
String
latitude
;
@ApiModelProperty
(
value
=
"场地距离当前位置距离"
)
private
String
diffDistance
;
@ApiModelProperty
(
value
=
"搭售id"
)
private
String
projectId
;
@ApiModelProperty
(
value
=
"巡演id"
)
private
String
roadShowId
;
// OSS
@ApiModelProperty
(
value
=
"演出详情"
)
private
String
details
;
// OSS
@ApiModelProperty
(
value
=
"购票须知"
)
private
String
noticeImage
;
@ApiModelProperty
(
value
=
"推荐顺序 0为不推荐"
)
private
Integer
isRecommend
;
@ApiModelProperty
(
value
=
"状态"
)
private
Integer
appStatus
;
@ApiModelProperty
(
value
=
"是否可买"
)
private
Integer
statusSell
;
@ApiModelProperty
(
value
=
"是否关联会员"
)
private
Integer
isMember
;
@ApiModelProperty
(
value
=
"是否开启缺票登记"
)
private
Integer
isLackRegister
;
@ApiModelProperty
(
value
=
"是否实名"
)
private
Integer
isTrueName
;
@ApiModelProperty
(
value
=
"限购张数"
)
private
Integer
limitCount
;
@ApiModelProperty
(
value
=
"会员限购张数"
)
private
Integer
limitCountMember
;
@ApiModelProperty
(
value
=
"是否专属"
)
private
Integer
isExclusive
;
@ApiModelProperty
(
value
=
"是否优惠"
)
private
Integer
isDiscount
;
@ApiModelProperty
(
value
=
"是否提前"
)
private
Integer
isAdvance
;
@ApiModelProperty
(
value
=
"文案"
)
private
String
message
;
private
static
final
AdamCollectInfoVo
obj
=
new
AdamCollectInfoVo
();
public
static
AdamCollectInfoVo
getNew
()
{
try
{
return
(
AdamCollectInfoVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
AdamCollectInfoVo
();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -18,7 +17,7 @@ public class AdamCollectVo implements Serializable, Cloneable {
...
@@ -18,7 +17,7 @@ public class AdamCollectVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"收藏时间"
)
@ApiModelProperty
(
position
=
13
,
required
=
true
,
value
=
"收藏时间"
)
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"展示信息"
)
@ApiModelProperty
(
position
=
14
,
required
=
true
,
value
=
"展示信息"
)
private
KylinPerformance
Vo
contentInfo
;
private
AdamCollectInfo
Vo
contentInfo
;
private
static
final
AdamCollectVo
obj
=
new
AdamCollectVo
();
private
static
final
AdamCollectVo
obj
=
new
AdamCollectVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedBaseVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -29,8 +28,6 @@ public class AdamDisposedBaseVo implements Serializable, Cloneable {
...
@@ -29,8 +28,6 @@ public class AdamDisposedBaseVo implements Serializable, Cloneable {
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
position
=
18
,
value
=
"更新时间"
)
@ApiModelProperty
(
position
=
18
,
value
=
"更新时间"
)
private
String
updatedAt
;
private
String
updatedAt
;
@ApiModelProperty
(
position
=
19
,
value
=
"展示信息"
)
private
KylinPerformanceVo
contentInfo
;
private
static
final
AdamDisposedBaseVo
obj
=
new
AdamDisposedBaseVo
();
private
static
final
AdamDisposedBaseVo
obj
=
new
AdamDisposedBaseVo
();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -19,7 +18,7 @@ public class AdamDisposedVo implements Serializable, Cloneable {
...
@@ -19,7 +18,7 @@ public class AdamDisposedVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
13
,
value
=
"标记时间"
)
@ApiModelProperty
(
position
=
13
,
value
=
"标记时间"
)
private
String
createdAt
;
private
String
createdAt
;
@ApiModelProperty
(
position
=
14
,
value
=
"展示信息"
)
@ApiModelProperty
(
position
=
14
,
value
=
"展示信息"
)
private
KylinPerformance
Vo
contentInfo
;
private
AdamCollectInfo
Vo
contentInfo
;
@ApiModelProperty
(
position
=
15
,
value
=
"想去的用户信息列表,默认三个"
)
@ApiModelProperty
(
position
=
15
,
value
=
"想去的用户信息列表,默认三个"
)
private
List
<
AdamDisposedUserVo
>
userVos
;
private
List
<
AdamDisposedUserVo
>
userVos
;
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamEntersVo.java
View file @
d2ea3b95
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
adam
.
dto
.
vo
;
import
com.liquidnet.commons.lang.util.SensitizeUtil
;
import
com.liquidnet.service.adam.entity.AdamEnters
;
import
com.liquidnet.service.adam.entity.AdamEnters
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -36,9 +37,9 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
...
@@ -36,9 +37,9 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
public
AdamEntersVo
copy
(
AdamEnters
source
)
{
public
AdamEntersVo
copy
(
AdamEnters
source
)
{
if
(
null
==
source
)
return
this
;
if
(
null
==
source
)
return
this
;
this
.
setEntersId
(
source
.
getEntersId
());
this
.
setEntersId
(
source
.
getEntersId
());
this
.
setName
(
source
.
getName
(
));
this
.
setName
(
SensitizeUtil
.
chineseName
(
source
.
getName
()
));
this
.
setIdCard
(
source
.
getIdCard
(
));
this
.
setIdCard
(
SensitizeUtil
.
custom
(
source
.
getIdCard
(),
3
,
2
));
this
.
setMobile
(
source
.
getMobile
(
));
this
.
setMobile
(
SensitizeUtil
.
custom
(
source
.
getMobile
(),
3
,
4
));
this
.
setType
(
source
.
getType
());
this
.
setType
(
source
.
getType
());
this
.
setIsDefault
(
source
.
getIsDefault
());
this
.
setIsDefault
(
source
.
getIsDefault
());
return
this
;
return
this
;
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/pom.xml
View file @
d2ea3b95
...
@@ -31,6 +31,13 @@
...
@@ -31,6 +31,13 @@
<version>
1.0-SNAPSHOT
</version>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-api-feign-kylin
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<scope>
compile
</scope>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java
View file @
d2ea3b95
...
@@ -13,6 +13,7 @@ import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
...
@@ -13,6 +13,7 @@ import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
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.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -120,10 +121,11 @@ public class AdamAddressesController {
...
@@ -120,10 +121,11 @@ public class AdamAddressesController {
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"收货地址详情"
)
@ApiOperation
(
value
=
"收货地址详情"
)
@PostMapping
(
"query/{id}"
)
@PostMapping
(
"query/{id}"
)
public
ResponseDto
<
AdamAddressesVo
>
query
(
@PathVariable
(
name
=
"id"
)
String
addrId
)
{
public
ResponseDto
<
AdamAddressesVo
>
query
(
@PathVariable
(
name
=
"id"
)
String
addrId
,
@RequestParam
(
name
=
"uid"
,
required
=
false
)
String
uid
)
{
// TODO: 2021/4/28 校验
// TODO: 2021/4/28 校验
AdamAddresses
addresses
=
adamAddressesService
.
query
(
CurrentUtil
.
getCurrentUid
()
,
addrId
);
AdamAddresses
addresses
=
adamAddressesService
.
query
(
StringUtils
.
isBlank
(
uid
)
?
CurrentUtil
.
getCurrentUid
()
:
uid
,
addrId
);
return
null
==
addresses
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
10105
))
:
ResponseDto
.
success
(
AdamAddressesVo
.
getNew
().
copy
(
addresses
));
return
null
==
addresses
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
10105
))
:
ResponseDto
.
success
(
AdamAddressesVo
.
getNew
().
copy
(
addresses
));
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @
d2ea3b95
...
@@ -13,6 +13,7 @@ import com.liquidnet.service.base.ResponseDto;
...
@@ -13,6 +13,7 @@ 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
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -123,10 +124,11 @@ public class AdamEntersController {
...
@@ -123,10 +124,11 @@ public class AdamEntersController {
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"入场人详情"
)
@ApiOperation
(
value
=
"入场人详情"
)
@PostMapping
(
"query/{id}"
)
@PostMapping
(
"query/{id}"
)
public
ResponseDto
<
AdamEntersVo
>
query
(
@PathVariable
(
name
=
"id"
)
String
entersId
)
{
public
ResponseDto
<
AdamEntersVo
>
query
(
@PathVariable
(
name
=
"id"
)
String
entersId
,
@RequestParam
(
name
=
"uid"
,
required
=
false
)
String
uid
)
{
// TODO: 2021/4/28 校验
// TODO: 2021/4/28 校验
AdamEnters
info
=
adamEntersService
.
query
(
CurrentUtil
.
getCurrentUid
()
,
entersId
);
AdamEnters
info
=
adamEntersService
.
query
(
StringUtils
.
isBlank
(
uid
)
?
CurrentUtil
.
getCurrentUid
()
:
uid
,
entersId
);
return
null
==
info
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
10105
))
:
ResponseDto
.
success
(
AdamEntersVo
.
getNew
().
copy
(
info
));
return
null
==
info
?
ResponseDto
.
failure
(
ErrorMapping
.
get
(
10105
))
:
ResponseDto
.
success
(
AdamEntersVo
.
getNew
().
copy
(
info
));
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @
d2ea3b95
...
@@ -86,7 +86,11 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
...
@@ -86,7 +86,11 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
AdamAddresses
info
=
(
AdamAddresses
)
redisUtil
.
hget
(
AdamRedisConst
.
INFO_ADDRESSES
.
concat
(
uid
),
addressesId
);
AdamAddresses
info
=
(
AdamAddresses
)
redisUtil
.
hget
(
AdamRedisConst
.
INFO_ADDRESSES
.
concat
(
uid
),
addressesId
);
if
(
null
==
info
)
{
if
(
null
==
info
)
{
info
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"entersId"
).
is
(
addressesId
)),
AdamAddresses
.
class
,
AdamAddresses
.
class
.
getSimpleName
());
info
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"entersId"
).
is
(
addressesId
).
and
(
"state"
).
is
(
1
).
and
(
"uid"
).
is
(
uid
)
),
AdamAddresses
.
class
,
AdamAddresses
.
class
.
getSimpleName
());
if
(
null
!=
info
)
redisUtil
.
hset
(
AdamRedisConst
.
INFO_ADDRESSES
.
concat
(
uid
),
addressesId
,
info
);
}
}
return
info
;
return
info
;
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @
d2ea3b95
...
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
...
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.entity.AdamCollection
;
import
com.liquidnet.service.adam.entity.AdamCollection
;
...
@@ -18,6 +19,7 @@ import com.mongodb.BasicDBObject;
...
@@ -18,6 +19,7 @@ import com.mongodb.BasicDBObject;
import
com.mongodb.client.result.UpdateResult
;
import
com.mongodb.client.result.UpdateResult
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Pageable
;
...
@@ -127,7 +129,9 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
...
@@ -127,7 +129,9 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
collectVoList
.
forEach
(
v
->
{
collectVoList
.
forEach
(
v
->
{
kylinPerformanceVoList
.
forEach
(
vl
->
{
kylinPerformanceVoList
.
forEach
(
vl
->
{
if
(
vl
.
getPerformancesId
().
equals
(
v
.
getContentId
()))
{
if
(
vl
.
getPerformancesId
().
equals
(
v
.
getContentId
()))
{
v
.
setContentInfo
(
vl
);
AdamCollectInfoVo
collectInfoVo
=
AdamCollectInfoVo
.
getNew
();
BeanUtils
.
copyProperties
(
vl
,
collectInfoVo
);
v
.
setContentInfo
(
collectInfoVo
);
}
}
});
});
});
});
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @
d2ea3b95
...
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo
;
import
com.liquidnet.service.adam.dto.vo.*
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedVo
;
import
com.liquidnet.service.adam.dto.vo.AdamUserInfoVo
;
import
com.liquidnet.service.adam.entity.AdamDisposed
;
import
com.liquidnet.service.adam.entity.AdamDisposed
;
import
com.liquidnet.service.adam.mapper.AdamDisposedMapper
;
import
com.liquidnet.service.adam.mapper.AdamDisposedMapper
;
import
com.liquidnet.service.adam.service.IAdamDisposedService
;
import
com.liquidnet.service.adam.service.IAdamDisposedService
;
...
@@ -18,6 +15,7 @@ import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
...
@@ -18,6 +15,7 @@ import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
import
com.mongodb.BasicDBObject
;
import
com.mongodb.BasicDBObject
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.amqp.rabbit.core.RabbitTemplate
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.data.domain.Sort
;
...
@@ -133,7 +131,11 @@ public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, Ada
...
@@ -133,7 +131,11 @@ public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, Ada
if
(!
CollectionUtils
.
isEmpty
(
kylinPerformanceVoList
))
{
if
(!
CollectionUtils
.
isEmpty
(
kylinPerformanceVoList
))
{
kylinPerformanceVoList
.
forEach
(
pv
->
{
kylinPerformanceVoList
.
forEach
(
pv
->
{
disposedVoList
.
forEach
(
v
->
{
disposedVoList
.
forEach
(
v
->
{
if
(
pv
.
getPerformancesId
().
equals
(
v
.
getContentId
()))
v
.
setContentInfo
(
pv
);
if
(
pv
.
getPerformancesId
().
equals
(
v
.
getContentId
()))
{
AdamCollectInfoVo
collectInfoVo
=
AdamCollectInfoVo
.
getNew
();
BeanUtils
.
copyProperties
(
pv
,
collectInfoVo
);
v
.
setContentInfo
(
collectInfoVo
);
}
PageInfo
<
AdamDisposedUserVo
>
disposedUserVoPageInfo
=
this
.
queryDisposedUsers
(
type
,
v
.
getContentId
(),
1
,
3
);
PageInfo
<
AdamDisposedUserVo
>
disposedUserVoPageInfo
=
this
.
queryDisposedUsers
(
type
,
v
.
getContentId
(),
1
,
3
);
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @
d2ea3b95
...
@@ -100,9 +100,10 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
...
@@ -100,9 +100,10 @@ public class AdamEntersServiceImpl extends ServiceImpl<AdamEntersMapper, AdamEnt
if
(
null
==
info
)
{
if
(
null
==
info
)
{
info
=
mongoTemplate
.
findOne
(
info
=
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"entersId"
).
is
(
entersId
).
and
(
"state"
).
is
(
1
)),
Query
.
query
(
Criteria
.
where
(
"entersId"
).
is
(
entersId
).
and
(
"state"
).
is
(
1
)
.
and
(
"uid"
).
is
(
uid
)
),
AdamEnters
.
class
,
AdamEnters
.
class
.
getSimpleName
());
AdamEnters
.
class
,
AdamEnters
.
class
.
getSimpleName
());
if
(
null
==
info
)
redisUtil
.
hset
(
AdamRedisConst
.
INFO_ENTERS
.
concat
(
uid
),
entersId
,
info
);
if
(
null
!=
info
)
redisUtil
.
hset
(
AdamRedisConst
.
INFO_ENTERS
.
concat
(
uid
),
entersId
,
info
);
}
}
return
info
;
return
info
;
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
d2ea3b95
...
@@ -387,6 +387,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
...
@@ -387,6 +387,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
// todo mq 发送数据到队列中
// todo mq 发送数据到队列中
}
else
{
// 续费
}
else
{
// 续费
// TODO: 2021/5/24 延期或存续
String
currentExpiryAt
=
userMemberInfo
.
getExpiryAt
();
String
currentExpiryAt
=
userMemberInfo
.
getExpiryAt
();
Calendar
calendar
=
Calendar
.
getInstance
();
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTime
(
DateUtil
.
parse
(
currentExpiryAt
,
"yyyy-MM-dd HH:mm:ss"
));
calendar
.
setTime
(
DateUtil
.
parse
(
currentExpiryAt
,
"yyyy-MM-dd HH:mm:ss"
));
...
...
liquidnet-bus-service/liquidnet-service-adam/pom.xml
View file @
d2ea3b95
...
@@ -34,12 +34,6 @@
...
@@ -34,12 +34,6 @@
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-mail
</artifactId>
<artifactId>
spring-boot-starter-mail
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-api-feign-kylin
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
</dependencies>
</dependencies>
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml
View file @
d2ea3b95
...
@@ -36,6 +36,13 @@
...
@@ -36,6 +36,13 @@
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
<artifactId>
spring-boot-starter-data-mongodb
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.liquidnet
</groupId>
<artifactId>
liquidnet-api-feign-adam
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
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