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
67b57ab0
Commit
67b57ab0
authored
Nov 16, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
拒单添加退款
parent
5b6b85fc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
1 deletions
+47
-1
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
+6
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderPayItemResp.java
+37
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
+4
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
View file @
67b57ab0
...
@@ -128,7 +128,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
...
@@ -128,7 +128,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
//支付退款
//支付退款
PayRefundResponse
refundResponse
=
new
PayRefundResponse
();
PayRefundResponse
refundResponse
=
new
PayRefundResponse
();
try
{
try
{
refundResponse
=
paymentHandle
.
refund
(
request
,
orderBean
);
if
(
orderBean
.
getPayChannelType
()
!=
"4"
){
refundResponse
=
paymentHandle
.
refund
(
request
,
orderBean
);
}
else
{
refundResponse
=
paymentHandle
.
multiRefund
(
orderBean
);
}
}
catch
(
OrderServiceException
orderEx
){
// 爱马哥兼容,不抛错
}
catch
(
OrderServiceException
orderEx
){
// 爱马哥兼容,不抛错
return
ResponseUtil
.
error
(
orderEx
.
getResult
());
return
ResponseUtil
.
error
(
orderEx
.
getResult
());
}
}
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderPayItemResp.java
0 → 100644
View file @
67b57ab0
package
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
OrderPayItemResp
{
private
Long
id
;
private
Long
orderId
;
private
String
orderCode
;
private
String
partnerId
;
private
String
storeId
;
private
String
payChannelType
;
private
String
payChannelName
;
private
String
operator
;
private
BigDecimal
payAmount
;
private
String
transId
;
private
String
fmTradeNo
;
private
String
outOrderNo
;
private
String
platformTradeNo
;
private
String
endTransTradeNo
;
}
\ No newline at end of file
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
View file @
67b57ab0
...
@@ -14,6 +14,7 @@ package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
...
@@ -14,6 +14,7 @@ package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp
;
import
com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -271,4 +272,7 @@ public class OrderInfoReqs {
...
@@ -271,4 +272,7 @@ public class OrderInfoReqs {
//支付渠道类型
//支付渠道类型
private
String
payChannelType
;
private
String
payChannelType
;
//订单支付详情
private
List
<
OrderPayItemResp
>
orderPayItemCreateReqList
;
}
}
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