优化

finance/src/main/java/com/baiyue/finance/client/FirstlegFeeSourceClient.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @FeignClient(name = "firstleg-service", contextId = "financeFirstlegFeeSourceClient",
     url = "${baiyue.clients.firstleg.url:}", path = "/internal/firstleg/v1")
@@ -45,6 +46,8 @@ public interface FirstlegFeeSourceClient {
                     Long containerBookingId, String containerNo, long customerId,
                     String customerName, Long supplierId, String supplierName,
                     String supplierCategory,
+                    String settlementMode, LocalDateTime paidAt, String paymentMethod,
+                    String paymentReferenceNo, List<Long> paymentVoucherFileIds,
                     Long feeItemId, String feeItemCode,
                     String feeItemName, String direction, LocalDate businessDate,
                     String currency, BigDecimal totalAmount, String reviewStatus,

finance/src/main/java/com/baiyue/finance/dto/FinanceReadModels.java

@@ -53,6 +53,11 @@ public final class FinanceReadModels {
         String feeItemName,
         BigDecimal amount,
         String currency,
+        String settlementMode,
+        LocalDateTime paidAt,
+        String paymentMethod,
+        String paymentReferenceNo,
+        List<String> paymentVoucherFileIds,
         String status,
         LocalDateTime createdAt) {}
 

finance/src/main/java/com/baiyue/finance/service/FinanceCustomerAccountService.java

@@ -67,7 +67,7 @@ public class FinanceCustomerAccountService {
                 .forEach(row -> metric(result, row, "pendingBilling", "amount"));
         jdbc.queryForList("SELECT tenant_id customer_id,SUM(received_amount) amount FROM fin_receipt WHERE tenant_id IN (" + placeholders + ") AND status='CONFIRMED' GROUP BY tenant_id", customerIds.toArray())
                 .forEach(row -> metric(result, row, "receivedInPeriod", "amount"));
-        jdbc.queryForList("SELECT tenant_id customer_id,SUM(cost_amount) amount FROM fin_cost WHERE tenant_id IN (" + placeholders + ") AND status<>'VOIDED' GROUP BY tenant_id", customerIds.toArray())
+        jdbc.queryForList("SELECT tenant_id customer_id,SUM(outstanding_amount) amount FROM fin_settlement WHERE tenant_id IN (" + placeholders + ") AND direction='PAYABLE' AND status<>'VOIDED' GROUP BY tenant_id", customerIds.toArray())
                 .forEach(row -> metric(result, row, "outstandingPayable", "amount"));
         Object[] changeArgs = new Object[customerIds.size() * 3];
         for (int i = 0; i < 3; i++) System.arraycopy(customerIds.toArray(), 0, changeArgs, i * customerIds.size(), customerIds.size());

finance/src/main/java/com/baiyue/finance/service/FinanceFeeSourceEventService.java

@@ -81,11 +81,13 @@ public class FinanceFeeSourceEventService {
         }
         jdbc.update("UPDATE fin_fee_source SET status='SUPERSEDED' WHERE source_system='FIRSTLEG' AND source_fee_id=? AND status='AVAILABLE'",
             snapshot.feeId());
-        jdbc.update("INSERT INTO fin_fee_source(source_system,source_fee_id,source_fee_version,customer_id,source_type,source_no,direction,order_id,inbound_id,container_id,fee_item_code,fee_item_name,amount,currency_code,source_hash,source_snapshot,status) VALUES ('FIRSTLEG',?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'AVAILABLE')",
+        jdbc.update("INSERT INTO fin_fee_source(source_system,source_fee_id,source_fee_version,customer_id,source_type,source_no,direction,order_id,inbound_id,container_id,fee_item_code,fee_item_name,amount,currency_code,settlement_mode,paid_at,payment_method,payment_reference_no,payment_voucher_file_ids,source_hash,source_snapshot,status) VALUES ('FIRSTLEG',?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'AVAILABLE')",
             snapshot.feeId(), snapshot.feeVersion(), snapshot.customerId(), snapshot.sourceType(),
             snapshot.sourceType().equals("INBOUND_FEE") ? snapshot.inboundCode() : snapshot.containerNo(),
             snapshot.direction(), snapshot.orderId(), snapshot.inboundId(), snapshot.containerId(),
             snapshot.feeItemCode(), snapshot.feeItemName(), snapshot.totalAmount(), snapshot.currency(),
+            snapshot.settlementMode(), snapshot.paidAt(), snapshot.paymentMethod(),
+            snapshot.paymentReferenceNo(), voucherJson(snapshot.paymentVoucherFileIds()),
             snapshot.sourceHash(), json(snapshot));
         return jdbc.queryForObject("SELECT id FROM fin_fee_source WHERE source_system='FIRSTLEG' AND source_fee_id=? AND source_fee_version=?",
             Long.class, snapshot.feeId(), snapshot.feeVersion());
@@ -138,14 +140,44 @@ public class FinanceFeeSourceEventService {
             if (!value.supplierName().equals(supplier.name())) {
                 throw error("FIN-EVT-012", "应付费用来源供应商名称快照不一致");
             }
+            validatePayableSettlement(value);
         } else if (value.supplierId() != null || !blank(value.supplierName())
             || !blank(value.supplierCategory())) {
             throw error("FIN-EVT-012", "应收费用不得携带供应商快照");
+        } else if (!blank(value.settlementMode()) || value.paidAt() != null
+            || !blank(value.paymentMethod()) || !blank(value.paymentReferenceNo())
+            || (value.paymentVoucherFileIds() != null && !value.paymentVoucherFileIds().isEmpty())) {
+            throw error("FIN-EVT-012", "应收费用不得携带结算方式或已付快照");
         }
         if ("INBOUND_FEE".equals(value.sourceType()) && (value.inboundId() == null || !String.valueOf(value.inboundId()).equals(event.payload().inboundId()))) throw error("FIN-EVT-013", "入库单归属不一致");
         if ("CONTAINER_FEE".equals(value.sourceType()) && (value.containerId() == null || !String.valueOf(value.containerId()).equals(event.payload().containerId()))) throw error("FIN-EVT-014", "柜子归属不一致");
     }
 
+    private void validatePayableSettlement(FirstlegFeeSourceClient.Snapshot value) {
+        boolean hasVouchers = value.paymentVoucherFileIds() != null
+            && !value.paymentVoucherFileIds().isEmpty();
+        if (hasVouchers && (value.paymentVoucherFileIds().size() > 20
+            || value.paymentVoucherFileIds().stream().anyMatch(id -> id == null || id <= 0))) {
+            throw error("FIN-EVT-012", "付款凭证文件快照无效");
+        }
+        if ("ON_ACCOUNT".equals(value.settlementMode())) {
+            if (value.paidAt() != null || !blank(value.paymentMethod())
+                || !blank(value.paymentReferenceNo()) || hasVouchers) {
+                throw error("FIN-EVT-012", "账期应付不得携带已付快照");
+            }
+            return;
+        }
+        if (!"DIRECT_PAID".equals(value.settlementMode()) || value.paidAt() == null
+            || !Set.of("ONLINE", "BANK_TRANSFER", "CASH", "OTHER").contains(value.paymentMethod())
+            || (blank(value.paymentReferenceNo()) && !hasVouchers)) {
+            throw error("FIN-EVT-012", "直接已付费用来源快照不完整");
+        }
+    }
+
+    private String voucherJson(java.util.List<Long> values) {
+        return values == null || values.isEmpty() ? null : json(values);
+    }
+
     private String json(Object value) {
         try { return objectMapper.writeValueAsString(value); }
         catch (JsonProcessingException e) { throw error("FIN-EVT-001", "事件序列化失败"); }

finance/src/main/java/com/baiyue/finance/service/FinancePhase1OperationService.java

@@ -69,7 +69,7 @@ public class FinancePhase1OperationService {
             "(SELECT COALESCE(SUM(outstanding_amount),0) FROM fin_bill b WHERE b.tenant_id=c.customer_id AND b.status<>'VOIDED') outstanding_receivable," +
             "(SELECT COALESCE(SUM(amount),0) FROM fin_fee_source f WHERE f.customer_id=c.customer_id AND f.direction='RECEIVABLE' AND f.status='AVAILABLE' AND NOT EXISTS(SELECT 1 FROM fin_bill_line bl WHERE bl.source_id=f.id AND bl.source_version=f.source_fee_version)) pending_billing," +
             "(SELECT COALESCE(SUM(received_amount),0) FROM fin_receipt r WHERE r.tenant_id=c.customer_id AND r.status='CONFIRMED') received_period," +
-            "(SELECT COALESCE(SUM(cost_amount),0) FROM fin_cost x WHERE x.tenant_id=c.customer_id AND x.status<>'VOIDED') outstanding_payable," +
+            "(SELECT COALESCE(SUM(outstanding_amount),0) FROM fin_settlement x WHERE x.tenant_id=c.customer_id AND x.direction='PAYABLE' AND x.status<>'VOIDED') outstanding_payable," +
             "GREATEST(COALESCE((SELECT MAX(updated_at) FROM fin_bill b WHERE b.tenant_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_receipt r WHERE r.tenant_id=c.customer_id),'1970-01-01'),COALESCE((SELECT MAX(updated_at) FROM fin_cost x WHERE x.tenant_id=c.customer_id),'1970-01-01')) last_changed_at" + base + " ORDER BY last_changed_at DESC,c.customer_id DESC LIMIT ? OFFSET ?";
         Object[] args = java.util.Arrays.copyOf(filterArgs, filterArgs.length + 2);
         args[args.length - 2] = pageSize; args[args.length - 1] = (page - 1) * pageSize;

finance/src/main/java/com/baiyue/finance/service/FinanceQueryService.java

@@ -96,7 +96,7 @@ public class FinanceQueryService {
         String normalized = direction == null || direction.isBlank() ? "ALL" : direction.trim().toUpperCase(java.util.Locale.ROOT);
         if (!List.of("ALL", "RECEIVABLE", "PAYABLE").contains(normalized)) throw bad("费用方向只能是RECEIVABLE或PAYABLE");
         List<FeePoolItem> result = new ArrayList<>();
-        String sourceSql = "SELECT id,customer_id,direction,source_type,source_fee_id,source_fee_version,order_id,inbound_id,container_id,fee_item_name,amount,currency_code,status,created_at FROM fin_fee_source WHERE status='AVAILABLE'";
+        String sourceSql = "SELECT id,customer_id,direction,source_type,source_fee_id,source_fee_version,order_id,inbound_id,container_id,fee_item_name,amount,currency_code,settlement_mode,paid_at,payment_method,payment_reference_no,payment_voucher_file_ids,status,created_at FROM fin_fee_source WHERE status='AVAILABLE'";
         List<Object> sourceArgs = new ArrayList<>();
         if (customerId != null) { sourceSql += " AND customer_id=?"; sourceArgs.add(customerId); }
         if (!"ALL".equals(normalized)) { sourceSql += " AND direction=?"; sourceArgs.add(normalized); }
@@ -107,18 +107,10 @@ public class FinanceQueryService {
                 rs.getString("source_type"), rs.getLong("source_fee_id"), rs.getInt("source_fee_version"),
                 nullableLong(rs, "order_id"), nullableLong(rs, "inbound_id"), nullableLong(rs, "container_id"),
                 rs.getString("fee_item_name"), rs.getBigDecimal("amount"), rs.getString("currency_code"),
+                rs.getString("settlement_mode"), time(rs, "paid_at"), rs.getString("payment_method"),
+                rs.getString("payment_reference_no"), fileIds(rs.getString("payment_voucher_file_ids")),
                 rs.getString("status"), time(rs, "created_at"));
         }, sourceArgs.toArray()));
-        if (!"RECEIVABLE".equals(normalized)) {
-            String costSql = "SELECT id,tenant_id,order_id,inbound_id,container_id,fee_item_name,cost_amount,currency_code,status,created_at FROM fin_cost";
-            Object[] costArgs = new Object[0];
-            if (customerId != null) { costSql += " WHERE tenant_id=?"; costArgs = new Object[]{customerId}; }
-            costSql += " ORDER BY created_at DESC,id DESC";
-            result.addAll(jdbc.query(costSql, (rs, rowNum) ->
-                new FeePoolItem("PAYABLE:" + rs.getLong("id"), rs.getLong("tenant_id"), "PAYABLE", "MANUAL_COST", rs.getLong("id"), 1,
-                    nullableLong(rs, "order_id"), nullableLong(rs, "inbound_id"), nullableLong(rs, "container_id"),
-                    rs.getString("fee_item_name"), rs.getBigDecimal("cost_amount"), rs.getString("currency_code"), rs.getString("status"), time(rs, "created_at")), costArgs));
-        }
         result.sort(Comparator.comparing(FeePoolItem::createdAt, Comparator.nullsLast(Comparator.reverseOrder())));
         return List.copyOf(result);
     }

finance/src/main/java/com/baiyue/finance/service/FinanceSettlementService.java

@@ -140,7 +140,7 @@ public class FinanceSettlementService {
         List<Object> args = new ArrayList<>();
         args.addAll(ids);
         List<Map<String, Object>> sources = jdbc.queryForList(
-            "SELECT id,customer_id,direction,currency_code,status,amount,fee_item_code,fee_item_name,source_snapshot," +
+            "SELECT id,customer_id,direction,currency_code,status,amount,fee_item_code,fee_item_name,settlement_mode,source_snapshot," +
                 "review_status," +
                 "CAST(JSON_UNQUOTE(JSON_EXTRACT(source_snapshot,'$.supplierId')) AS UNSIGNED) supplier_id," +
                 "JSON_UNQUOTE(JSON_EXTRACT(source_snapshot,'$.supplierName')) supplier_name," +
@@ -152,6 +152,9 @@ public class FinanceSettlementService {
         for (Map<String, Object> source : sources) {
             Long supplierId = nullableNumber(source, "supplier_id");
             if (supplierId == null || supplierId != request.supplierId()) throw error("FIN_409", "应付来源必须属于同一供应商");
+            if (!"ON_ACCOUNT".equals(text(source, "settlement_mode"))) {
+                throw error("FIN_409", "只有ON_ACCOUNT账期应付费用可以生成应付结算单");
+            }
             if (!"PAYABLE".equals(text(source, "direction")) || !"AVAILABLE".equals(text(source, "status"))
                 || !"APPROVED".equals(text(source, "review_status")) || decimal(source, "amount").signum() <= 0) {
                 throw error("FIN_409", "费用来源未审核、金额无效或状态不可用");