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
89269bba
Commit
89269bba
authored
Nov 05, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员分成记录信息
parent
c5901a97
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
87 additions
and
11 deletions
+87
-11
RabbitConstant.java
...wxiaoqi/security/common/config/rabbit/RabbitConstant.java
+5
-0
MemberShareRecordBiz.java
...thub/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java
+25
-1
RabbitAdminConfig.java
...thub/wxiaoqi/security/admin/config/RabbitAdminConfig.java
+3
-0
MemberShareMQHandler.java
.../wxiaoqi/security/admin/handler/MemberShareMQHandler.java
+43
-0
OrderMemberDetail.java
...ava/com/xxfc/platform/order/entity/OrderMemberDetail.java
+7
-3
BaseOrderBiz.java
...c/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
+4
-7
No files found.
ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java
View file @
89269bba
...
...
@@ -24,6 +24,8 @@ public class RabbitConstant {
//用户
public
static
final
String
KEY_APPUSER_REGISTER
=
"appUser.register"
;
public
static
final
String
KEY_APPUSER_AUTH
=
"appUser.auth"
;
public
static
final
String
KEY_MEMBER_SHARE
=
"member.share"
;
//积分
public
static
final
String
INTEGRAL_ROUTING_KEY
=
"integral_routing_key"
;
...
...
@@ -36,6 +38,9 @@ public class RabbitConstant {
public
static
final
String
KEY_ORDER_END_1
=
"order.end.1"
;
public
static
final
String
KEY_ORDER_END_2
=
"order.end.2"
;
//钱包
public
static
final
String
KEY_WALLET_ADD
=
"wallet.add"
;
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MemberShareRecordBiz.java
View file @
89269bba
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
biz
;
import
cn.hutool.core.map.MapUtil
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMember
;
import
com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel
;
import
com.github.wxiaoqi.security.admin.entity.MemberShareCountRecord
;
import
com.github.wxiaoqi.security.admin.entity.MemberShareRecord
;
import
com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper
;
import
com.github.wxiaoqi.security.admin.mapper.MemberShareRecordMapper
;
import
com.github.wxiaoqi.security.admin.util.DateUtils
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.order.entity.OrderMemberDetail
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.joda.time.DateTime
;
...
...
@@ -34,7 +38,10 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
@Autowired
MemberShareCountRecordBiz
memberShareCountRecordBiz
;
@Autowired
BaseUserMemberBiz
baseUserMemberBiz
;
@Autowired
BaseUserMemberLevelMapper
baseUserMemberLevelMapper
;
/**
* 根据订单号查询分成记录
* 每个订单有且只有一条记录
...
...
@@ -193,4 +200,21 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
}
}
/**
* 接收会员订单支付成功后处理
* @param orderMemberDetail
*/
public
void
generateMemberShareQueue
(
OrderMemberDetail
orderMemberDetail
)
{
if
(
orderMemberDetail
!=
null
)
{
BaseUserMemberLevel
baseUserMemberLevel
=
baseUserMemberLevelMapper
.
selectOne
(
new
BaseUserMemberLevel
(){{
setIsdel
(
0
);
setLevel
(
orderMemberDetail
.
getMemberLevel
());}});
if
(
baseUserMemberLevel
!=
null
&&
baseUserMemberLevel
.
getIsShare
()
==
1
)
{
List
<
BaseUserMember
>
baseUserMemberList
=
baseUserMemberBiz
.
selectList
(
new
BaseUserMember
(){{
setIsDel
(
0
);
setMemberLevel
(
orderMemberDetail
.
getMemberLevel
());}});
if
(
baseUserMemberList
!=
null
&&
baseUserMemberList
.
size
()
>
0
)
{
}
}
}
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java
View file @
89269bba
...
...
@@ -33,6 +33,7 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
//同步门店信息
public
static
final
String
COMPANY_UPD_QUEUE
=
"company:upd.queue"
;
public
static
final
String
MEMBER_SHARE_QUEUE
=
"admin.member.share"
;
static
{
myQueue
=
new
ArrayList
<
BindDTO
>()
{{
...
...
@@ -50,6 +51,8 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
add
(
new
BindDTO
(
CORPORATION_UPD_QUEUE
,
VEHICLE_TOPIC
,
KEY_CORPORATION_UPD
));
//门店
add
(
new
BindDTO
(
COMPANY_UPD_QUEUE
,
VEHICLE_TOPIC
,
KEY_COMPANY_UPD
));
add
(
new
BindDTO
(
MEMBER_SHARE_QUEUE
,
ADMIN_TOPIC
,
KEY_MEMBER_SHARE
));
}};
}
}
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/MemberShareMQHandler.java
0 → 100644
View file @
89269bba
package
com
.
github
.
wxiaoqi
.
security
.
admin
.
handler
;
import
cn.hutool.json.JSONUtil
;
import
com.github.wxiaoqi.security.admin.biz.MemberShareRecordBiz
;
import
com.rabbitmq.client.Channel
;
import
com.xxfc.platform.order.entity.OrderMemberDetail
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.rabbit.annotation.RabbitListener
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.messaging.handler.annotation.Headers
;
import
org.springframework.stereotype.Component
;
import
java.util.Map
;
import
static
com
.
github
.
wxiaoqi
.
security
.
admin
.
config
.
RabbitAdminConfig
.
MEMBER_SHARE_QUEUE
;
/**
* @ClassName : MemberShareMQHandler
* @Description : 会员分成消息队列
* @Author : jiaoruizhen
* @Date: 2020-11-05 11:10
*/
@Component
@Slf4j
public
class
MemberShareMQHandler
{
@Autowired
MemberShareRecordBiz
memberShareRecordBiz
;
@RabbitListener
(
queues
=
MEMBER_SHARE_QUEUE
)
public
void
integralHandler
(
Message
message
,
@Headers
Map
<
String
,
Object
>
headers
,
Channel
channel
)
{
try
{
String
msg
=
new
String
(
message
.
getBody
(),
"UTF-8"
);
log
.
info
(
"接收到的消息-----msg===="
+
msg
);
OrderMemberDetail
orderMemberDetail
=
JSONUtil
.
toBean
(
msg
,
OrderMemberDetail
.
class
);
memberShareRecordBiz
.
generateMemberShareQueue
(
orderMemberDetail
);
}
catch
(
Exception
e
)
{
log
.
error
(
"接收消息失败:{}"
,
e
);
}
}
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderMemberDetail.java
View file @
89269bba
package
com
.
xxfc
.
platform
.
order
.
entity
;
import
java.io.Serializable
;
import
java.util.Date
;
import
javax.persistence.*
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.persistence.*
;
import
java.io.Serializable
;
/**
*
...
...
@@ -82,4 +82,8 @@ public class OrderMemberDetail implements Serializable {
@Column
(
name
=
"member_level_id"
)
@ApiModelProperty
(
value
=
"会员等级id"
)
private
Integer
memberLevelId
;
@Transient
BaseOrder
baseOrder
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
View file @
89269bba
...
...
@@ -17,6 +17,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.admin.vo.AppUserVo
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant
;
import
com.github.wxiaoqi.security.common.context.BaseContextHandler
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
...
...
@@ -751,13 +752,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
ObjectRestResponse
orr
=
userFeign
.
buyMember
(
userMemberDTO
);
log
.
info
(
"orr.getStatus() : "
+
orr
.
getStatus
());
//查询当前会员等级的所有订单,
//查询会员等级信息
//计算每人平均分成金额
omd
.
setBaseOrder
(
baseOrder
);
//发送消息队列到admin,进行分成计算
mqSenderFeign
.
sendMessage
(
RabbitConstant
.
ADMIN_TOPIC
,
RabbitConstant
.
KEY_MEMBER_SHARE
,
JSONUtil
.
toJsonStr
(
omd
));
}
else
if
(
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
().
equals
(
baseOrder
.
getType
()))
{
...
...
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