diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java
index 993d272..aaef665 100644
--- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java
@@ -567,7 +567,7 @@ public class H5OrderService {
                 optHistory.setOrderId(order.getId());
                 optHistory.setOrderSn(order.getOrderSn());
                 optHistory.setOperateMan("系统");
-                optHistory.setOrderStatus(OrderStatus.COMPLETE.getType());
+                optHistory.setOrderStatus(OrderStatus.NOT_DELIVERED.getType());
                 optHistory.setCreateTime(optDate);
                 optHistory.setCreateBy(order.getMemberId());
                 optHistory.setUpdateBy(order.getMemberId());
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java
index 4257161..9d714aa 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java
@@ -6,6 +6,7 @@ import com.cyl.manager.oms.pojo.request.DealWithAftersaleRequest;
 import com.cyl.manager.oms.pojo.request.ManagerAftersaleOrderRequest;
 import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderDetailVO;
 import com.cyl.manager.oms.pojo.vo.ManagerRefundOrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -122,4 +123,10 @@ public class AftersaleController extends BaseController {
             }
         }
     }
+
+    @ApiOperation("查看日志")
+    @GetMapping("/log/{orderId}")
+    public ResponseEntity<List<OrderOperateHistoryVO>> log(@PathVariable Long orderId){
+        return ResponseEntity.ok(service.log(orderId));
+    }
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
index ae48fad..da55b93 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java
@@ -7,6 +7,7 @@ import com.cyl.manager.oms.pojo.request.DeliverProductRequest;
 import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest;
 import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO;
 import com.cyl.manager.oms.pojo.vo.ManagerOrderVO;
+import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
 import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
@@ -131,4 +132,11 @@ public class OrderController extends BaseController {
             }
         }
     }
+
+    @ApiOperation("订单日志")
+    @GetMapping("/log/{orderId}")
+    public ResponseEntity<List<OrderOperateHistoryVO>> log(@PathVariable Long orderId){
+        return ResponseEntity.ok(service.log(orderId));
+    }
+
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java
index 4f0ff32..3486a54 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java
@@ -6,8 +6,10 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.cyl.manager.oms.convert.OrderOperateHistoryConvert;
 import com.cyl.manager.oms.domain.Order;
 import com.cyl.manager.oms.domain.OrderItem;
 import com.cyl.manager.oms.domain.OrderOperateHistory;
@@ -54,6 +56,9 @@ public class AftersaleService {
     @Autowired
     private MemberMapper memberMapper;
 
+    @Autowired
+    private OrderOperateHistoryConvert historyConvert;
+
     /**
      * 查询订单售后
      *
@@ -222,6 +227,7 @@ public class AftersaleService {
         //所以目前只需要查看是否有待处理的售后单
         QueryWrapper<Aftersale> aftersaleQw = new QueryWrapper<>();
         aftersaleQw.eq("status", AftersaleStatus.APPLY.getType());
+        aftersaleQw.eq("order_id", request.getOrderId());
         Aftersale aftersale = aftersaleMapper.selectOne(aftersaleQw);
         if (aftersale == null){
             throw new RuntimeException("没有售后单");
@@ -251,6 +257,7 @@ public class AftersaleService {
         //封装售后wrapper
         UpdateWrapper<Aftersale> aftersaleWrapper = new UpdateWrapper<>();
         aftersaleWrapper.eq("order_id", request.getOrderId());
+        aftersaleWrapper.eq("status", AftersaleStatus.APPLY.getType());
         aftersaleWrapper.set("handle_man", user.getUser().getNickName());
         aftersaleWrapper.set("update_time", optDate);
         aftersaleWrapper.set("handle_time", optDate);
@@ -285,4 +292,13 @@ public class AftersaleService {
         }
         return "操作成功";
     }
+
+    public List<OrderOperateHistoryVO> log(Long orderId) {
+        LambdaQueryWrapper<OrderOperateHistory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrderOperateHistory::getOrderId, orderId);
+        wrapper.in(OrderOperateHistory::getOrderStatus, Arrays.asList(11, 12, 13, 14));
+        wrapper.orderByDesc(OrderOperateHistory::getCreateTime);
+        List<OrderOperateHistory> historyList = orderOperateHistoryMapper.selectList(wrapper);
+        return historyConvert.dos2vos(historyList);
+    }
 }
diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
index be77802..b833709 100644
--- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
+++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java
@@ -21,6 +21,7 @@ import com.cyl.h5.pojo.vo.SkuViewDTO;
 import com.cyl.h5.pojo.vo.form.OrderSubmitForm;
 import com.cyl.h5.pojo.vo.query.OrderH5Query;
 import com.cyl.manager.oms.convert.OrderConvert;
+import com.cyl.manager.oms.convert.OrderOperateHistoryConvert;
 import com.cyl.manager.oms.domain.OrderDeliveryHistory;
 import com.cyl.manager.oms.domain.OrderItem;
 import com.cyl.manager.oms.domain.OrderOperateHistory;
@@ -94,6 +95,8 @@ public class OrderService {
     private String aesKey;
     @Autowired
     private OrderDeliveryHistoryMapper orderDeliveryHistoryMapper;
+    @Autowired
+    private OrderOperateHistoryConvert historyConvert;
 
     /**
      * 查询订单表
@@ -374,4 +377,18 @@ public class OrderService {
             throw new RuntimeException("新增订单操作记录失败");
         }
     }
+
+    /**
+     * 根据订单id查询订单操作日志
+     * @param orderId 订单id
+     * @return 结果
+     */
+    public List<OrderOperateHistoryVO> log(Long orderId) {
+        LambdaQueryWrapper<OrderOperateHistory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrderOperateHistory::getOrderId, orderId);
+        wrapper.in(OrderOperateHistory::getOrderStatus, Arrays.asList(0, 1, 2, 3, 4));
+        wrapper.orderByDesc(OrderOperateHistory::getCreateTime);
+        List<OrderOperateHistory> historyList = orderOperateHistoryMapper.selectList(wrapper);
+        return historyConvert.dos2vos(historyList);
+    }
 }