记得上下班打卡 | 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
33c0f916
Commit
33c0f916
authored
Feb 25, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 退款订单列表
parent
62097021
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
GoblinStoreBackOrderListVo.java
...net/service/goblin/dto/vo/GoblinStoreBackOrderListVo.java
+3
-3
GoblinStoreBackOrderServiceImpl.java
.../service/impl/manage/GoblinStoreBackOrderServiceImpl.java
+3
-3
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+0
-3
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreBackOrderListVo.java
View file @
33c0f916
...
...
@@ -17,11 +17,11 @@ public class GoblinStoreBackOrderListVo implements Cloneable {
@ApiModelProperty
(
value
=
"订单号"
)
private
String
orderCode
;
@ApiModelProperty
(
value
=
"类型[1-退款|2-退货]"
)
private
String
type
;
private
Integer
type
;
@ApiModelProperty
(
value
=
"退款/退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过,等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)"
)
private
String
status
;
private
Integer
status
;
@ApiModelProperty
(
value
=
" 退款金额"
)
private
String
realBackPrice
;
private
BigDecimal
realBackPrice
;
@ApiModelProperty
(
value
=
" 创建时间"
)
private
String
createdAt
;
@ApiModelProperty
(
value
=
"退款sku"
)
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java
View file @
33c0f916
...
...
@@ -58,9 +58,9 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
vo
.
setBackCode
(
item
.
getBackCode
());
vo
.
setBackOrderSkuVos
(
item
.
getBackOrderSkuVos
());
vo
.
setOrderCode
(
item
.
getOrderCode
());
vo
.
setRealBackPrice
(
item
.
get
BackOrderId
());
vo
.
setStatus
(
item
.
get
BackOrderId
());
vo
.
setType
(
item
.
get
BackOrderId
());
vo
.
setRealBackPrice
(
item
.
get
RealBackPrice
());
vo
.
setStatus
(
item
.
get
Status
());
vo
.
setType
(
item
.
get
Type
());
listVos
.
add
(
vo
);
}
PageInfo
<
GoblinStoreBackOrderListVo
>
pageInfo
=
new
PageInfo
(
listVos
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
33c0f916
...
...
@@ -946,9 +946,6 @@ public class GoblinMongoUtils {
if
(
status
!=
null
)
{
criteria
=
criteria
.
and
(
"status"
).
is
(
status
);
}
if
(
status
!=
null
)
{
criteria
=
criteria
.
and
(
"status"
).
is
(
status
);
}
if
(
type
!=
null
)
{
criteria
=
criteria
.
and
(
"type"
).
is
(
type
);
}
...
...
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