Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
e8d93a65
提交
e8d93a65
authored
10月 26, 2023
作者:
jiangwenye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
结算金额=0的运单,是否已付尾款字段都是“无需支付”
上级
b05eadd9
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
24 行增加
和
0 行删除
+24
-0
SettlementOwnerDaoImpl.java
...x/performance/dao/impl/settle/SettlementOwnerDaoImpl.java
+7
-0
SettlementOwnerDao.java
...va/com/clx/performance/dao/settle/SettlementOwnerDao.java
+2
-0
SettlementOwnerServiceImpl.java
...mance/service/impl/settle/SettlementOwnerServiceImpl.java
+15
-0
没有找到文件。
performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java
浏览文件 @
e8d93a65
...
...
@@ -66,6 +66,13 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
);
}
@Override
public
boolean
updateInvoiceStatusById
(
Integer
id
,
Integer
invoiceStatus
){
return
update
(
lUdWrapper
()
.
eq
(
SettlementOwner:
:
getId
,
id
)
.
set
(
SettlementOwner:
:
getInvoiceStatus
,
invoiceStatus
)
);
}
@Override
public
boolean
updatePayment
(
SettlementOwner
settlementOwner
)
{
return
update
(
lUdWrapper
()
...
...
performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java
浏览文件 @
e8d93a65
...
...
@@ -22,6 +22,8 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
boolean
updateStatusBySettlementNo
(
@Param
(
"settlementNo"
)
String
settlementNo
,
@Param
(
"status"
)
Integer
status
);
boolean
updateInvoiceStatusById
(
@Param
(
"id"
)
Integer
id
,
@Param
(
"invoiceStatus"
)
Integer
invoiceStatus
);
boolean
updatePayment
(
SettlementOwner
settlementOwner
);
IPage
<
SettlementOwner
>
pageCarrierSettlementOwner
(
PageCarrierSettlementOwnerParam
param
);
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @
e8d93a65
...
...
@@ -110,8 +110,15 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
status
=
SettlementOwnerEnum
.
Status
.
SHIPPER_TO_PAYMENT
.
getCode
();
}
else
if
(
settlementOwner
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
)
<
0
){
status
=
SettlementOwnerEnum
.
Status
.
PLATFORM_TO_PAYMENT
.
getCode
();
if
(
Objects
.
equals
(
settlementOwner
.
getInvoiceType
(),
SettlementOwnerEnum
.
InvoiceType
.
ORDINARY
.
getCode
())){
settlementOwnerDao
.
updateInvoiceStatusById
(
settlementOwner
.
getId
(),
SettlementOwnerEnum
.
InvoiceStatus
.
NO_NEED_INVOICE
.
getCode
());
settlementOwnerDetailDao
.
updateInvoiceStatusBySettlementNo
(
settlementNo
,
SettlementOwnerDetailEnum
.
InvoiceStatus
.
NO_INVOICE
.
getCode
());
}
}
else
{
if
(
Objects
.
equals
(
settlementOwner
.
getInvoiceType
(),
SettlementOwnerEnum
.
InvoiceType
.
ORDINARY
.
getCode
())){
settlementOwnerDao
.
updateInvoiceStatusById
(
settlementOwner
.
getId
(),
SettlementOwnerEnum
.
InvoiceStatus
.
NO_NEED_INVOICE
.
getCode
());
settlementOwnerDetailDao
.
updateInvoiceStatusBySettlementNo
(
settlementNo
,
SettlementOwnerDetailEnum
.
InvoiceStatus
.
NO_INVOICE
.
getCode
());
}
status
=
SettlementOwnerEnum
.
Status
.
COMPLETED
.
getCode
();
//保存结算单日志----已完结
settlementLogService
.
saveSettlementLog
(
settlementNo
,
...
...
@@ -356,7 +363,15 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
settlementOwnerDao
.
saveExpress
(
settlementNo
,
param
.
getExpressCompany
(),
param
.
getExpressNo
());
if
(
Objects
.
equals
(
settlementOwner
.
getInvoiceType
(),
SettlementOwnerEnum
.
InvoiceType
.
ORDINARY
.
getCode
())){
if
(
settlementOwner
.
getSettlementFreight
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
settlementOwnerDao
.
updateInvoiceStatusById
(
settlementOwner
.
getId
(),
SettlementOwnerEnum
.
InvoiceStatus
.
All_INVOICED
.
getCode
());
settlementOwnerDetailDao
.
updateInvoiceStatusBySettlementNo
(
settlementNo
,
SettlementOwnerDetailEnum
.
InvoiceStatus
.
YES
.
getCode
());
}
else
{
settlementOwnerDao
.
updateInvoiceStatusById
(
settlementOwner
.
getId
(),
SettlementOwnerEnum
.
InvoiceStatus
.
NO_NEED_INVOICE
.
getCode
());
settlementOwnerDetailDao
.
updateInvoiceStatusBySettlementNo
(
settlementNo
,
SettlementOwnerDetailEnum
.
InvoiceStatus
.
NO_INVOICE
.
getCode
());
}
}
settlementOwnerDao
.
updateStatusBySettlementNo
(
settlementNo
,
SettlementOwnerEnum
.
Status
.
COMPLETED
.
getCode
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论