优化

firstleg/src/main/java/com/baiyue/firstleg/dto/ContainerFeeDetailDtos.java

@@ -21,6 +21,8 @@ public final class ContainerFeeDetailDtos {
         @NotNull @DecimalMin("0.00") BigDecimal amount,
         @NotBlank @Pattern(regexp = "CNY") String currency,
         @NotNull Boolean settlementIncluded,
+        Long partnerId,
+        @Size(max = 200) String partnerName,
         @Size(max = 500) String remark
     ) {
     }
@@ -33,11 +35,13 @@ public final class ContainerFeeDetailDtos {
         @NotNull @DecimalMin("0.00") BigDecimal amount,
         @NotBlank @Pattern(regexp = "CNY") String currency,
         @NotNull Boolean settlementIncluded,
+        Long partnerId,
+        @Size(max = 200) String partnerName,
         @Size(max = 500) String remark
     ) {
         public SaveRequest values() {
             return new SaveRequest(feeItemId, direction, businessDate, amount, currency,
-                settlementIncluded, remark);
+                settlementIncluded, partnerId, partnerName, remark);
         }
     }
 

firstleg/src/main/java/com/baiyue/firstleg/entity/ContainerFeeDetailEntity.java

@@ -25,6 +25,8 @@ public class ContainerFeeDetailEntity {
     private String feeItemCodeSnapshot;
     private String feeItemNameSnapshot;
     private String direction;
+    private Long partnerId;
+    private String partnerName;
     private LocalDate businessDate;
     private BigDecimal amount;
     private String currency;

firstleg/src/main/java/com/baiyue/firstleg/service/ContainerFeeDetailService.java

@@ -13,6 +13,7 @@ import com.baiyue.firstleg.repository.SmartLoadingRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
@@ -140,10 +141,17 @@ public class ContainerFeeDetailService {
 
     private static void apply(ContainerFeeDetailEntity value, FeeItemEntity item,
                               SaveRequest request, long operatorId) {
+        if ("PAYABLE".equals(request.direction())
+            && (request.partnerId() == null || request.partnerId() <= 0
+                || !StringUtils.hasText(request.partnerName()))) {
+            throw new BizException(ResultCode.VALIDATION_FAILED, "应付柜次费用必须选择有效往来单位");
+        }
         value.setFeeItemId(item.getId());
         value.setFeeItemCodeSnapshot(item.getFeeCode());
         value.setFeeItemNameSnapshot(item.getFeeTypeName());
         value.setDirection(request.direction());
+        value.setPartnerId("PAYABLE".equals(request.direction()) ? request.partnerId() : null);
+        value.setPartnerName("PAYABLE".equals(request.direction()) ? request.partnerName().trim() : null);
         value.setBusinessDate(request.businessDate());
         value.setAmount(request.amount().setScale(2, RoundingMode.HALF_UP));
         value.setCurrency(request.currency());

firstleg/src/main/java/com/baiyue/firstleg/service/FinanceFeeSourceSnapshotService.java

@@ -61,11 +61,13 @@ public class FinanceFeeSourceSnapshotService {
         String canonical = String.join("|", "CONTAINER_FEE", String.valueOf(feeId),
             String.valueOf(version), String.valueOf(detail.getTenantId()), String.valueOf(containerId),
             nullSafe(detail.getFeeItemCodeSnapshot()), nullSafe(detail.getDirection()),
+            nullSafe(detail.getPartnerId()), nullSafe(detail.getPartnerName()),
             detail.getAmount().toPlainString(), nullSafe(detail.getCurrency()),
             String.valueOf(detail.getSettlementIncluded()));
         return new FinanceFeeSourceSnapshot(detail.getTenantId(), "CONTAINER_FEE", feeId,
             version, null, null, null, containerId, detail.getContainerBookingId(),
-            detail.getContainerNo(), detail.getTenantId(), null, null, null, detail.getFeeItemId(),
+            detail.getContainerNo(), detail.getTenantId(), null, detail.getPartnerId(),
+            detail.getPartnerName(), detail.getFeeItemId(),
             detail.getFeeItemCodeSnapshot(), detail.getFeeItemNameSnapshot(), detail.getDirection(),
             detail.getBusinessDate(), detail.getCurrency(), detail.getAmount(), detail.getReviewStatus(),
             publicationStatus, Boolean.TRUE.equals(detail.getSettlementIncluded()),