Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
0e24e5d3
提交
0e24e5d3
authored
4月 20, 2024
作者:
李瑞鑫
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
违约结算单数据同步货主客户端
上级
d8a435ab
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
11 行增加
和
6 行删除
+11
-6
SettlementFeign.java
.../main/java/com/clx/performance/feign/SettlementFeign.java
+3
-3
BreakContractSettlementOwnerFeignController.java
...er/feign/BreakContractSettlementOwnerFeignController.java
+8
-3
没有找到文件。
performance-api/src/main/java/com/clx/performance/feign/SettlementFeign.java
浏览文件 @
0e24e5d3
...
@@ -17,8 +17,8 @@ public interface SettlementFeign {
...
@@ -17,8 +17,8 @@ public interface SettlementFeign {
@GetMapping
(
"clx-performance/feign/settlement/thawAndLockSettlement"
)
@GetMapping
(
"clx-performance/feign/settlement/thawAndLockSettlement"
)
Result
<
Boolean
>
thawAndLockSettlement
(
@RequestParam
String
orderNo
);
Result
<
Boolean
>
thawAndLockSettlement
(
@RequestParam
String
orderNo
);
@ApiOperation
(
value
=
"
生成违约结算单
"
)
@ApiOperation
(
value
=
"
确认或驳回违约
"
)
@PostMapping
(
"clx-performance/feign/breakContract/
saveBreakContractSettlemen
t"
)
@PostMapping
(
"clx-performance/feign/breakContract/
updateBreakContrac
t"
)
Result
saveBreakContractSettlemen
t
(
@RequestBody
@Validated
BreakContractSettlementGenerateAction
action
);
Result
updateBreakContrac
t
(
@RequestBody
@Validated
BreakContractSettlementGenerateAction
action
);
}
}
performance-web/src/main/java/com/clx/performance/controller/feign/BreakContractSettlementOwnerFeignController.java
浏览文件 @
0e24e5d3
...
@@ -2,6 +2,7 @@ package com.clx.performance.controller.feign;
...
@@ -2,6 +2,7 @@ package com.clx.performance.controller.feign;
import
com.clx.open.sdk.request.action.BreakContractSettlementGenerateAction
;
import
com.clx.open.sdk.request.action.BreakContractSettlementGenerateAction
;
import
com.clx.performance.param.feign.OrderAdjustTonnageDownParam
;
import
com.clx.performance.param.feign.OrderAdjustTonnageDownParam
;
import
com.clx.performance.param.pc.owner.OwnerConfirmBreakContractSettlementParam
;
import
com.clx.performance.service.breakcontract.BreakContractOwnerRecordService
;
import
com.clx.performance.service.breakcontract.BreakContractOwnerRecordService
;
import
com.clx.performance.service.breakcontract.BreakContractOwnerRuleService
;
import
com.clx.performance.service.breakcontract.BreakContractOwnerRuleService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
import
com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService
;
...
@@ -46,9 +47,13 @@ public class BreakContractSettlementOwnerFeignController {
...
@@ -46,9 +47,13 @@ public class BreakContractSettlementOwnerFeignController {
}
}
@ApiOperation
(
value
=
"货主客户端货主确认生成违约结算单"
)
@ApiOperation
(
value
=
"货主客户端货主确认生成违约结算单"
)
@PostMapping
(
"/saveBreakContractSettlement"
)
@PostMapping
(
"/updateBreakContract"
)
Result
saveBreakContractSettlement
(
@RequestBody
@Validated
BreakContractSettlementGenerateAction
param
){
Result
updateBreakContract
(
@RequestBody
@Validated
BreakContractSettlementGenerateAction
param
){
breakContractOwnerRecordService
.
generateBreakContractSettlement
(
param
.
getBreakContractId
());
OwnerConfirmBreakContractSettlementParam
settlementParam
=
new
OwnerConfirmBreakContractSettlementParam
();
settlementParam
.
setConfirmStatus
(
param
.
getConfirmStatus
());
settlementParam
.
setId
(
param
.
getBreakContractId
());
settlementParam
.
setRejectReason
(
param
.
getRejectReason
());
breakContractOwnerRecordService
.
updateConfirmStatus
(
settlementParam
);
return
Result
.
ok
();
return
Result
.
ok
();
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论