Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
ea68f379
提交
ea68f379
authored
9月 19, 2024
作者:
艾庆国
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
承运优化需求-风控自动处理
上级
fd42bae6
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
173 行增加
和
12 行删除
+173
-12
SettlementOrderChildRiskAddMqParam.java
...ance/vo/mq/settle/SettlementOrderChildRiskAddMqParam.java
+16
-0
RabbitSettlementConfig.java
...va/com/clx/performance/config/RabbitSettlementConfig.java
+12
-0
RabbitKeySettlementConstants.java
...lx/performance/constant/RabbitKeySettlementConstants.java
+6
-0
SettlementRiskAddListener.java
...erformance/listener/settle/SettlementRiskAddListener.java
+44
-0
OrderChildBrokerMqHandlerServiceImpl.java
...ice/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
+6
-0
SettlementMqHandlerServiceImpl.java
...e/service/impl/settle/SettlementMqHandlerServiceImpl.java
+63
-4
SettlementMqServiceImpl.java
...formance/service/impl/settle/SettlementMqServiceImpl.java
+13
-4
SettlementPostServiceImpl.java
...rmance/service/impl/settle/SettlementPostServiceImpl.java
+7
-0
SettlementMqHandlerService.java
...erformance/service/settle/SettlementMqHandlerService.java
+2
-4
SettlementMqService.java
...m/clx/performance/service/settle/SettlementMqService.java
+2
-0
SettlementPostService.java
...clx/performance/service/settle/SettlementPostService.java
+2
-0
没有找到文件。
performance-api/src/main/java/com/clx/performance/vo/mq/settle/SettlementOrderChildRiskAddMqParam.java
0 → 100644
浏览文件 @
ea68f379
package
com
.
clx
.
performance
.
vo
.
mq
.
settle
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Setter
@Getter
@ToString
@NoArgsConstructor
public
class
SettlementOrderChildRiskAddMqParam
{
private
Integer
id
;
//id
}
performance-web/src/main/java/com/clx/performance/config/RabbitSettlementConfig.java
浏览文件 @
ea68f379
...
...
@@ -123,6 +123,18 @@ public class RabbitSettlementConfig {
.
with
(
RabbitKeySettlementConstants
.
SETTLEMENT_INVOICE_STATUS_SYNC_ROUTING_KEY
);
}
/**
* 风控新增
*/
@Bean
public
Queue
settlementRiskAddQueue
()
{
return
new
Queue
(
RabbitKeySettlementConstants
.
SETTLEMENT_RISK_ADD_QUEUE
);
}
@Bean
public
Binding
settlementRiskAddQueueBinding
()
{
return
BindingBuilder
.
bind
(
settlementRiskAddQueue
()).
to
(
settlementDefaultExchange
())
.
with
(
RabbitKeySettlementConstants
.
SETTLEMENT_RISK_ADD_ROUTING_KEY
);
}
/**
* 风控处理
*/
...
...
performance-web/src/main/java/com/clx/performance/constant/RabbitKeySettlementConstants.java
浏览文件 @
ea68f379
...
...
@@ -68,6 +68,12 @@ public class RabbitKeySettlementConstants {
public
static
final
String
SETTLEMENT_PAY_STATUS_SYNC_QUEUE
=
PREFIX
+
"settlementPayStatus.sync"
+
QUEUE
;
public
static
final
String
SETTLEMENT_PAY_STATUS_SYNC_ROUTING_KEY
=
PREFIX
+
"settlementPayStatus.sync"
+
QUEUE_ROUTING_KEY
;
/**
* 风控新增
*/
public
static
final
String
SETTLEMENT_RISK_ADD_QUEUE
=
PREFIX
+
"settlementRisk.add"
+
QUEUE
;
public
static
final
String
SETTLEMENT_RISK_ADD_ROUTING_KEY
=
PREFIX
+
"settlementRisk.add"
+
QUEUE_ROUTING_KEY
;
/**
* 风控处理
*/
...
...
performance-web/src/main/java/com/clx/performance/listener/settle/SettlementRiskAddListener.java
0 → 100644
浏览文件 @
ea68f379
package
com
.
clx
.
performance
.
listener
.
settle
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.clx.performance.common.MqWrapper
;
import
com.clx.performance.constant.RabbitKeySettlementConstants
;
import
com.clx.performance.service.settle.SettlementMqHandlerService
;
import
com.clx.performance.vo.mq.settle.SettlementOrderChildRiskAddMqParam
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.exception.ExceptionUtils
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.rabbit.annotation.RabbitListener
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
/**
* @Author: 艾庆国
* @Description: 风控新增 mq
* @Date: 2023-10-20 11:45:08
* @Version: 1.0
*/
@Slf4j
@Component
public
class
SettlementRiskAddListener
{
@Autowired
private
SettlementMqHandlerService
settlementMqHandlerService
;
@RabbitListener
(
queues
=
RabbitKeySettlementConstants
.
SETTLEMENT_RISK_ADD_QUEUE
)
public
void
process
(
Message
message
)
{
try
{
log
.
info
(
"结算-风控新增, message:{}"
,
new
String
(
message
.
getBody
()));
process
(
JSON
.
parseObject
(
new
String
(
message
.
getBody
()),
new
TypeReference
<
MqWrapper
<
SettlementOrderChildRiskAddMqParam
>>(){}).
getData
());
}
catch
(
Exception
e
){
log
.
info
(
"结算-风控新增 失败,msg:{}"
,
ExceptionUtils
.
getStackTrace
(
e
));
}
}
private
void
process
(
SettlementOrderChildRiskAddMqParam
mq
){
settlementMqHandlerService
.
riskAdd
(
mq
);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
浏览文件 @
ea68f379
...
...
@@ -18,6 +18,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
import
com.clx.performance.service.broker.OrderChildBrokerMqHandlerService
;
import
com.clx.performance.service.broker.OrderChildBrokerMqService
;
import
com.clx.performance.service.broker.OrderChildBrokerService
;
import
com.clx.performance.service.settle.SettlementPostService
;
import
com.clx.performance.vo.mq.broker.BrokerOrderChildSyncMqParam
;
import
com.clx.performance.vo.mq.broker.BrokerOrderChildUpdateMqParam
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -51,6 +52,9 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
@Autowired
private
SettlementOrderChildRiskDao
settlementOrderChildRiskDao
;
@Autowired
private
SettlementPostService
settlementPostService
;
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
void
orderChildSync
(
BrokerOrderChildSyncMqParam
mq
)
{
...
...
@@ -77,6 +81,8 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
settlementOrderChildRisk
.
setRiskType
(
SettlementOrderChildRiskEnum
.
RiskType
.
SETTLE_FAIL
.
getCode
());
settlementOrderChildRisk
.
setRiskRemark
(
"同步无车承运异常"
);
settlementOrderChildRiskDao
.
saveEntity
(
settlementOrderChildRisk
);
settlementPostService
.
riskAdd
(
settlementOrderChildRisk
.
getId
());
}
}
public
void
doOrderChildSync
(
BrokerOrderChildSyncMqParam
mq
){
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @
ea68f379
...
...
@@ -40,10 +40,7 @@ import com.clx.performance.utils.LocalDateTimeUtils;
import
com.clx.performance.utils.RedisUtil
;
import
com.clx.performance.utils.spring.ApplicationContextUtils
;
import
com.clx.performance.vo.mq.*
;
import
com.clx.performance.vo.mq.settle.SettlementInvoiceStatusUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOrderChildRiskProcessMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOwnerDetialInvoiceCompanyUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementPlatformAutoConfirmMqParam
;
import
com.clx.performance.vo.mq.settle.*
;
import
com.clx.performance.vo.pc.broker.TransportVO
;
import
com.clx.user.vo.feign.DriverInfoFeignVo
;
import
com.clx.user.vo.feign.OwnerInfoFeignVO
;
...
...
@@ -343,6 +340,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementOrderChildRisk
.
setRiskRemark
(
result
.
getSyncMsg
());
settlementOrderChildRiskDao
.
saveEntity
(
settlementOrderChildRisk
);
settlementPostService
.
riskAdd
(
settlementOrderChildRisk
.
getId
());
return
;
}
else
{
...
...
@@ -407,6 +406,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementOrderChildRisk
.
setRiskRemark
(
result
.
getSyncMsg
());
settlementOrderChildRiskDao
.
saveEntity
(
settlementOrderChildRisk
);
settlementPostService
.
riskAdd
(
settlementOrderChildRisk
.
getId
());
return
;
}
...
...
@@ -482,6 +483,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementOrderChildRisk
.
setRiskRemark
(
result
.
getSyncMsg
());
settlementOrderChildRiskDao
.
saveEntity
(
settlementOrderChildRisk
);
settlementPostService
.
riskAdd
(
settlementOrderChildRisk
.
getId
());
return
;
}
...
...
@@ -520,6 +523,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
settlementOrderChildRisk
.
setRiskType
(
SettlementOrderChildRiskEnum
.
RiskType
.
SETTLE_FAIL
.
getCode
());
settlementOrderChildRisk
.
setRiskRemark
(
result
.
getSettleMsg
());
settlementOrderChildRiskDao
.
saveEntity
(
settlementOrderChildRisk
);
settlementPostService
.
riskAdd
(
settlementOrderChildRisk
.
getId
());
}
}
...
...
@@ -914,6 +919,60 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
return
uniqueOrderNumService
.
getUniqueOrderNum
(
com
.
msl
.
common
.
utils
.
LocalDateTimeUtils
.
convertLocalDateTimeToString
(
LocalDateTime
.
now
(),
com
.
msl
.
common
.
utils
.
LocalDateTimeUtils
.
DATE_DAY
));
}
@Override
public
void
riskAdd
(
SettlementOrderChildRiskAddMqParam
mq
)
{
SettlementOrderChildRisk
settlementOrderChildRisk
=
settlementOrderChildRiskDao
.
getById
(
mq
.
getId
()).
orElseThrow
(
ResultEnum
.
DATA_NOT_FIND
);
if
(
Objects
.
equals
(
settlementOrderChildRisk
.
getStatus
(),
SettlementOrderChildRiskEnum
.
Status
.
PROCESSED
.
getCode
()))
{
return
;
}
OrderChild
orderChild
=
orderChildDao
.
getByChildNo
(
settlementOrderChildRisk
.
getChildNo
()).
orElseThrow
(
ResultEnum
.
DATA_NOT_FIND
);
InvoicingCompanyVO
invoicingCompanyByGroupCode
=
invoicingCompanyService
.
getInvoicingCompanyByGroupCode
(
orderChild
.
getInvoicingCompanyGroupCode
());
if
(!
Objects
.
equals
(
invoicingCompanyByGroupCode
.
getRiskProcessType
(),
InvoicingCompanyEnum
.
RiskProcessType
.
AUTO
.
getCode
()))
{
return
;
}
// 转普通单
SettlementOwnerDetail
settlementOwnerDetail
=
settlementOwnerDetailDao
.
getByChildNo
(
settlementOrderChildRisk
.
getChildNo
()).
orElseThrow
(
ResultEnum
.
DATA_NOT_FIND
);
SettlementDriverDetail
settlementDriverDetail
=
settlementDriverDetailDao
.
getByChildNo
(
settlementOrderChildRisk
.
getChildNo
()).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
SettlementDriver
settlementDriver
=
settlementDriverDao
.
findByChildNo
(
settlementOrderChildRisk
.
getChildNo
()).
orNull
();
settlementOrderChildRisk
.
setStatus
(
SettlementOrderChildRiskEnum
.
Status
.
PROCESSED
.
getCode
());
settlementOrderChildRisk
.
setProcessMethod
(
SettlementOrderChildRiskEnum
.
ProcessMethod
.
CONVERT_ORDINARY
.
getCode
());
settlementOrderChildRisk
.
setProcessBy
(
"系统"
);
settlementOrderChildRisk
.
setProcessTime
(
LocalDateTime
.
now
());
settlementOwnerDetail
.
setInvoiceType
(
SettlementOwnerEnum
.
InvoiceType
.
ORDINARY
.
getCode
());
settlementOwnerDetail
.
setInvoicingCompanyId
(
null
);
settlementOwnerDetail
.
setInvoicingCompanyShorterName
(
null
);
settlementOwnerDetail
.
setInvoicingCompanyGroupCode
(
null
);
settlementOwnerDetail
.
setInvoiceTypeStatus
(
SettlementOwnerDetailEnum
.
InvoiceTypeStatus
.
SUCCESS
.
getCode
());
settlementOwnerDetail
.
setInvoiceTypeModifiedTime
(
LocalDateTime
.
now
());
settlementOwnerDetailDao
.
updateConvertOrdinary
(
settlementOwnerDetail
);
settlementDriverDetail
.
setInvoiceType
(
settlementOwnerDetail
.
getInvoiceType
());
settlementDriverDetail
.
setInvoicingCompanyId
(
settlementOwnerDetail
.
getInvoicingCompanyId
());
settlementDriverDetail
.
setInvoicingCompanyShorterName
(
settlementOwnerDetail
.
getInvoicingCompanyShorterName
());
settlementDriverDetail
.
setInvoicingCompanyGroupCode
(
settlementOwnerDetail
.
getInvoicingCompanyGroupCode
());
settlementDriverDetailDao
.
updateConvertOrdinary
(
settlementDriverDetail
);
settlementOrderChildRisk
.
setInvoiceType
(
settlementOwnerDetail
.
getInvoiceType
());
if
(
settlementDriver
!=
null
)
{
// 删除结算单
settlementDriverDao
.
deleteByKey
(
settlementDriver
.
getId
());
}
settlementOrderChildRiskDao
.
updateProcess
(
settlementOrderChildRisk
);
// 发送mq (风控处理)
settlementMqService
.
riskProcess
(
settlementOrderChildRisk
.
getId
());
}
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
public
void
riskProcess
(
SettlementOrderChildRiskProcessMqParam
mq
)
{
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqServiceImpl.java
浏览文件 @
ea68f379
...
...
@@ -6,10 +6,7 @@ import com.clx.performance.common.MqWrapper;
import
com.clx.performance.constant.RabbitKeySettlementConstants
;
import
com.clx.performance.service.settle.SettlementMqService
;
import
com.clx.performance.vo.mq.*
;
import
com.clx.performance.vo.mq.settle.SettlementInvoiceStatusUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOrderChildRiskProcessMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOwnerDetialInvoiceCompanyUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementPlatformAutoConfirmMqParam
;
import
com.clx.performance.vo.mq.settle.*
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.core.MessageBuilder
;
...
...
@@ -114,6 +111,18 @@ public class SettlementMqServiceImpl implements SettlementMqService {
RabbitKeySettlementConstants
.
DEFAULT_DELAY_ROUTING_KEY
,
message
);
}
@Override
public
void
riskAdd
(
Integer
id
)
{
SettlementOrderChildRiskAddMqParam
mq
=
new
SettlementOrderChildRiskAddMqParam
();
mq
.
setId
(
id
);
MqDelay
delay
=
new
MqDelay
<>(
RabbitKeySettlementConstants
.
DEFAULT_EXCHANGE
,
RabbitKeySettlementConstants
.
SETTLEMENT_RISK_ADD_ROUTING_KEY
,
new
MqWrapper
<>(
mq
));
Message
message
=
MessageBuilder
.
withBody
(
JSON
.
toJSONString
(
new
MqWrapper
<>(
delay
)).
getBytes
()).
build
();
message
.
getMessageProperties
().
setExpiration
(
"5000"
);
rabbitTemplate
.
send
(
RabbitKeySettlementConstants
.
DEFAULT_EXCHANGE
,
RabbitKeySettlementConstants
.
DEFAULT_DELAY_ROUTING_KEY
,
message
);
}
@Override
public
void
riskProcess
(
Integer
id
)
{
SettlementOrderChildRiskProcessMqParam
mq
=
new
SettlementOrderChildRiskProcessMqParam
();
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementPostServiceImpl.java
浏览文件 @
ea68f379
...
...
@@ -60,4 +60,11 @@ public class SettlementPostServiceImpl implements SettlementPostService {
}
}
@Override
public
void
riskAdd
(
Integer
id
)
{
// 发送mq (风控新增)
settlementMqService
.
riskAdd
(
id
);
}
}
performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqHandlerService.java
浏览文件 @
ea68f379
...
...
@@ -2,10 +2,7 @@ package com.clx.performance.service.settle;
import
com.clx.performance.model.settle.SettlementDriverDetail
;
import
com.clx.performance.vo.mq.*
;
import
com.clx.performance.vo.mq.settle.SettlementInvoiceStatusUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOrderChildRiskProcessMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementOwnerDetialInvoiceCompanyUpdateMqParam
;
import
com.clx.performance.vo.mq.settle.SettlementPlatformAutoConfirmMqParam
;
import
com.clx.performance.vo.mq.settle.*
;
public
interface
SettlementMqHandlerService
{
...
...
@@ -27,6 +24,7 @@ public interface SettlementMqHandlerService {
String
settlementNoGenerate
();
void
riskAdd
(
SettlementOrderChildRiskAddMqParam
mq
);
void
riskProcess
(
SettlementOrderChildRiskProcessMqParam
mq
);
void
invoiceCompanyUpdate
(
SettlementOwnerDetialInvoiceCompanyUpdateMqParam
mq
);
...
...
performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqService.java
浏览文件 @
ea68f379
...
...
@@ -15,6 +15,8 @@ public interface SettlementMqService {
void
payStatusSync
(
String
childNo
);
void
riskAdd
(
Integer
id
);
void
riskProcess
(
Integer
id
);
void
updateInvoiceCompany
(
Integer
id
);
...
...
performance-web/src/main/java/com/clx/performance/service/settle/SettlementPostService.java
浏览文件 @
ea68f379
...
...
@@ -15,4 +15,6 @@ public interface SettlementPostService {
void
updateInvoice
(
List
<
String
>
childNoList
);
void
riskAdd
(
Integer
id
);
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论