记得上下班打卡 | 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
930fd01f
Commit
930fd01f
authored
Jul 21, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt;
parent
047e7660
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
9 deletions
+15
-9
CollectionUtil.java
.../java/com/liquidnet/commons/lang/util/CollectionUtil.java
+7
-0
AdamAddressesServiceImpl.java
...t/service/adam/service/impl/AdamAddressesServiceImpl.java
+2
-5
AdamCollectionServiceImpl.java
.../service/adam/service/impl/AdamCollectionServiceImpl.java
+2
-1
AdamDisposedServiceImpl.java
...et/service/adam/service/impl/AdamDisposedServiceImpl.java
+2
-1
AdamEntersServiceImpl.java
...dnet/service/adam/service/impl/AdamEntersServiceImpl.java
+1
-1
AdamMemberOrderServiceImpl.java
...service/adam/service/impl/AdamMemberOrderServiceImpl.java
+1
-1
No files found.
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java
View file @
930fd01f
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
*/
*/
package
com
.
liquidnet
.
commons
.
lang
.
util
;
package
com
.
liquidnet
.
commons
.
lang
.
util
;
import
org.springframework.util.LinkedMultiValueMap
;
import
java.util.*
;
import
java.util.*
;
import
java.util.function.Predicate
;
import
java.util.function.Predicate
;
...
@@ -16,6 +18,7 @@ public class CollectionUtil {
...
@@ -16,6 +18,7 @@ public class CollectionUtil {
private
static
final
HashMap
<
String
,
Object
>
STRING_OBJECT_HASH_MAP
=
new
HashMap
<>();
private
static
final
HashMap
<
String
,
Object
>
STRING_OBJECT_HASH_MAP
=
new
HashMap
<>();
private
static
final
LinkedList
<
String
>
STRING_LINKED_LIST
=
new
LinkedList
<>();
private
static
final
LinkedList
<
String
>
STRING_LINKED_LIST
=
new
LinkedList
<>();
private
static
final
LinkedList
<
Object
[]>
OBJECTS_LINKED_LIST
=
new
LinkedList
<>();
private
static
final
LinkedList
<
Object
[]>
OBJECTS_LINKED_LIST
=
new
LinkedList
<>();
private
static
final
LinkedMultiValueMap
<
String
,
String
>
STRING_STRING_LINKED_MULTI_VALUE_MAP
=
new
LinkedMultiValueMap
<>();
private
static
final
ArrayList
<
Object
>
OBJECT_ARRAY_LIST
=
new
ArrayList
<>();
private
static
final
ArrayList
<
Object
>
OBJECT_ARRAY_LIST
=
new
ArrayList
<>();
...
@@ -35,6 +38,10 @@ public class CollectionUtil {
...
@@ -35,6 +38,10 @@ public class CollectionUtil {
return
(
LinkedList
<
Object
[]>)
OBJECTS_LINKED_LIST
.
clone
();
return
(
LinkedList
<
Object
[]>)
OBJECTS_LINKED_LIST
.
clone
();
}
}
public
static
LinkedMultiValueMap
<
String
,
String
>
linkedMultiValueMapStringString
()
{
return
(
LinkedMultiValueMap
<
String
,
String
>)
STRING_STRING_LINKED_MULTI_VALUE_MAP
.
clone
();
}
public
static
ArrayList
<
Object
>
arrayListObject
()
{
public
static
ArrayList
<
Object
>
arrayListObject
()
{
return
(
ArrayList
<
Object
>)
OBJECT_ARRAY_LIST
.
clone
();
return
(
ArrayList
<
Object
>)
OBJECT_ARRAY_LIST
.
clone
();
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @
930fd01f
...
@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.service.impl;
...
@@ -3,10 +3,7 @@ package com.liquidnet.service.adam.service.impl;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.common.exception.LiquidnetServiceException
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.commons.lang.util.BsonUtil
;
import
com.liquidnet.commons.lang.util.*
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.commons.lang.util.IDGenerator
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.adam.dto.AdamAddressesParam
;
import
com.liquidnet.service.adam.dto.AdamAddressesParam
;
import
com.liquidnet.service.adam.dto.vo.AdamAddressesVo
;
import
com.liquidnet.service.adam.dto.vo.AdamAddressesVo
;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
import
com.liquidnet.service.adam.entity.AdamAddresses
;
...
@@ -91,7 +88,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
...
@@ -91,7 +88,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
public
void
def
(
String
uid
,
String
addressesId
)
{
public
void
def
(
String
uid
,
String
addressesId
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
LinkedList
<
Object
[]>
toMqObjs
=
new
LinkedList
<>
();
LinkedList
<
Object
[]>
toMqObjs
=
CollectionUtil
.
linkedListObjectArr
();
List
<
AdamAddressesVo
>
vos
=
adamRdmService
.
getAddressesVoByUid
(
uid
);
List
<
AdamAddressesVo
>
vos
=
adamRdmService
.
getAddressesVoByUid
(
uid
);
if
(
vos
.
size
()
>
1
)
{
// 取消原默认
if
(
vos
.
size
()
>
1
)
{
// 取消原默认
// AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
// AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @
930fd01f
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.impl;
...
@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.impl;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
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.AdamCollectInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectVo
;
...
@@ -77,7 +78,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
...
@@ -77,7 +78,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
AdamCollectBaseVo
.
class
.
getSimpleName
()
AdamCollectBaseVo
.
class
.
getSimpleName
()
);
);
if
(
deleteResult
.
getDeletedCount
()
>
0
)
{
if
(
deleteResult
.
getDeletedCount
()
>
0
)
{
LinkedList
<
Object
[]>
toMqObjs
=
new
LinkedList
<>
();
LinkedList
<
Object
[]>
toMqObjs
=
CollectionUtil
.
linkedListObjectArr
();
for
(
String
c
:
contentIds
)
{
for
(
String
c
:
contentIds
)
{
toMqObjs
.
add
(
new
Object
[]{
now
,
uid
,
c
});
toMqObjs
.
add
(
new
Object
[]{
now
,
uid
,
c
});
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @
930fd01f
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl;
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.impl;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.github.pagehelper.PageInfo
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.common.mq.constant.MQConst
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo
;
import
com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo
;
...
@@ -85,7 +86,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
...
@@ -85,7 +86,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
AdamDisposedBaseVo
.
class
.
getSimpleName
()
AdamDisposedBaseVo
.
class
.
getSimpleName
()
);
);
if
(
deleteResult
.
getDeletedCount
()
>
0
)
{
if
(
deleteResult
.
getDeletedCount
()
>
0
)
{
LinkedList
<
Object
[]>
toMqObjs
=
new
LinkedList
<>
();
LinkedList
<
Object
[]>
toMqObjs
=
CollectionUtil
.
linkedListObjectArr
();
for
(
String
c
:
contentIds
)
{
for
(
String
c
:
contentIds
)
{
toMqObjs
.
add
(
new
Object
[]{
now
,
uid
,
c
});
toMqObjs
.
add
(
new
Object
[]{
now
,
uid
,
c
});
}
}
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @
930fd01f
...
@@ -110,7 +110,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
...
@@ -110,7 +110,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
public
void
def
(
String
uid
,
String
entersId
)
{
public
void
def
(
String
uid
,
String
entersId
)
{
LocalDateTime
now
=
LocalDateTime
.
now
();
LocalDateTime
now
=
LocalDateTime
.
now
();
LinkedList
<
Object
[]>
toMqObjs
=
new
LinkedList
<>
();
LinkedList
<
Object
[]>
toMqObjs
=
CollectionUtil
.
linkedListObjectArr
();
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUid
(
uid
);
List
<
AdamEntersVo
>
vos
=
adamRdmService
.
getEntersVoByUid
(
uid
);
if
(
vos
.
size
()
>
1
)
{
// 取消原默认
if
(
vos
.
size
()
>
1
)
{
// 取消原默认
// AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
// AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @
930fd01f
...
@@ -69,7 +69,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
...
@@ -69,7 +69,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
String
clientIp
=
CurrentUtil
.
getCliIpAddr
();
String
clientIp
=
CurrentUtil
.
getCliIpAddr
();
// 调取对应支付接口
// 调取对应支付接口
LinkedMultiValueMap
<
String
,
String
>
payParam
=
new
LinkedMultiValueMap
<>
();
LinkedMultiValueMap
<
String
,
String
>
payParam
=
CollectionUtil
.
linkedMultiValueMapStringString
();
payParam
.
add
(
"type"
,
"VIP"
);
// TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB
payParam
.
add
(
"type"
,
"VIP"
);
// TICKET,PRODUCT,COST,MBEANS,LIVE,VIDEO,VIP,CLUB
payParam
.
add
(
"price"
,
String
.
valueOf
(
memberPriceVo
.
getPrice
()));
payParam
.
add
(
"price"
,
String
.
valueOf
(
memberPriceVo
.
getPrice
()));
payParam
.
add
(
"name"
,
memberVo
.
getName
());
payParam
.
add
(
"name"
,
memberVo
.
getName
());
...
...
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