diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 7976f30e6..0e3e235ad 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -6,10 +6,13 @@ import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; +import com.jsowell.pile.dto.ApplyRefundDTO; import com.jsowell.pile.dto.ManualSettlementDTO; import com.jsowell.pile.dto.QueryMerchantOrderDTO; import com.jsowell.pile.dto.QueryOrderDTO; @@ -162,4 +165,24 @@ public class OrderBasicInfoController extends BaseController { public TableDataInfo getMerchantOrderList(@RequestBody QueryMerchantOrderDTO dto) { return getDataTable(orderBasicInfoService.getMerchantOrderInfoList(dto)); } + + /** + * 重试订单退款接口 + * http://localhost:8080/order/retryRefundOrder + */ + @PostMapping("/retryRefundOrder") + public RestApiResponse retryRefundOrder(@RequestBody ApplyRefundDTO dto) { + RestApiResponse response; + try { + orderBasicInfoService.retryRefundOrder(dto.getOrderCode()); + response = new RestApiResponse<>(); + } catch (BusinessException e) { + logger.error("重试订单退款接口 error,", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("重试订单退款接口 error,", e); + response = new RestApiResponse<>(e); + } + return response; + } } diff --git a/jsowell-ui/src/api/order/order.js b/jsowell-ui/src/api/order/order.js index 82cf46eba..f1b2c3213 100644 --- a/jsowell-ui/src/api/order/order.js +++ b/jsowell-ui/src/api/order/order.js @@ -68,3 +68,12 @@ export function getMerchantOrderList(data) { data: data }) } + +// 试订单退款接口 +export function retryRefundOrder(data) { + return request({ + url: '/order/retryRefundOrder', + method: 'post', + data: data + }) +} diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 592e752d9..3c3d6a47a 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -247,7 +247,7 @@