伦

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

@@ -51,10 +51,16 @@ public class InternalOrderCargoController {
         if (cargo == null) {
             throw new BizException(ResultCode.NOT_FOUND, "订单货物明细不存在或不属于该订单");
         }
+        var order = orders.findOwned(tenantId, orderId);
+        if (order == null) throw new BizException(ResultCode.NOT_FOUND, "订单不存在或不属于当前客户");
+        String latestInternalNote = orders.findNotes(tenantId, orderId).stream()
+            .map(com.baiyue.order.entity.OrderInternalNoteEntity::getContent)
+            .filter(java.util.Objects::nonNull).map(String::trim).filter(value -> !value.isEmpty())
+            .findFirst().orElse(null);
         return ApiResponse.success(new CargoBinding(cargo.getId(), orderId, cargo.getItemNo(),
             cargo.getCargoName(), cargo.getPackageCount(), cargo.getGrossWeightKg(), cargo.getVolumeCbm(),
             cargo.getSkuNo(), cargo.getCargoNameEn(), cargo.getUnitsPerPackage(), cargo.getTotalQuantity(),
-            cargo.getNetWeightKg(), cargo.getCargoRemark()));
+            cargo.getNetWeightKg(), cargo.getCargoRemark(), order.getCustomerRemark(), latestInternalNote));
     }
 
     @GetMapping("/{tenantId}/{orderId}")
@@ -129,12 +135,22 @@ public class InternalOrderCargoController {
                                java.math.BigDecimal originalGrossWeightKg,
                                java.math.BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn,
                                Integer unitsPerPackage, Integer totalQuantity,
-                               java.math.BigDecimal netWeightKg, String cargoRemark) {
+                               java.math.BigDecimal netWeightKg, String cargoRemark,
+                               String customerRemark, String latestInternalNote) {
         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);
+                originalGrossWeightKg, originalVolumeCbm, null, null, null, null, null, null, null, null);
+        }
+        public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
+                            Integer originalPackageCount, java.math.BigDecimal originalGrossWeightKg,
+                            java.math.BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn,
+                            Integer unitsPerPackage, Integer totalQuantity, java.math.BigDecimal netWeightKg,
+                            String cargoRemark) {
+            this(cargoId, orderId, itemNo, cargoName, originalPackageCount, originalGrossWeightKg,
+                originalVolumeCbm, skuNo, cargoNameEn, unitsPerPackage, totalQuantity, netWeightKg,
+                cargoRemark, null, null);
         }
     }