Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
93b67d9f
Commit
93b67d9f
authored
Oct 09, 2023
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除支付方式(线下)才走支付退款判断
parent
842a7544
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+11
-11
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
93b67d9f
...
@@ -243,17 +243,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -243,17 +243,8 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
public
BaseResponse
<
OrderManagerResponse
>
orderAgreeRefund
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
public
BaseResponse
<
OrderManagerResponse
>
orderAgreeRefund
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
//取消配送单
//取消配送单
deliveryHandle
.
cancelDelivery
(
orderBean
,
request
);
deliveryHandle
.
cancelDelivery
(
orderBean
,
request
);
PayRefundResponse
refundResponse
;
// 支付退款 包括线上小程序付款的订单,订单宝其他支付方式收款(汇来米,收钱吧,现金,其他)老板通发起退款
if
(
PayType
.
ONLINE_PAY
.
getCode
().
equals
(
orderBean
.
getPayType
()))
{
PayRefundResponse
refundResponse
=
this
.
payRefundCommon
(
request
,
orderBean
);
//支付退款
refundResponse
=
this
.
payRefundCommon
(
request
,
orderBean
);
}
else
{
// 线下退款,直接默认为退款成功
refundResponse
=
new
PayRefundResponse
();
refundResponse
.
setRefundId
(
UUID
.
randomUUID
().
toString
().
replaceAll
(
"-"
,
""
));
refundResponse
.
setPayRefundStatus
(
PayRefundStatus
.
SUCCESS
);
refundResponse
.
setMessage
(
PayRefundStatus
.
SUCCESS
.
getDesc
());
}
// 退款异常
// 退款异常
if
(
refundResponse
.
getPayRefundStatus
().
getCode
().
compareTo
(
PayRefundStatus
.
COMPATIBILITY_STATUS
.
getCode
())
==
0
)
{
if
(
refundResponse
.
getPayRefundStatus
().
getCode
().
compareTo
(
PayRefundStatus
.
COMPATIBILITY_STATUS
.
getCode
())
==
0
)
{
return
ResponseUtil
.
error
(
refundResponse
.
getResult
());
return
ResponseUtil
.
error
(
refundResponse
.
getResult
());
...
@@ -282,8 +273,17 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -282,8 +273,17 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
/**
/**
* 拒单退款、同意退款、取消订单退款
* 拒单退款、同意退款、取消订单退款
* 小程序点餐订单退款,无单收银退款,订单宝扫码付、其他支付方式收款(汇来米,收钱吧,现金,其他)等有支付流水等退款
*/
*/
private
PayRefundResponse
payRefundCommon
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
private
PayRefundResponse
payRefundCommon
(
OrderManagerRequest
request
,
OrderBeanV1
orderBean
)
{
if
(
orderBean
.
getAmount
()
==
0
)
{
// 0元订单
PayRefundResponse
refundResponse
=
new
PayRefundResponse
();
refundResponse
.
setRefundId
(
UUID
.
randomUUID
().
toString
().
replaceAll
(
"-"
,
""
));
refundResponse
.
setPayRefundStatus
(
PayRefundStatus
.
SUCCESS
);
refundResponse
.
setMessage
(
PayRefundStatus
.
SUCCESS
.
getDesc
());
return
refundResponse
;
}
PayRefundResponse
refundResponse
=
paymentHandle
.
getCommonPayRefundResponse
(
request
,
orderBean
);
PayRefundResponse
refundResponse
=
paymentHandle
.
getCommonPayRefundResponse
(
request
,
orderBean
);
// 同意退款退款失败记录到订单售后单
// 同意退款退款失败记录到订单售后单
if
(
orderBean
.
getAfterSalesOrderResp
()
!=
null
&&
Objects
.
equals
(
PayRefundStatus
.
FAIL
.
getCode
(),
refundResponse
.
getPayRefundStatus
().
getCode
()))
{
if
(
orderBean
.
getAfterSalesOrderResp
()
!=
null
&&
Objects
.
equals
(
PayRefundStatus
.
FAIL
.
getCode
(),
refundResponse
.
getPayRefundStatus
().
getCode
()))
{
...
...
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