记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
a21aaa56
Commit
a21aaa56
authored
Jun 26, 2026
by
wangyifan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退款列表请求参数支持多个状态查询
parent
98914df3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
8 deletions
+25
-8
GoblinStoreBackOrderStatusCountVo.java
...vice/goblin/dto/vo/GoblinStoreBackOrderStatusCountVo.java
+8
-0
IGoblinStoreBackOrderService.java
...e/goblin/service/manage/IGoblinStoreBackOrderService.java
+1
-1
GoblinStoreBackOrderController.java
...lin/controller/manage/GoblinStoreBackOrderController.java
+2
-2
GoblinStoreBackOrderServiceImpl.java
.../service/impl/manage/GoblinStoreBackOrderServiceImpl.java
+1
-1
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+13
-4
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreBackOrderStatusCountVo.java
View file @
a21aaa56
...
@@ -47,6 +47,12 @@ public class GoblinStoreBackOrderStatusCountVo {
...
@@ -47,6 +47,12 @@ public class GoblinStoreBackOrderStatusCountVo {
@ApiModelProperty
(
"退货失败[status=9]"
)
@ApiModelProperty
(
"退货失败[status=9]"
)
private
long
returnFailed
;
private
long
returnFailed
;
@ApiModelProperty
(
"退款失败[status=10]"
)
private
long
refundFailed
;
@ApiModelProperty
(
"取消退款[status=11]"
)
private
long
refundCancelled
;
/**
/**
* 从 Mongo 按 status 分组统计结果组装 VO。
* 从 Mongo 按 status 分组统计结果组装 VO。
*/
*/
...
@@ -63,6 +69,8 @@ public class GoblinStoreBackOrderStatusCountVo {
...
@@ -63,6 +69,8 @@ public class GoblinStoreBackOrderStatusCountVo {
vo
.
waitReceive
=
grouped
.
getOrDefault
(
7
,
0L
);
vo
.
waitReceive
=
grouped
.
getOrDefault
(
7
,
0L
);
vo
.
returnCompleted
=
grouped
.
getOrDefault
(
8
,
0L
);
vo
.
returnCompleted
=
grouped
.
getOrDefault
(
8
,
0L
);
vo
.
returnFailed
=
grouped
.
getOrDefault
(
9
,
0L
);
vo
.
returnFailed
=
grouped
.
getOrDefault
(
9
,
0L
);
vo
.
refundFailed
=
grouped
.
getOrDefault
(
10
,
0L
);
vo
.
refundCancelled
=
grouped
.
getOrDefault
(
11
,
0L
);
return
vo
;
return
vo
;
}
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreBackOrderService.java
View file @
a21aaa56
...
@@ -16,7 +16,7 @@ public interface IGoblinStoreBackOrderService {
...
@@ -16,7 +16,7 @@ public interface IGoblinStoreBackOrderService {
String
cet
,
String
cet
,
String
orderCode
,
String
orderCode
,
String
spuName
,
String
spuName
,
Integer
status
);
String
status
);
ResponseDto
<
GoblinBackOrderDetailsVo
>
orderDetails
(
String
backOrderId
);
ResponseDto
<
GoblinBackOrderDetailsVo
>
orderDetails
(
String
backOrderId
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreBackOrderController.java
View file @
a21aaa56
...
@@ -37,7 +37,7 @@ public class GoblinStoreBackOrderController {
...
@@ -37,7 +37,7 @@ public class GoblinStoreBackOrderController {
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"cet"
,
value
=
"申请终止时间"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"cet"
,
value
=
"申请终止时间"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"orderCode"
,
value
=
"订单编号"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"orderCode"
,
value
=
"订单编号"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"spuName"
,
value
=
"商品名称"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"String"
,
name
=
"spuName"
,
value
=
"商品名称"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"
Integer"
,
name
=
"status"
,
value
=
"审核状态[1-待审核(退款申请)|2-已退款(退款成功)|3-已驳回(退款拒绝)]
"
),
@ApiImplicitParam
(
type
=
"form"
,
required
=
false
,
dataType
=
"
String"
,
name
=
"status"
,
value
=
"审核状态,多个用英文逗号分隔。0-商铺发起退款|1-退款申请|2-退款成功|3-退款拒绝|4-退货申请|5-退货拒绝|6-待填物流|7-待收货|8-退货完成|9-退货失败|10-退款失败|11-取消退款
"
),
})
})
@GetMapping
(
value
=
"list"
)
@GetMapping
(
value
=
"list"
)
public
ResponseDto
<
GoblinStoreBackOrderListPageVo
>
orderBackList
(
@RequestParam
(
value
=
"page"
,
required
=
true
)
@Valid
Integer
page
,
public
ResponseDto
<
GoblinStoreBackOrderListPageVo
>
orderBackList
(
@RequestParam
(
value
=
"page"
,
required
=
true
)
@Valid
Integer
page
,
...
@@ -47,7 +47,7 @@ public class GoblinStoreBackOrderController {
...
@@ -47,7 +47,7 @@ public class GoblinStoreBackOrderController {
@RequestParam
(
value
=
"cet"
,
required
=
false
)
String
cet
,
@RequestParam
(
value
=
"cet"
,
required
=
false
)
String
cet
,
@RequestParam
(
value
=
"orderCode"
,
required
=
false
)
String
orderCode
,
@RequestParam
(
value
=
"orderCode"
,
required
=
false
)
String
orderCode
,
@RequestParam
(
value
=
"spuName"
,
required
=
false
)
String
spuName
,
@RequestParam
(
value
=
"spuName"
,
required
=
false
)
String
spuName
,
@RequestParam
(
value
=
"status"
,
required
=
false
)
Integer
status
)
{
@RequestParam
(
value
=
"status"
,
required
=
false
)
String
status
)
{
return
goblinStoreBackOrderService
.
orderBackList
(
page
,
orderBackCode
,
type
,
cst
,
cet
,
orderCode
,
spuName
,
status
);
return
goblinStoreBackOrderService
.
orderBackList
(
page
,
orderBackCode
,
type
,
cst
,
cet
,
orderCode
,
spuName
,
status
);
}
}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java
View file @
a21aaa56
...
@@ -44,7 +44,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
...
@@ -44,7 +44,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
GoblinRefundHelper
refundHelper
;
GoblinRefundHelper
refundHelper
;
@Override
@Override
public
ResponseDto
<
GoblinStoreBackOrderListPageVo
>
orderBackList
(
Integer
page
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
Integer
status
)
{
public
ResponseDto
<
GoblinStoreBackOrderListPageVo
>
orderBackList
(
Integer
page
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
String
status
)
{
List
<
GoblinStoreBackOrderListVo
>
listVos
=
ObjectUtil
.
goblinStoreBackOrderListVoArrayList
();
List
<
GoblinStoreBackOrderListVo
>
listVos
=
ObjectUtil
.
goblinStoreBackOrderListVoArrayList
();
String
uid
=
CurrentUtil
.
getCurrentUid
();
String
uid
=
CurrentUtil
.
getCurrentUid
();
GoblinStoreInfoVo
storeInfoVo
=
redisUtils
.
getStoreInfoVoByUid
(
uid
);
GoblinStoreInfoVo
storeInfoVo
=
redisUtils
.
getStoreInfoVoByUid
(
uid
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
a21aaa56
...
@@ -1499,7 +1499,7 @@ public class GoblinMongoUtils {
...
@@ -1499,7 +1499,7 @@ public class GoblinMongoUtils {
}
}
//商品退款订单列表
//商品退款订单列表
public
HashMap
<
String
,
Object
>
storeBackOrderList
(
String
storeId
,
Integer
page
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
Integer
status
)
{
public
HashMap
<
String
,
Object
>
storeBackOrderList
(
String
storeId
,
Integer
page
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
String
status
)
{
//查询销量
//查询销量
int
size
=
20
;
int
size
=
20
;
int
skipCount
=
((
page
-
1
)
*
size
);
int
skipCount
=
((
page
-
1
)
*
size
);
...
@@ -1526,10 +1526,19 @@ public class GoblinMongoUtils {
...
@@ -1526,10 +1526,19 @@ public class GoblinMongoUtils {
}
}
/** 列表查询条件(含 status Tab 筛选) */
/** 列表查询条件(含 status Tab 筛选) */
private
Criteria
storeBackOrderListCriteria
(
String
storeId
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
Integer
status
)
{
private
Criteria
storeBackOrderListCriteria
(
String
storeId
,
String
orderBackCode
,
Integer
type
,
String
cst
,
String
cet
,
String
orderCode
,
String
spuName
,
String
status
)
{
Criteria
criteria
=
storeBackOrderListBaseCriteria
(
storeId
,
orderBackCode
,
type
,
cst
,
cet
,
orderCode
,
spuName
);
Criteria
criteria
=
storeBackOrderListBaseCriteria
(
storeId
,
orderBackCode
,
type
,
cst
,
cet
,
orderCode
,
spuName
);
if
(
status
!=
null
)
{
if
(
StringUtils
.
isNotBlank
(
status
))
{
criteria
=
criteria
.
and
(
"status"
).
is
(
status
);
List
<
Integer
>
statusList
=
new
ArrayList
<>();
for
(
String
part
:
status
.
split
(
","
))
{
String
trimmed
=
part
.
trim
();
if
(
StringUtils
.
isNotBlank
(
trimmed
))
{
statusList
.
add
(
Integer
.
valueOf
(
trimmed
));
}
}
if
(!
statusList
.
isEmpty
())
{
criteria
=
criteria
.
and
(
"status"
).
in
(
statusList
);
}
}
}
return
criteria
;
return
criteria
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment