Commit 816c15a2 by rui.zhu

Merge branch 'feature/rui.zhu/付费会员卡系列优化-20240312' into develop

parents 8204300f 0abf889a
...@@ -987,6 +987,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -987,6 +987,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setRefundState(cancelOrderRequest.getRefundState()); request.setRefundState(cancelOrderRequest.getRefundState());
request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount()); request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());
request.setPayRefundItemList(cancelOrderRequest.getPayRefundItemList()); request.setPayRefundItemList(cancelOrderRequest.getPayRefundItemList());
request.setReqAmount(cancelOrderRequest.getReqAmount());
com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response); return orderSdkAdapter.convent2BaseOrderResponse(response);
} }
......
...@@ -210,6 +210,7 @@ public class SaasOrderHandle { ...@@ -210,6 +210,7 @@ public class SaasOrderHandle {
//作废订单 //作废订单
CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean); CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
cancelOrderRequest.setOperationClient(request.getOperationClient()); cancelOrderRequest.setOperationClient(request.getOperationClient());
cancelOrderRequest.setReqAmount(refundResponse.getRefundAmount());
List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>(); List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>();
if (!CollectionUtils.isEmpty(refundResponse.getPayRefundItemList())) { if (!CollectionUtils.isEmpty(refundResponse.getPayRefundItemList())) {
......
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