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
a4562544
Commit
a4562544
authored
Jan 09, 2023
by
咸鱼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:部分退款金额未set
parent
a7584850
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletions
+15
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+2
-0
order-application-service/src/main/java/cn/freemud/service/RefundService.java
+1
-1
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
+12
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
a4562544
...
...
@@ -872,6 +872,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request
.
setPartnerId
(
cancelOrderRequest
.
getPartnerId
());
request
.
setOrderCode
(
cancelOrderRequest
.
getOrderId
());
request
.
setReqRemark
(
cancelOrderRequest
.
getReqRemark
());
request
.
setReqAmount
(
cancelOrderRequest
.
getReqAmount
());
request
.
setPartRefund
(
cancelOrderRequest
.
isPartRefund
());
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
request
.
setAfterSalesType
(
cancelOrderRequest
.
getAfterSalesType
().
getIndex
()
==
null
?
1
:
cancelOrderRequest
.
getAfterSalesType
().
getIndex
());
...
...
order-application-service/src/main/java/cn/freemud/service/RefundService.java
View file @
a4562544
...
...
@@ -228,7 +228,7 @@ public class RefundService {
*/
private
boolean
isRefundDeliveryFee
(
OrderInfoReqs
order
,
Long
refundAmount
)
{
// 退款金额小于实付金额的情况,表示部分退不需要退配送费
if
(
refundAmount
!=
null
&&
refundAmount
<
order
.
get
ActualPay
Amount
().
longValue
())
{
if
(
refundAmount
!=
null
&&
refundAmount
<
order
.
get
Settlement
Amount
().
longValue
())
{
return
false
;
}
boolean
refundDeliveryFee
=
true
;
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
View file @
a4562544
...
...
@@ -15,6 +15,8 @@ package com.freemud.application.sdk.api.ordercenter.request;
import
com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@Data
public
class
OrderCancelReq
{
...
...
@@ -85,4 +87,14 @@ public class OrderCancelReq {
* 售后退款状态 0:未定义(存量数据) 1:未退款 2:退款中 3:退款失败 4:已退款
*/
private
Integer
refundState
;
/**
* 部分退申请金额
*/
private
BigDecimal
reqAmount
;
/**
* 是否部分退,默认否(全退)
*/
private
boolean
isPartRefund
=
false
;
}
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