Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
84a9ea52
提交
84a9ea52
authored
8月 09, 2024
作者:
刘海泉
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加获取订单可提取吨数的sdk feign接口
上级
ce6741a1
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
27 行增加
和
3 行删除
+27
-3
PerformanceSDKFeign.java
...n/java/com/clx/performance/feign/PerformanceSDKFeign.java
+7
-1
PerformanceSdkFeignController.java
...mance/controller/feign/PerformanceSdkFeignController.java
+20
-2
没有找到文件。
performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
浏览文件 @
84a9ea52
package
com
.
clx
.
performance
.
feign
;
import
com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction
;
import
com.clx.open.sdk.request.
action.GetOwnerAccountInfoAction
;
import
com.clx.open.sdk.request.
dto.OrderCanExtractWeightDTO
;
import
com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.vo.pc.OwnerAccountAllVO
;
...
...
@@ -34,4 +34,10 @@ public interface PerformanceSDKFeign {
@PostMapping
(
"clx-performance/feign/sdk/getOwnerRuleFile"
)
Result
<
BreakContractOwnerRuleFileVO
>
getOwnerRuleFile
(
@RequestBody
GetOrderBreakContractOwnerRuleFileAction
action
);
@GetMapping
(
value
=
{
"clx-performance/feign/sdk/getOrderCanExtractWeight"
})
Result
<
OrderCanExtractWeightDTO
>
getOrderCanExtractWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
);
}
performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
浏览文件 @
84a9ea52
package
com
.
clx
.
performance
.
controller
.
feign
;
import
com.clx.open.sdk.request.action.GetOrderBreakContractOwnerRuleFileAction
;
import
com.clx.open.sdk.request.
action.GetOwnerAccountInfoAction
;
import
com.clx.open.sdk.request.
dto.OrderCanExtractWeightDTO
;
import
com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.service.OrderCancelService
;
import
com.clx.performance.service.OrderGoodsService
;
import
com.clx.performance.service.OrderWeightService
;
import
com.clx.performance.service.OwnerAccountService
;
import
com.clx.performance.service.breakcontract.BreakContractOwnerRuleService
;
import
com.clx.performance.vo.feign.OrderExtractWeightVO
;
import
com.clx.performance.vo.pc.OwnerAccountAllVO
;
import
com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleFileVO
;
import
com.msl.common.result.Result
;
...
...
@@ -16,10 +18,11 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
java
.math.BigDecimal
;
import
java
x.validation.constraints.NotBlank
;
@Slf4j
@RestController
...
...
@@ -38,6 +41,10 @@ public class PerformanceSdkFeignController {
private
final
BreakContractOwnerRuleService
breakContractOwnerRuleService
;
private
final
OrderWeightService
orderWeightService
;
@ApiOperation
(
value
=
"货主端取消订单"
,
notes
=
"<br>By:胡宇帆"
)
@PostMapping
(
"/ownCancelOrderPre"
)
...
...
@@ -67,4 +74,15 @@ public class PerformanceSdkFeignController {
return
Result
.
ok
(
breakContractOwnerRuleService
.
getRuleFile
(
action
.
getId
()));
}
@ApiOperation
(
value
=
"获取当前订单的可提取吨数"
,
notes
=
"<br>By:刘海泉"
)
@GetMapping
(
"/getOrderCanExtractWeight"
)
public
Result
<
OrderCanExtractWeightDTO
>
getOrderCanExtractWeight
(
@RequestParam
(
value
=
"orderNo"
)
@NotBlank
(
message
=
"订单编号不能为空"
)
String
orderNo
)
{
OrderExtractWeightVO
orderCanExtractWeight
=
orderWeightService
.
getOrderCanExtractWeight
(
orderNo
);
OrderCanExtractWeightDTO
data
=
new
OrderCanExtractWeightDTO
();
BeanUtils
.
copyProperties
(
orderCanExtractWeight
,
data
);
return
Result
.
ok
(
data
);
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论