Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
4b089a73
提交
4b089a73
authored
11月 09, 2023
作者:
liruixin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
货主违约金
上级
a4986e4a
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
1 行增加
和
5 行删除
+1
-5
BreakContractSettlementOwnerServiceImpl.java
...reakcontract/BreakContractSettlementOwnerServiceImpl.java
+1
-5
没有找到文件。
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java
浏览文件 @
4b089a73
...
@@ -408,7 +408,6 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
...
@@ -408,7 +408,6 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
@Override
@Override
public
void
saveSettlementOwnerForCancelOrder
(
BigDecimal
transportWeight
,
BigDecimal
validFreightPrice
,
String
orderNo
,
Integer
cancelType
)
{
public
void
saveSettlementOwnerForCancelOrder
(
BigDecimal
transportWeight
,
BigDecimal
validFreightPrice
,
String
orderNo
,
Integer
cancelType
)
{
System
.
out
.
println
(
transportWeight
+
"========================122222444========================="
+
validFreightPrice
+
""
+
cancelType
);
//获取订单配置的违约金方案
//获取订单配置的违约金方案
OwnerQuotationDetailVO
quotationDetailVO
=
quotationService
.
getQuotationByOrderNo
(
orderNo
).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
OwnerQuotationDetailVO
quotationDetailVO
=
quotationService
.
getQuotationByOrderNo
(
orderNo
).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
if
(
Objects
.
isNull
(
quotationDetailVO
.
getLiquidatedDamagesPlanId
())){
if
(
Objects
.
isNull
(
quotationDetailVO
.
getLiquidatedDamagesPlanId
())){
...
@@ -425,7 +424,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
...
@@ -425,7 +424,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
String
autoRuleJson
=
ownerRule
.
getAutoRuleJson
();
//系统自动违规
String
autoRuleJson
=
ownerRule
.
getAutoRuleJson
();
//系统自动违规
BreakContractOwnerRuleVO
.
AutoRule
autoRule
=
JSONObject
.
parseObject
(
autoRuleJson
,
BreakContractOwnerRuleVO
.
AutoRule
.
class
);
BreakContractOwnerRuleVO
.
AutoRule
autoRule
=
JSONObject
.
parseObject
(
autoRuleJson
,
BreakContractOwnerRuleVO
.
AutoRule
.
class
);
BreakContractOwnerRuleVO
.
OrderCancelRule
orderCancelRule
=
autoRule
.
getOrderCancelRule
();
//订单取消规则
BreakContractOwnerRuleVO
.
OrderCancelRule
orderCancelRule
=
autoRule
.
getOrderCancelRule
();
//订单取消规则
System
.
out
.
println
(
orderCancelRule
+
"========================122222========================="
);
//运单状态(包括货主取消)
//运单状态(包括货主取消)
//运单状态(包括货主取消)
//运单状态(包括货主取消)
List
<
Integer
>
statusList
=
new
ArrayList
<>();
List
<
Integer
>
statusList
=
new
ArrayList
<>();
...
@@ -443,18 +442,15 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
...
@@ -443,18 +442,15 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
if
(
Objects
.
equals
(
cancelType
,
CancelOrderEnum
.
Type
.
NOT_ARRIVE
.
getCode
())){
if
(
Objects
.
equals
(
cancelType
,
CancelOrderEnum
.
Type
.
NOT_ARRIVE
.
getCode
())){
statusList
.
add
(
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
());
statusList
.
add
(
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
());
}
}
System
.
out
.
println
(
statusList
+
"========================1========================="
);
BigDecimal
figure
;
//总费用
BigDecimal
figure
;
//总费用
//订单号查询货单
//订单号查询货单
List
<
OrderGoods
>
orderGoods
=
orderGoodsDao
.
getOrderGoodsListByOrderNo
(
orderNo
);
List
<
OrderGoods
>
orderGoods
=
orderGoodsDao
.
getOrderGoodsListByOrderNo
(
orderNo
);
System
.
out
.
println
(
orderGoods
+
"========================11========================="
);
if
(
CollectionUtils
.
isEmpty
(
orderGoods
)){
if
(
CollectionUtils
.
isEmpty
(
orderGoods
)){
figure
=
transportWeight
.
multiply
(
validFreightPrice
).
multiply
(
orderCancelRule
.
getBeforeRatio
());
figure
=
transportWeight
.
multiply
(
validFreightPrice
).
multiply
(
orderCancelRule
.
getBeforeRatio
());
}
else
{
}
else
{
List
<
OrderChild
>
orderChilds
=
orderChildDao
.
listOrderChildByOrderNoAndStatus
(
orderNo
,
statusList
);
List
<
OrderChild
>
orderChilds
=
orderChildDao
.
listOrderChildByOrderNoAndStatus
(
orderNo
,
statusList
);
System
.
out
.
println
(
orderChilds
+
"========================122222========================="
);
//没有司机拉运
//没有司机拉运
if
(
CollectionUtils
.
isEmpty
(
orderChilds
)){
if
(
CollectionUtils
.
isEmpty
(
orderChilds
)){
figure
=
transportWeight
.
multiply
(
validFreightPrice
).
multiply
(
orderCancelRule
.
getAfterRatio
());
figure
=
transportWeight
.
multiply
(
validFreightPrice
).
multiply
(
orderCancelRule
.
getAfterRatio
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论