Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
7ca5868b
提交
7ca5868b
authored
6月 21, 2024
作者:
胡宁宁
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加运单流程日志
上级
1ae481c5
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
5 行增加
和
4 行删除
+5
-4
OrderChildServiceImpl.java
...m/clx/performance/service/impl/OrderChildServiceImpl.java
+1
-1
SettlementMqHandlerServiceImpl.java
...e/service/impl/settle/SettlementMqHandlerServiceImpl.java
+2
-1
SettlementMqServiceImpl.java
...formance/service/impl/settle/SettlementMqServiceImpl.java
+1
-1
SettlementServiceImpl.java
...erformance/service/impl/settle/SettlementServiceImpl.java
+1
-1
没有找到文件。
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @
7ca5868b
...
...
@@ -1543,7 +1543,7 @@ public class OrderChildServiceImpl implements OrderChildService {
Integer
settlementDriverDetailId
=
settlementDriverDetailService
.
saveSettlementDetail
(
orderChild
);
Integer
settlementOwnerDetailId
=
settlementOwnerDetailService
.
saveSettlementDetail
(
orderChild
,
orderGoods
);
log
.
info
(
"生成计费单 {} "
,
orderChild
.
getChildNo
());
settlementMqService
.
settlementDetailAdd
(
settlementDriverDetailId
,
settlementOwnerDetailId
);
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @
7ca5868b
...
...
@@ -176,6 +176,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
//生成车主结算单
settlementDriverSave
(
settlementDriverDetail
,
settlementNo
);
//车主结算单自动支付
log
.
info
(
" 运单号 {}, 是否是普通单 {} "
,
settlementDriverDetail
.
getChildNo
(),
settlementDriverDetail
.
getInvoiceType
());
if
(!
settlementDriverDetail
.
getInvoiceType
().
equals
(
SettlementOwnerEnum
.
InvoiceType
.
ONLINE
.
getCode
()))
{
paySettlementDriver
(
settlementDriverDetail
);
}
else
{
...
...
@@ -221,7 +222,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
orderChildDao
.
updatePlatformServiceFee
(
orderChild
);
settlementPlatformServiceFeeDao
.
saveEntity
(
settlementPlatformServiceFee
);
log
.
info
(
"更新网络标识 {} "
,
orderChild
.
getChildNo
());
// 更新网络标识
settlementService
.
updateSettlementDetailInvoiceType
(
settlementOwnerDetail
.
getChildNo
(),
SettlementOwnerEnum
.
InvoiceType
.
ORDINARY
.
getCode
());
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqServiceImpl.java
浏览文件 @
7ca5868b
...
...
@@ -40,7 +40,7 @@ public class SettlementMqServiceImpl implements SettlementMqService {
SettlementDetailInvoiceTypeSyncMqParam
mq
=
new
SettlementDetailInvoiceTypeSyncMqParam
();
mq
.
setChildNo
(
childNo
);
mq
.
setInvoiceType
(
invoiceType
);
log
.
info
(
"运单号 {} 开票标识 {} "
,
childNo
,
invoiceType
);
MqDelay
<
MqWrapper
<
SettlementDetailInvoiceTypeSyncMqParam
>>
delay
=
new
MqDelay
<>(
RabbitKeySettlementConstants
.
DEFAULT_EXCHANGE
,
RabbitKeySettlementConstants
.
SETTLEMENT_DETAIL_INVOICE_TYPE_SYC_ROUTING_KEY
,
new
MqWrapper
<>(
mq
));
Message
message
=
MessageBuilder
.
withBody
(
JSON
.
toJSONString
(
new
MqWrapper
<>(
delay
)).
getBytes
()).
build
();
message
.
getMessageProperties
().
setExpiration
(
"5000"
);
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java
浏览文件 @
7ca5868b
...
...
@@ -80,7 +80,7 @@ public class SettlementServiceImpl implements SettlementService {
SettlementOwnerDetail
settlementOwnerDetail
=
settlementOwnerDetailDao
.
getByChildNo
(
childNo
).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
SettlementDriverDetail
settlementDriverDetail
=
settlementDriverDetailDao
.
getByChildNo
(
childNo
).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
log
.
info
(
"开始 更新网络标识 {} , {}"
,
orderChild
.
getChildNo
()
,
settlementDriverDetail
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
));
if
(
settlementDriverDetail
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
)
<=
0
)
{
settlementDriverDetail
.
setPrepayFreightFlag
(
SettlementDriverEnum
.
PrepayFreightFlag
.
NO_PAY
.
getCode
());
settlementOwnerDetail
.
setPrepayFreight
(
BigDecimal
.
ZERO
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论