Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
a0ba91cb
提交
a0ba91cb
authored
10月 28, 2023
作者:
liruixin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
违约结算单枚举
上级
03b95383
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
6 行增加
和
6 行删除
+6
-6
BreakContractSettlementOwnerEnum.java
...x/performance/enums/BreakContractSettlementOwnerEnum.java
+1
-1
BreakContractSettlementOwnerDaoImpl.java
...pl/breakcontract/BreakContractSettlementOwnerDaoImpl.java
+1
-1
BreakContractOwnerRecordServiceImpl.java
...pl/breakcontract/BreakContractOwnerRecordServiceImpl.java
+1
-1
BreakContractSettlementOwnerServiceImpl.java
...reakcontract/BreakContractSettlementOwnerServiceImpl.java
+3
-3
没有找到文件。
performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementOwnerEnum.java
浏览文件 @
a0ba91cb
...
...
@@ -13,7 +13,7 @@ public enum BreakContractSettlementOwnerEnum {
@Getter
@AllArgsConstructor
public
enum
Status
{
TO_BE_
LOCKED
(
10
,
"待对账"
),
TO_BE_
ACCOUNT
(
10
,
"待对账"
),
OWNER_TO_BE_CONFIRMED
(
20
,
"待货主确认"
),
SHIPPER_TO_PAYMENT
(
30
,
"待货主付款"
),
PLATFORM_CONFIRMED_OWNER_PAYMENT
(
40
,
"待平台确认付款"
),
...
...
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java
浏览文件 @
a0ba91cb
...
...
@@ -43,7 +43,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
public
boolean
uploadInvoiceImg
(
Integer
id
,
String
invoiceImg
)
{
return
update
(
lUdWrapper
()
.
eq
(
BreakContractSettlementOwner:
:
getId
,
id
)
.
eq
(
BreakContractSettlementOwner:
:
getStatus
,
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
LOCKED
.
getCode
())
.
eq
(
BreakContractSettlementOwner:
:
getStatus
,
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
ACCOUNT
.
getCode
())
.
set
(
BreakContractSettlementOwner:
:
getInvoiceImg
,
invoiceImg
)
.
set
(
BreakContractSettlementOwner:
:
getStatus
,
BreakContractSettlementOwnerEnum
.
Status
.
OWNER_TO_BE_CONFIRMED
.
getCode
())
);
...
...
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java
浏览文件 @
a0ba91cb
...
...
@@ -100,7 +100,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
//货主违约结算单
BreakContractSettlementOwner
breakOwner
=
breakContractSettlementOwnerStruct
.
convert
(
breakOwnerDetail
);
breakOwner
.
setStatus
(
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
LOCKED
.
getCode
());
breakOwner
.
setStatus
(
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
ACCOUNT
.
getCode
());
record
.
setSettlementNo
(
settlementNo
);
//保存违约记录
...
...
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java
浏览文件 @
a0ba91cb
...
...
@@ -131,7 +131,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
public
void
uploadInvoiceImg
(
CarrierUploadInvoiceImgParam
param
)
{
BreakContractSettlementOwner
settlementOwner
=
breakContractSettlementOwnerDao
.
getEntityByKey
(
param
.
getId
()).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
if
(!
Objects
.
equals
(
settlementOwner
.
getStatus
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
LOCKED
.
getCode
())){
if
(!
Objects
.
equals
(
settlementOwner
.
getStatus
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
ACCOUNT
.
getCode
())){
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
STATUS_CHANGED
);
}
breakContractSettlementOwnerDao
.
uploadInvoiceImg
(
param
.
getId
(),
param
.
getInvoiceImg
());
...
...
@@ -147,11 +147,11 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
updateCancelSettlement
(
CarrierCancelSettlementParam
param
)
{
BreakContractSettlementOwner
settlementOwner
=
breakContractSettlementOwnerDao
.
getEntityByKey
(
param
.
getId
()).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
if
(!
Objects
.
equals
(
settlementOwner
.
getStatus
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
LOCKED
.
getCode
())){
if
(!
Objects
.
equals
(
settlementOwner
.
getStatus
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
ACCOUNT
.
getCode
())){
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
STATUS_CHANGED
);
}
breakContractSettlementOwnerDao
.
updateStatus
(
param
.
getId
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
LOCKED
.
getCode
(),
BreakContractSettlementOwnerEnum
.
Status
.
CANCEL
.
getCode
());
breakContractSettlementOwnerDao
.
updateStatus
(
param
.
getId
(),
BreakContractSettlementOwnerEnum
.
Status
.
TO_BE_
ACCOUNT
.
getCode
(),
BreakContractSettlementOwnerEnum
.
Status
.
CANCEL
.
getCode
());
UserSessionData
loginUserInfo
=
TokenUtil
.
getLoginUserInfo
();
//保存结算单日志----取消结算单
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论