Commit 3e5a627a by zhiheng.zhang

sdk 升级

parent 3012c6dc
...@@ -380,4 +380,10 @@ public interface OrderCenterSdkService { ...@@ -380,4 +380,10 @@ public interface OrderCenterSdkService {
*/ */
BaseOrderResponse editAfterSalesExpress(EditAfterSalesExpressRequest afterSalesExpressRequest); BaseOrderResponse editAfterSalesExpress(EditAfterSalesExpressRequest afterSalesExpressRequest);
/**
* 订单拒绝退款 POS
*/
BaseOrderResponse mallOrderRefundReject(CancelOrderRequest cancelOrderRequest);
} }
...@@ -2098,4 +2098,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -2098,4 +2098,17 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultGoodsReturned(request, afterSalesExpressRequest.getTrackingNo()); com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultGoodsReturned(request, afterSalesExpressRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response); return orderSdkAdapter.convent2BaseOrderResponse(response);
} }
@Override
public BaseOrderResponse mallOrderRefundReject(CancelOrderRequest cancelOrderRequest) {
AfterSalesOperateReq request = new AfterSalesOperateReq();
request.setOrderClient(OrderClientType.SAASMALL.getIndex());
request.setPartnerId(cancelOrderRequest.getPartnerId());
request.setOrderCode(cancelOrderRequest.getOrderId());
request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());
request.setAdultRemark(cancelOrderRequest.getReason());
request.setOperator(cancelOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
} }
...@@ -85,32 +85,6 @@ public class MallOrderHandle { ...@@ -85,32 +85,6 @@ public class MallOrderHandle {
} }
/** /**
* 麦咖啡拒绝退款
* @param request
* @param orderBean
* @return
*/
public BaseResponse mcCafeRefundReject(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
CancelOrderRequest rejectRefundRequest = orderSdkAdapter.getRejectRefundRequest(request.getOperator(), request.getReason(), orderBean);
BaseOrderResponse baseOrderResponse = null;
for(int i=0;i<orderBean.getRefundList().size();i++) {
if (RefundStatus.APPLY_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
rejectRefundRequest.setAfterSalesCode(orderBean.getRefundList().get(i).getRid());
baseOrderResponse = orderCenterSdkService.orderRefundReject(rejectRefundRequest);
}
if (RefundStatus.COMPLETE_REFUND.getCode().equals(orderBean.getRefundList().get(i).getStatus())) {
baseOrderResponse = new BaseOrderResponse();
baseOrderResponse.setErrcode(100);
baseOrderResponse.setErrmsg("success");
}
}
if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
return ResponseUtil.error(ResponseResult.REJECT_REFUND_ORDER_FAIL);
}
return ResponseUtil.success();
}
/**
* 同意退款 * 同意退款
* *
* @param request * @param request
...@@ -119,7 +93,7 @@ public class MallOrderHandle { ...@@ -119,7 +93,7 @@ public class MallOrderHandle {
*/ */
public BaseResponse mallOrderAgreeApply(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) { public BaseResponse mallOrderAgreeApply(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest("", request.getReason(), request.getOperator(), orderBean); BaseQueryOrderRequest refundAgreeRequest = orderSdkAdapter.getRefundAgreeRequest("", request.getReason(), request.getOperator(), orderBean);
BaseOrderResponse baseOrderResponse = orderCenterSdkService.mallOrderAgreeApply(refundAgreeRequest); BaseOrderResponse baseOrderResponse = orderCenterSdkService.mallOrderRefundReject(refundAgreeRequest);
if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) { if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
return ResponseUtil.error(ResponseResult.AGREE_REFUND_APPLY_ORDER_FAIL); return ResponseUtil.error(ResponseResult.AGREE_REFUND_APPLY_ORDER_FAIL);
} }
......
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