Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
9fa04743
提交
9fa04743
authored
11月 11, 2023
作者:
huningning
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
分页问题修复
上级
31261ab9
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
2 行增加
和
10 行删除
+2
-10
OrderChildCancelRecordParam.java
...clx/performance/param/pc/OrderChildCancelRecordParam.java
+0
-2
OrderCancelController.java
.../clx/performance/controller/pc/OrderCancelController.java
+1
-1
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+0
-6
OrderChildSqlProvider.java
...om/clx/performance/sqlProvider/OrderChildSqlProvider.java
+1
-1
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/pc/OrderChildCancelRecordParam.java
浏览文件 @
9fa04743
...
@@ -7,6 +7,4 @@ import java.util.List;
...
@@ -7,6 +7,4 @@ import java.util.List;
@Data
@Data
public
class
OrderChildCancelRecordParam
extends
PageParam
{
public
class
OrderChildCancelRecordParam
extends
PageParam
{
private
List
<
Integer
>
childStatusList
;
}
}
performance-web/src/main/java/com/clx/performance/controller/pc/OrderCancelController.java
浏览文件 @
9fa04743
...
@@ -63,7 +63,7 @@ public class OrderCancelController {
...
@@ -63,7 +63,7 @@ public class OrderCancelController {
@ApiOperation
(
value
=
"取消运单记录"
,
notes
=
"<br>By:胡宇帆"
)
@ApiOperation
(
value
=
"取消运单记录"
,
notes
=
"<br>By:胡宇帆"
)
@PostMapping
(
"/orderChildCancelRecord"
)
@PostMapping
(
"/orderChildCancelRecord"
)
public
Result
<
PageData
<
OrderChildVO
>>
orderChildCancelRecord
(
OrderChildCancelRecordParam
param
)
{
public
Result
<
PageData
<
OrderChildVO
>>
orderChildCancelRecord
(
@RequestBody
OrderChildCancelRecordParam
param
)
{
IPage
<
OrderChildVO
>
page
=
orderCancelService
.
orderChildCancelRecord
(
param
);
IPage
<
OrderChildVO
>
page
=
orderCancelService
.
orderChildCancelRecord
(
param
);
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
return
Result
.
page
(
page
.
getRecords
(),
page
.
getTotal
(),
page
.
getPages
());
}
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
9fa04743
...
@@ -727,12 +727,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -727,12 +727,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
@Override
@Override
public
IPage
<
OrderChildVO
>
orderChildCancelRecord
(
OrderChildCancelRecordParam
param
)
{
public
IPage
<
OrderChildVO
>
orderChildCancelRecord
(
OrderChildCancelRecordParam
param
)
{
List
<
Integer
>
listStatus
=
new
ArrayList
<>();
listStatus
.
add
(
OrderChildEnum
.
Status
.
PLATFORM_CANCEL
.
getCode
());
listStatus
.
add
(
OrderChildEnum
.
Status
.
OWNER_CANCEL
.
getCode
());
listStatus
.
add
(
OrderChildEnum
.
Status
.
ARTIFICIAL_CANCEL
.
getCode
());
param
.
setChildStatusList
(
listStatus
);
IPage
<
OrderChildVO
>
page
=
orderChildDao
.
orderChildCancelRecord
(
param
);
IPage
<
OrderChildVO
>
page
=
orderChildDao
.
orderChildCancelRecord
(
param
);
if
(!
page
.
getRecords
().
isEmpty
())
{
if
(!
page
.
getRecords
().
isEmpty
())
{
String
orderNo
=
page
.
getRecords
().
get
(
0
).
getOrderNo
();
String
orderNo
=
page
.
getRecords
().
get
(
0
).
getOrderNo
();
...
...
performance-web/src/main/java/com/clx/performance/sqlProvider/OrderChildSqlProvider.java
浏览文件 @
9fa04743
...
@@ -180,7 +180,7 @@ public class OrderChildSqlProvider {
...
@@ -180,7 +180,7 @@ public class OrderChildSqlProvider {
);
);
FROM
(
"order_child "
);
FROM
(
"order_child "
);
WHERE
(
"status in ("
+
StringUtils
.
join
(
param
.
getChildStatusList
()
,
","
)+
")"
);
WHERE
(
"status in ("
+
StringUtils
.
join
(
OrderChildEnum
.
CANCEL_lIST
,
","
)+
")"
);
ORDER_BY
(
"create_time desc"
);
ORDER_BY
(
"create_time desc"
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论