Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
cce5147c
提交
cce5147c
authored
3月 23, 2024
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
测试取消订单
上级
99c8ae9e
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
14 行增加
和
9 行删除
+14
-9
pom.xml
performance-api/pom.xml
+6
-0
PerformanceSDKFeign.java
...n/java/com/clx/performance/feign/PerformanceSDKFeign.java
+2
-1
pom.xml
performance-web/pom.xml
+0
-5
PerformanceSdkFeignController.java
...mance/controller/feign/PerformanceSdkFeignController.java
+6
-3
没有找到文件。
performance-api/pom.xml
浏览文件 @
cce5147c
...
@@ -44,6 +44,12 @@
...
@@ -44,6 +44,12 @@
<groupId>
com.msl
</groupId>
<groupId>
com.msl
</groupId>
<artifactId>
convertor-spring-boot-starter
</artifactId>
<artifactId>
convertor-spring-boot-starter
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.clx.cy
</groupId>
<artifactId>
open-sdk
</artifactId>
</dependency>
</dependencies>
</dependencies>
...
...
performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
浏览文件 @
cce5147c
package
com
.
clx
.
performance
.
feign
;
package
com
.
clx
.
performance
.
feign
;
import
com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.msl.common.result.Result
;
import
com.msl.common.result.Result
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
@@ -17,6 +18,6 @@ public interface PerformanceSDKFeign {
...
@@ -17,6 +18,6 @@ public interface PerformanceSDKFeign {
@GetMapping
(
value
=
{
"clx-performance/feign/sdk/orderCancelResidueWeight"
})
@GetMapping
(
value
=
{
"clx-performance/feign/sdk/orderCancelResidueWeight"
})
Result
<
String
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
);
Result
<
OwnerCancelResidueWeightDTO
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
);
}
}
performance-web/pom.xml
浏览文件 @
cce5147c
...
@@ -51,11 +51,6 @@
...
@@ -51,11 +51,6 @@
<artifactId>
message-api
</artifactId>
<artifactId>
message-api
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.clx.cy
</groupId>
<artifactId>
open-sdk
</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>
com.msl
</groupId>
<groupId>
com.msl
</groupId>
<artifactId>
user-sdk
</artifactId>
<artifactId>
user-sdk
</artifactId>
...
...
performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
浏览文件 @
cce5147c
package
com
.
clx
.
performance
.
controller
.
feign
;
package
com
.
clx
.
performance
.
controller
.
feign
;
import
com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.clx.performance.param.pc.OrderCancelParam
;
import
com.msl.common.result.Result
;
import
com.msl.common.result.Result
;
import
com.msl.user.utils.TokenUtil
;
import
com.msl.user.utils.TokenUtil
;
...
@@ -24,7 +25,7 @@ public class PerformanceSdkFeignController {
...
@@ -24,7 +25,7 @@ public class PerformanceSdkFeignController {
@ApiOperation
(
value
=
"货主端取消订单"
,
notes
=
"<br>By:胡宇帆"
)
@ApiOperation
(
value
=
"货主端取消订单"
,
notes
=
"<br>By:胡宇帆"
)
@PostMapping
(
"/ownCancelOrderPre"
)
@PostMapping
(
"/ownCancelOrderPre"
)
public
Result
<
String
>
ownCancelOrderPre
(
@RequestBody
OrderCancelParam
param
)
{
public
Result
<
Object
>
ownCancelOrderPre
(
@RequestBody
OrderCancelParam
param
)
{
log
.
info
(
"取消订单参数:{}"
,
TokenUtil
.
getLoginUserInfo
());
log
.
info
(
"取消订单参数:{}"
,
TokenUtil
.
getLoginUserInfo
());
//orderCancelService.ownerCancelOrderPre(param);
//orderCancelService.ownerCancelOrderPre(param);
return
Result
.
ok
();
return
Result
.
ok
();
...
@@ -32,9 +33,11 @@ public class PerformanceSdkFeignController {
...
@@ -32,9 +33,11 @@ public class PerformanceSdkFeignController {
@ApiOperation
(
value
=
"获取当前订单可取消吨数"
,
notes
=
"<br>By:胡宇帆"
)
@ApiOperation
(
value
=
"获取当前订单可取消吨数"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/orderCancelResidueWeight"
)
@GetMapping
(
"/orderCancelResidueWeight"
)
public
Result
<
String
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
)
{
public
Result
<
OwnerCancelResidueWeightDTO
>
orderCancelResidueWeight
(
@RequestParam
(
value
=
"orderNo"
)
String
orderNo
,
@RequestParam
(
value
=
"optionType"
)
String
optionType
)
{
log
.
info
(
"当前订单可取消吨数参数:{}"
,
TokenUtil
.
getLoginUserInfo
());
log
.
info
(
"当前订单可取消吨数参数:{}"
,
TokenUtil
.
getLoginUserInfo
());
//orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
//orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
return
Result
.
ok
(
new
BigDecimal
(
100
).
toString
());
OwnerCancelResidueWeightDTO
dto
=
new
OwnerCancelResidueWeightDTO
();
dto
.
setWeight
(
new
BigDecimal
(
"100"
).
toString
());
return
Result
.
ok
(
dto
);
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论