- 添加修改金额

- 添加备注
- 添加取消订单操作

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

@@ -36,6 +36,22 @@ public class AdminsOrderController {
         return orderService.getOrderPage(orderQueryDTO);
     }
 
+    @PutMapping("update_remark")
+    @ApiOperation("更新-更新订单备注")
+    public CommonResult updateRemark(@RequestParam("orderId") Integer orderId,
+                                     @RequestParam("remark") String remark) {
+        return orderService.updateOrderRemake(orderId, remark);
+    }
+
+    @PutMapping("cancel_order")
+    @ApiOperation("取消订单")
+    public CommonResult cancelOrder(
+            @RequestParam("orderId") Integer orderId,
+            @RequestParam("reasons") Integer reasons,
+            @RequestParam(value = "otherReasons", required = false) String otherReasons) {
+        return orderService.cancelOrder(orderId, reasons, otherReasons);
+    }
+
     @PutMapping("order_item/update_pay_amount")
     @ApiOperation("更新-订单item实付金额")
     public CommonResult updateOrderItemPayAmount(@RequestParam("orderId") Integer orderId,

order/order-application/src/main/java/cn/iocoder/mall/order/application/vo/OrderPageQueryVO.java

@@ -59,6 +59,8 @@ public class OrderPageQueryVO implements Serializable {
     /**
      * 删除状态
      */
+    @ApiModelProperty("订单状态")
+    private Integer status;
     @ApiModelProperty("删除状态")
     private Integer deleted;
     @ApiModelProperty("分页pageNo")
@@ -78,6 +80,7 @@ public class OrderPageQueryVO implements Serializable {
                 ", endCreateTime=" + endCreateTime +
                 ", startClosingTime=" + startClosingTime +
                 ", endClosingTime=" + endClosingTime +
+                ", status=" + status +
                 ", deleted=" + deleted +
                 ", pageNo=" + pageNo +
                 ", pageSize=" + pageSize +
@@ -165,6 +168,15 @@ public class OrderPageQueryVO implements Serializable {
         return this;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public OrderPageQueryVO setStatus(Integer status) {
+        this.status = status;
+        return this;
+    }
+
     public Integer getDeleted() {
         return deleted;
     }