- 退款流程基本走完

order/order-application/src/main/java/cn/iocoder/mall/order/application/controller/admins/AdminOrderReturnController.java

@@ -46,13 +46,13 @@ public class AdminOrderReturnController {
         return orderReturnService.orderReturnRefuse(id);
     }
 
-    @PostMapping("confirm_commodity")
-    public CommonResult confirmCommodity(@RequestParam("id") Integer id) {
+    @PostMapping("confirm_receipt")
+    public CommonResult confirmReceipt(@RequestParam("id") Integer id) {
         return orderReturnService.confirmReceipt(id);
     }
 
-    @PostMapping("confirm_order")
-    public CommonResult confirmOrder(HttpServletRequest request, @RequestParam("id") Integer id) {
+    @PostMapping("confirm_refund")
+    public CommonResult confirmRefund(HttpServletRequest request, @RequestParam("id") Integer id) {
         String ip = HttpUtil.getIp(request);
         return orderReturnService.refund(id, ip);
     }

order/order-application/src/main/java/cn/iocoder/mall/order/application/po/admin/OrderReturnQueryPO.java

@@ -2,6 +2,7 @@ package cn.iocoder.mall.order.application.po.admin;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -26,14 +27,24 @@ public class OrderReturnQueryPO implements Serializable {
      * 订单编号
      */
     private Integer orderNo;
+    /**
+     * 服务号
+     */
+    private String serviceNumber;
     /**
      * 创建时间 - 开始
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startCreateTime;
     /**
      * 创建时间 - 结束
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endCreateTime;
+    /**
+     * 状态
+     */
+    private Integer status;
 
     ///
     /// 分页信息