提交

order/src/main/java/com/baiyue/order/controller/InternalOrderCargoController.java

@@ -46,7 +46,9 @@ public class InternalOrderCargoController {
             throw new BizException(ResultCode.NOT_FOUND, "订单货物明细不存在或不属于该订单");
         }
         return ApiResponse.success(new CargoBinding(cargo.getId(), cargo.getOrderId(), cargo.getItemNo(),
-            cargo.getCargoName(), cargo.getPackageCount(), cargo.getGrossWeightKg(), cargo.getVolumeCbm()));
+            cargo.getCargoName(), cargo.getPackageCount(), cargo.getGrossWeightKg(), cargo.getVolumeCbm(),
+            cargo.getSkuNo(), cargo.getCargoNameEn(), cargo.getUnitsPerPackage(), cargo.getTotalQuantity(),
+            cargo.getNetWeightKg(), cargo.getCargoRemark()));
     }
 
     private void requireToken(String token) {
@@ -58,6 +60,14 @@ public class InternalOrderCargoController {
     public record CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
                                Integer originalPackageCount,
                                java.math.BigDecimal originalGrossWeightKg,
-                               java.math.BigDecimal originalVolumeCbm) {
+                               java.math.BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn,
+                               Integer unitsPerPackage, Integer totalQuantity,
+                               java.math.BigDecimal netWeightKg, String cargoRemark) {
+        public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
+                            Integer originalPackageCount, java.math.BigDecimal originalGrossWeightKg,
+                            java.math.BigDecimal originalVolumeCbm) {
+            this(cargoId, orderId, itemNo, cargoName, originalPackageCount,
+                originalGrossWeightKg, originalVolumeCbm, null, null, null, null, null, null);
+        }
     }
 }

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

@@ -30,6 +30,12 @@ class InternalOrderCargoControllerTest {
         cargo.setItemNo(1);
         cargo.setCargoName("测试货物");
         cargo.setPackageCount(50);
+        cargo.setSkuNo("SKU-31");
+        cargo.setCargoNameEn("Test cargo");
+        cargo.setUnitsPerPackage(4);
+        cargo.setTotalQuantity(200);
+        cargo.setNetWeightKg(new java.math.BigDecimal("18.500"));
+        cargo.setCargoRemark("内部货物备注");
         when(orders.findCargo(11L, 21L, 31L)).thenReturn(cargo);
 
         var response = controller.detail("internal-token", 11L, 21L, 31L);
@@ -37,6 +43,12 @@ class InternalOrderCargoControllerTest {
         assertThat(response.successful()).isTrue();
         assertThat(response.data().cargoId()).isEqualTo(31L);
         assertThat(response.data().itemNo()).isEqualTo(1);
+        assertThat(response.data().skuNo()).isEqualTo("SKU-31");
+        assertThat(response.data().cargoNameEn()).isEqualTo("Test cargo");
+        assertThat(response.data().unitsPerPackage()).isEqualTo(4);
+        assertThat(response.data().totalQuantity()).isEqualTo(200);
+        assertThat(response.data().netWeightKg()).isEqualByComparingTo("18.500");
+        assertThat(response.data().cargoRemark()).isEqualTo("内部货物备注");
         verify(orders).findCargo(11L, 21L, 31L);
     }