Commit 2b94ebde by 朱瑞

Merge branch 'feature/退款支持优化' into develop

parents 4ef04abd ddf5b1e7
...@@ -84,7 +84,7 @@ public class CancelOrderRequest extends BaseConfig { ...@@ -84,7 +84,7 @@ public class CancelOrderRequest extends BaseConfig {
* 是否部分退,默认否(全退) * 是否部分退,默认否(全退)
*/ */
@Builder.Default @Builder.Default
private boolean isPartRefund = false; private Boolean isPartRefund = false;
//用户预约时间,仅为预约单时存放 //用户预约时间,仅为预约单时存放
private String expectTime; private String expectTime;
......
...@@ -873,7 +873,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -873,7 +873,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setOrderCode(cancelOrderRequest.getOrderId()); request.setOrderCode(cancelOrderRequest.getOrderId());
request.setReqRemark(cancelOrderRequest.getReqRemark()); request.setReqRemark(cancelOrderRequest.getReqRemark());
request.setReqAmount(cancelOrderRequest.getReqAmount()); request.setReqAmount(cancelOrderRequest.getReqAmount());
request.setPartRefund(cancelOrderRequest.isPartRefund()); request.setIsPartRefund(cancelOrderRequest.getIsPartRefund());
//售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单 //售后单类型 1:其他取消 2:用户取消 3:商户取消 4:未支付超时关单 5:商户接单超时取消 6:商家拒单
// 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消, // 7:配送用户拒收 8:用户售后退货/售后退款 9:系统取消 10:客服取消 11:用户统一取消,
request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex()); request.setAfterSalesType(cancelOrderRequest.getAfterSalesType().getIndex() == null ? 1 : cancelOrderRequest.getAfterSalesType().getIndex());
......
...@@ -30,7 +30,7 @@ public class CancelOrderRequestAdapter { ...@@ -30,7 +30,7 @@ public class CancelOrderRequestAdapter {
req.setTrackingNo(LogThreadLocal.getTrackingNo()); req.setTrackingNo(LogThreadLocal.getTrackingNo());
req.setRefundSerialNo(refundId); req.setRefundSerialNo(refundId);
req.setPartRefund(refundAmount != null); // 是否部分退 req.setIsPartRefund(refundAmount != null); // 是否部分退
req.setReqAmount(refundAmount != null ? new BigDecimal(refundAmount) : null); // 退款金额 req.setReqAmount(refundAmount != null ? new BigDecimal(refundAmount) : null); // 退款金额
//操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一 //操作来源客户端 1:POS插件 2:小助手 3:开放平台 4:自动任务 5:用户端 6:系统 7:万象 8:太一
......
...@@ -96,5 +96,5 @@ public class OrderCancelReq { ...@@ -96,5 +96,5 @@ public class OrderCancelReq {
/** /**
* 是否部分退,默认否(全退) * 是否部分退,默认否(全退)
*/ */
private boolean isPartRefund = false; private Boolean isPartRefund = false;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment