src/main/java/com/zy/asrs/controller/OrderController.java
@@ -948,13 +948,17 @@ } @RequestMapping(value = "/order/update/auth") @ManagerAuth @ManagerAuth(memo = "修改订单状态") public R update(Order order) { if (Cools.isEmpty(order) || null == order.getId()) { return R.error("参数缺失"); } order.setUpdateBy(getUserId()); order.setUpdateTime(new Date()); Long settle = order.getSettle(); if (settle != null && settle == 6) { order.setMemo(Cools.isEmpty(order.getMemo()) ? "手动完结" : order.getMemo() + "手动完结"); } if (!orderService.updateById(order)) { throw new CoolException("修改订单失败"); }