计费列表增加状态搜索

2026-10-27 13:28:14 +08:00
parent 4659c63ef9
commit 7fcd3b6089
6 changed files with 133 additions and 5 deletions
@@ -31,6 +31,8 @@ public class BatchAddIncomeBillFeeRequest implements Serializable
    private List<String> productCodes;
    private String countryCode;
    private String creditArrearsStatus;
+    /** Same as list filter order_status IN (...). */
+    private List<Integer> orderStatuses;
    /** Same as list filter billing_fail_status IN (...). */
    private List<Integer> billingFailStatuses;

@@ -21,6 +21,8 @@ public class ChargeWeightTemplateRequest implements Serializable
    private List<String> customerCodes;
    private List<String> productCodes;
    private String creditArrearsStatus;
+    /** Same as list filter order_status IN (...). */
+    private List<Integer> orderStatuses;
    private String beginBizDate;
    private String endBizDate;
 }
@@ -25,6 +25,8 @@ public class RecalcBillPriceRequest implements Serializable
    private List<String> productCodes;
    private String countryCode;
    private String creditArrearsStatus;
+    /** Same as list filter order_status IN (...). */
+    private List<Integer> orderStatuses;
    /** Same as list filter billing_fail_status IN (...). */
    private List<Integer> billingFailStatuses;
    private String beginBizDate;
@@ -675,7 +675,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
        List<PrcOrderBill> bills = resolveListScopedBills(request.getScopeMode(), request.getBillIds(),
            request.getOrderNos(), request.getTrackingNos(), request.getTransferNos(), request.getOrderIdentifiers(),
            request.getCustomerCodes(), request.getProductCodes(), request.getCountryCode(),
-            request.getCreditArrearsStatus(), request.getBillingFailStatuses(),
+            request.getCreditArrearsStatus(), request.getOrderStatuses(), request.getBillingFailStatuses(),
            request.getBeginBizDate(), request.getEndBizDate(),
            "price.bill.recalc.filterRequired", "price.bill.recalc.scopeRequired",
            "price.bill.recalc.selectedRequired");
@@ -1251,7 +1251,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
        return resolveListScopedBills(request.getScopeMode(), request.getBillIds(),
            request.getOrderNos(), request.getTrackingNos(), request.getTransferNos(), request.getOrderIdentifiers(),
            request.getCustomerCodes(), request.getProductCodes(), request.getCountryCode(),
-            request.getCreditArrearsStatus(), request.getBillingFailStatuses(),
+            request.getCreditArrearsStatus(), request.getOrderStatuses(), request.getBillingFailStatuses(),
            request.getBeginBizDate(), request.getEndBizDate(),
            "price.bill.fee.batch.filterRequired", "price.bill.fee.batch.scopeRequired",
            "price.bill.fee.batch.selectedRequired");
@@ -1260,11 +1260,12 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
    /**
     * Shared list-scope resolve for batch fee / recalc price.
     * scopeMode: SELECTED uses billIds; ALL uses filters (at least one required).
+     * orderStatuses alone does not count as a meaningful filter (same as export).
     */
    private List<PrcOrderBill> resolveListScopedBills(String scopeModeRaw, List<String> billIdsRaw,
        List<String> orderNosRaw, List<String> trackingNosRaw, List<String> transferNosRaw, List<String> orderIdentifiersRaw,
        List<String> customerCodesRaw, List<String> productCodesRaw, String countryCodeRaw,
-        String creditArrearsStatusRaw, List<Integer> billingFailStatusesRaw,
+        String creditArrearsStatusRaw, List<Integer> orderStatusesRaw, List<Integer> billingFailStatusesRaw,
        String beginBizDateRaw, String endBizDateRaw,
        String msgFilter, String msgScope, String msgSelected)
    {
@@ -1279,6 +1280,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
        List<String> orderIdentifiers = normalizeOrderIdentifiers(orderIdentifiersRaw);
        List<String> customerCodes = normalizeCodeList(customerCodesRaw);
        List<String> productCodes = normalizeCodeList(productCodesRaw);
+        List<Integer> orderStatuses = normalizeIntegerList(orderStatusesRaw);
        List<Integer> billingFailStatuses = normalizeIntegerList(billingFailStatusesRaw);
        String creditArrearsStatus = StringUtils.isEmpty(creditArrearsStatusRaw) ? null
            : creditArrearsStatusRaw.trim();
@@ -1320,6 +1322,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
            query.setCustomerCodes(customerCodes);
            query.setProductCodes(productCodes);
            query.setCreditArrearsStatus(creditArrearsStatus);
+            query.setOrderStatuses(orderStatuses);
            query.setBillingFailStatuses(billingFailStatuses);
            query.setCountryCode(countryCode);
            if (beginBizDate != null)
@@ -2713,6 +2716,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
        List<String> transferNos = normalizeCodeList(request.getTransferNos());
        List<String> customerCodes = normalizeCodeList(request.getCustomerCodes());
        List<String> productCodes = normalizeCodeList(request.getProductCodes());
+        List<Integer> orderStatuses = normalizeIntegerList(request.getOrderStatuses());
        String creditArrearsStatus = StringUtils.isEmpty(request.getCreditArrearsStatus()) ? null
            : request.getCreditArrearsStatus().trim();
        String beginBizDate = StringUtils.isEmpty(request.getBeginBizDate()) ? null
@@ -2740,6 +2744,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
        query.setCustomerCodes(customerCodes);
        query.setProductCodes(productCodes);
        query.setCreditArrearsStatus(creditArrearsStatus);
+        query.setOrderStatuses(orderStatuses);
        if (beginBizDate != null)
        {
            query.getParams().put("beginBizDate", beginBizDate);