Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
357fc451
Commit
357fc451
authored
Dec 16, 2019
by
Junling Bu
Browse files
feat[litemall-admin, litemall-admin-api]: 管理后台显示退款信息详情
parent
0d017bde
Changes
2
Hide whitespace changes
Inline
Side-by-side
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
View file @
357fc451
...
@@ -136,9 +136,15 @@ public class AdminOrderService {
...
@@ -136,9 +136,15 @@ public class AdminOrderService {
return
ResponseUtil
.
fail
(
ORDER_REFUND_FAILED
,
"订单退款失败"
);
return
ResponseUtil
.
fail
(
ORDER_REFUND_FAILED
,
"订单退款失败"
);
}
}
LocalDateTime
now
=
LocalDateTime
.
now
();
// 设置订单取消状态
// 设置订单取消状态
order
.
setOrderStatus
(
OrderUtil
.
STATUS_REFUND_CONFIRM
);
order
.
setOrderStatus
(
OrderUtil
.
STATUS_REFUND_CONFIRM
);
order
.
setEndTime
(
LocalDateTime
.
now
());
order
.
setEndTime
(
now
);
// 记录订单退款相关信息
order
.
setRefundAmount
(
order
.
getActualPrice
());
order
.
setRefundType
(
"微信退款接口"
);
order
.
setRefundContent
(
wxPayRefundResult
.
getRefundId
());
order
.
setRefundTime
(
now
);
if
(
orderService
.
updateWithOptimisticLocker
(
order
)
==
0
)
{
if
(
orderService
.
updateWithOptimisticLocker
(
order
)
==
0
)
{
throw
new
RuntimeException
(
"更新数据已失效"
);
throw
new
RuntimeException
(
"更新数据已失效"
);
}
}
...
...
litemall-admin/src/views/mall/order.vue
View file @
357fc451
...
@@ -99,6 +99,12 @@
...
@@ -99,6 +99,12 @@
<span>
(快递单号){{ orderDetail.order.shipSn }}
</span>
<span>
(快递单号){{ orderDetail.order.shipSn }}
</span>
<span>
(发货时间){{ orderDetail.order.shipTime }}
</span>
<span>
(发货时间){{ orderDetail.order.shipTime }}
</span>
</el-form-item>
</el-form-item>
<el-form-item
label=
"退款信息"
>
<span>
(退款金额){{ orderDetail.order.refundAmount }}元
</span>
<span>
(退款类型){{ orderDetail.order.refundType }}
</span>
<span>
(退款备注){{ orderDetail.order.refundContent }}
</span>
<span>
(退款时间){{ orderDetail.order.refundTime }}
</span>
</el-form-item>
<el-form-item
label=
"收货信息"
>
<el-form-item
label=
"收货信息"
>
<span>
(确认收货时间){{ orderDetail.order.confirmTime }}
</span>
<span>
(确认收货时间){{ orderDetail.order.confirmTime }}
</span>
</el-form-item>
</el-form-item>
...
...
Write
Preview
Supports
Markdown
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