优化

order/src/test/java/com/baiyue/order/controller/InternalOrderCargoControllerTest.java

@@ -3,6 +3,7 @@ package com.baiyue.order.controller;
 import com.baiyue.common.core.exception.BizException;
 import com.baiyue.order.entity.OrderCargoEntity;
 import com.baiyue.order.entity.OrderEntity;
+import com.baiyue.order.entity.OrderInternalNoteEntity;
 import com.baiyue.order.repository.OrderRepository;
 import org.junit.jupiter.api.Test;
 import jakarta.annotation.Resource;
@@ -44,6 +45,10 @@ class InternalOrderCargoControllerTest {
         cargo.setNetWeightKg(new java.math.BigDecimal("18.500"));
         cargo.setCargoRemark("内部货物备注");
         when(orders.findCargoInheritedByOrder(11L, 21L, 31L)).thenReturn(cargo);
+        OrderEntity order = new OrderEntity(); order.setId(21L); order.setCustomerRemark("客户订单备注");
+        OrderInternalNoteEntity note = new OrderInternalNoteEntity(); note.setContent("最新内部备注");
+        when(orders.findOwned(11L, 21L)).thenReturn(order);
+        when(orders.findNotes(11L, 21L)).thenReturn(List.of(note));
 
         var response = controller.detail("internal-token", 11L, 21L, 31L);
 
@@ -56,6 +61,8 @@ class InternalOrderCargoControllerTest {
         assertThat(response.data().totalQuantity()).isEqualTo(200);
         assertThat(response.data().netWeightKg()).isEqualByComparingTo("18.500");
         assertThat(response.data().cargoRemark()).isEqualTo("内部货物备注");
+        assertThat(response.data().customerRemark()).isEqualTo("客户订单备注");
+        assertThat(response.data().latestInternalNote()).isEqualTo("最新内部备注");
         verify(orders).findCargoInheritedByOrder(11L, 21L, 31L);
     }
 
@@ -99,6 +106,9 @@ class InternalOrderCargoControllerTest {
         OrderCargoEntity cargo = cargo(31L, 1, 3, "60", "40", "30");
         cargo.setOrderId(21L);
         when(orders.findCargoInheritedByOrder(11L, 201L, 31L)).thenReturn(cargo);
+        OrderEntity child = new OrderEntity(); child.setId(201L);
+        when(orders.findOwned(11L, 201L)).thenReturn(child);
+        when(orders.findNotes(11L, 201L)).thenReturn(List.of());
 
         var response = controller.detail("internal-token", 11L, 201L, 31L);