Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
8ca59d6d
Commit
8ca59d6d
authored
Nov 07, 2020
by
unset
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-tiande-member' into dev-tiande
parents
2fe24821
5416721d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
29 deletions
+45
-29
BaseUserMemberBiz.java
.../github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
+10
-1
MemberShareRecordBiz.java
...thub/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java
+35
-27
BaseOrderBiz.java
...c/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
+0
-1
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java
View file @
8ca59d6d
...
@@ -398,8 +398,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
...
@@ -398,8 +398,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
return
currentLevel
.
getLevel
();
return
currentLevel
.
getLevel
();
}
}
}
}
Example
example
=
new
Example
(
BaseUserMemberLevel
.
class
);
example
.
createCriteria
().
andEqualTo
(
"isdel"
,
0
).
andEqualTo
(
"isShare"
,
1
);
example
.
orderBy
(
"level"
);
List
<
BaseUserMemberLevel
>
baseUserMemberLevelList
=
BaseUserMemberLevelMapper
.
selectByExample
(
example
);
//如果当前等级小于等于第一个分成等级的低一等级, 则直接查询大于等于第一个分成等级的低一等级的下级用户数量, 否则直接取当前等级的低一级会员数量
Integer
queryLevel
=
level
-
1
;
if
(
level
<=
(
baseUserMemberLevelList
.
get
(
0
).
getLevel
()
-
1
))
{
queryLevel
=
baseUserMemberLevelList
.
get
(
0
).
getLevel
()
-
1
;
}
//需要分成,则查询当前用户的下级是否符合条件,符合条件level+1
//需要分成,则查询当前用户的下级是否符合条件,符合条件level+1
List
<
BaseUserMember
>
baseUserMemberList
=
mapper
.
selectAllChildrenByLevel
(
userId
,
level
-
1
);
List
<
BaseUserMember
>
baseUserMemberList
=
mapper
.
selectAllChildrenByLevel
(
userId
,
queryLevel
);
if
(
baseUserMemberList
!=
null
&&
baseUserMemberList
.
size
()
>
getLimitNumber
())
{
if
(
baseUserMemberList
!=
null
&&
baseUserMemberList
.
size
()
>
getLimitNumber
())
{
return
generateUserLevel
(
userId
,
level
+
1
,
userMemberLevelList
);
return
generateUserLevel
(
userId
,
level
+
1
,
userMemberLevelList
);
}
else
{
}
else
{
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java
View file @
8ca59d6d
...
@@ -210,36 +210,44 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
...
@@ -210,36 +210,44 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
public
void
generateMemberShareQueue
(
OrderMemberDetail
orderMemberDetail
)
{
public
void
generateMemberShareQueue
(
OrderMemberDetail
orderMemberDetail
)
{
if
(
orderMemberDetail
!=
null
)
{
if
(
orderMemberDetail
!=
null
)
{
log
.
info
(
"会员订单信息: {}"
,
orderMemberDetail
);
log
.
info
(
"会员订单信息: {}"
,
orderMemberDetail
);
BaseUserMemberLevel
baseUserMemberLevel
=
baseUserMemberLevelMapper
.
selectOne
(
new
BaseUserMemberLevel
(){{
setIsdel
(
0
);
setId
(
orderMemberDetail
.
getMemberLevelId
());}});
Example
example
=
new
Example
(
BaseUserMemberLevel
.
class
);
log
.
info
(
"会员等级信息: {}"
,
baseUserMemberLevel
);
example
.
createCriteria
().
andEqualTo
(
"isdel"
,
0
).
andEqualTo
(
"isShare"
,
1
);
if
(
baseUserMemberLevel
!=
null
&&
baseUserMemberLevel
.
getIsShare
()
==
1
)
{
example
.
orderBy
(
"level"
);
List
<
BaseUserMember
>
baseUserMemberList
=
baseUserMemberBiz
.
selectList
(
new
BaseUserMember
(){{
setIsDel
(
0
);
setMemberLevel
(
orderMemberDetail
.
getMemberLevel
());}});
List
<
BaseUserMemberLevel
>
baseUserMemberLevelList
=
baseUserMemberLevelMapper
.
selectByExample
(
example
);
if
(
baseUserMemberList
!=
null
&&
baseUserMemberList
.
size
()
>
0
)
{
if
(
baseUserMemberLevelList
!=
null
&&
baseUserMemberLevelList
.
size
()
>
0
)
{
List
<
Integer
>
userIds
=
baseUserMemberList
.
stream
().
map
(
BaseUserMember:
:
getUserId
).
collect
(
Collectors
.
toList
());
//如果购买会员是分成会员低一级会员以及分成会员,才参与分成
if
(
userIds
!=
null
&&
userIds
.
size
()
>
0
)
{
if
(
orderMemberDetail
.
getMemberLevel
().
compareTo
(
baseUserMemberLevelList
.
get
(
0
).
getLevel
()
-
1
)
>=
0
)
{
MemberShareRecord
memberShareRecord
=
new
MemberShareRecord
();
//所有分成会员都需要新增一条记录
memberShareRecord
.
setOrderNo
(
orderMemberDetail
.
getBaseOrder
().
getNo
());
for
(
BaseUserMemberLevel
baseUserMemberLevel
:
baseUserMemberLevelList
)
{
memberShareRecord
.
setPayTime
(
orderMemberDetail
.
getBaseOrder
().
getPayTime
());
List
<
BaseUserMember
>
baseUserMemberList
=
baseUserMemberBiz
.
selectList
(
new
BaseUserMember
(){{
setIsDel
(
0
);
setMemberLevel
(
orderMemberDetail
.
getMemberLevel
());}});
memberShareRecord
.
setOrderAmount
(
orderMemberDetail
.
getBaseOrder
().
getOrderAmount
());
if
(
baseUserMemberList
!=
null
&&
baseUserMemberList
.
size
()
>
0
)
{
memberShareRecord
.
setMemberLevel
(
orderMemberDetail
.
getMemberLevel
());
List
<
Integer
>
userIds
=
baseUserMemberList
.
stream
().
map
(
BaseUserMember:
:
getUserId
).
collect
(
Collectors
.
toList
());
memberShareRecord
.
setMemberLevelId
(
orderMemberDetail
.
getMemberLevelId
());
if
(
userIds
!=
null
&&
userIds
.
size
()
>
0
)
{
memberShareRecord
.
setUserId
(
orderMemberDetail
.
getBaseOrder
().
getUserId
().
longValue
());
MemberShareRecord
memberShareRecord
=
new
MemberShareRecord
();
memberShareRecord
.
setOrderTime
(
orderMemberDetail
.
getCrtTime
());
memberShareRecord
.
setOrderNo
(
orderMemberDetail
.
getBaseOrder
().
getNo
());
memberShareRecord
.
setTotalAmount
(
baseUserMemberLevel
.
getShareAmount
());
memberShareRecord
.
setPayTime
(
orderMemberDetail
.
getBaseOrder
().
getPayTime
());
memberShareRecord
.
setMemberNum
(
userIds
.
size
());
memberShareRecord
.
setOrderAmount
(
orderMemberDetail
.
getBaseOrder
().
getOrderAmount
());
memberShareRecord
.
setAmount
(
baseUserMemberLevel
.
getShareAmount
().
divide
(
new
BigDecimal
(
userIds
.
size
()).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
)));
memberShareRecord
.
setMemberLevel
(
orderMemberDetail
.
getMemberLevel
());
StringBuilder
stringBuilder
=
new
StringBuilder
();
memberShareRecord
.
setMemberLevelId
(
orderMemberDetail
.
getMemberLevelId
());
userIds
.
parallelStream
().
forEach
(
id
->
{
memberShareRecord
.
setUserId
(
orderMemberDetail
.
getBaseOrder
().
getUserId
().
longValue
());
stringBuilder
.
append
(
","
);
memberShareRecord
.
setOrderTime
(
orderMemberDetail
.
getCrtTime
());
stringBuilder
.
append
(
id
);
memberShareRecord
.
setTotalAmount
(
baseUserMemberLevel
.
getShareAmount
());
stringBuilder
.
append
(
","
);
memberShareRecord
.
setMemberNum
(
userIds
.
size
());
});
memberShareRecord
.
setAmount
(
baseUserMemberLevel
.
getShareAmount
().
divide
(
new
BigDecimal
(
userIds
.
size
()).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
)));
memberShareRecord
.
setMemberIds
(
stringBuilder
.
toString
());
StringBuilder
stringBuilder
=
new
StringBuilder
();
addUpdate
(
memberShareRecord
);
userIds
.
parallelStream
().
forEach
(
id
->
{
stringBuilder
.
append
(
","
);
stringBuilder
.
append
(
id
);
stringBuilder
.
append
(
","
);
});
memberShareRecord
.
setMemberIds
(
stringBuilder
.
toString
());
addUpdate
(
memberShareRecord
);
}
}
}
}
}
}
}
}
}
}
}
}
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @
8ca59d6d
...
@@ -756,7 +756,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
...
@@ -756,7 +756,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
//发送消息队列到admin,进行分成计算
//发送消息队列到admin,进行分成计算
mqSenderFeign
.
sendMessage
(
RabbitConstant
.
ADMIN_TOPIC
,
RabbitConstant
.
KEY_MEMBER_SHARE
,
JSONUtil
.
toJsonStr
(
omd
));
mqSenderFeign
.
sendMessage
(
RabbitConstant
.
ADMIN_TOPIC
,
RabbitConstant
.
KEY_MEMBER_SHARE
,
JSONUtil
.
toJsonStr
(
omd
));
}
else
if
(
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
().
equals
(
baseOrder
.
getType
()))
{
}
else
if
(
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
().
equals
(
baseOrder
.
getType
()))
{
updateOrder
.
setStatus
(
OrderStatusEnum
.
ORDER_TOSTART
.
getCode
());
updateOrder
.
setStatus
(
OrderStatusEnum
.
ORDER_TOSTART
.
getCode
());
orvd
=
orderRentVehicleBiz
.
selectOne
(
new
OrderRentVehicleDetail
()
{{
orvd
=
orderRentVehicleBiz
.
selectOne
(
new
OrderRentVehicleDetail
()
{{
...
...
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