增加筛选

bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java

@@ -118,6 +118,8 @@ public class PrcOrderBill extends BaseEntity
     private String refundStatus;
     /** 计费失败状态：0成功/1未匹配产品/2未匹配国家/3未匹配重量段；软失败时金额为0且不落费用明细 */
     private Integer billingFailStatus;
+    /** \u6279\u91cf\u67e5\u8be2\uff1a\u591a\u4e2a\u8ba1\u8d39\u5931\u8d25\u72b6\u6001\uff08\u4ec5\u67e5\u8be2\u7528\uff0c\u975e\u8868\u5b57\u6bb5\uff09 */
+    private List<Integer> billingFailStatuses;
     private String roundMode;
 
     private List<PrcIncomeBillFee> incomeFees;

bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml

@@ -287,6 +287,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creditArrearsStatus != null and creditArrearsStatus != ''">
                 AND p.credit_arrears_status = #{creditArrearsStatus}
             </if>
+            <if test="billingFailStatus != null">
+                AND p.billing_fail_status = #{billingFailStatus}
+            </if>
+            <if test="billingFailStatuses != null and billingFailStatuses.size() > 0">
+                AND p.billing_fail_status IN
+                <foreach collection="billingFailStatuses" item="bfs" open="(" separator="," close=")">
+                    #{bfs}
+                </foreach>
+            </if>
             <if test="refundStatus != null and refundStatus != ''">
                 AND p.refund_status = #{refundStatus}
             </if>

bms-front/src/views/monitor/orderSource/index.vue

@@ -24,6 +24,8 @@
       selection
       search-action-align="center"
       :search-per-row="4"
+      :page-sizes="[100, 200, 300, 400]"
+      :page-size="100"
     >
       <template #toolbar="{ selection }">
         <el-col :span="1.5">

bms-front/src/views/price/billing/bill.vue

@@ -9,6 +9,8 @@
       :search-per-row="4"
       row-key="billId"
       selection
+      :page-sizes="[100, 200, 300, 400]"
+      :page-size="100"
     >
       <template #search-orderNos="{ model }">
         <multi-value-input v-model="model.orderNos" placeholder="订单号" width="100%" :search-method="searchOrderNoOptions" />
@@ -318,6 +320,13 @@ const refundStatusOptions = [
   { label: '未退费', value: 'NONE' },
   { label: '已退费', value: 'REFUNDED' }
 ]
+/** billing_fail_status: 0 success / 1 product / 2 country / 3 weight */
+const billingFailStatusOptions = [
+  { label: '\u8ba1\u8d39\u6210\u529f', value: 0 },
+  { label: '\u672a\u5339\u914d\u4ea7\u54c1', value: 1 },
+  { label: '\u672a\u5339\u914d\u56fd\u5bb6', value: 2 },
+  { label: '\u672a\u5339\u914d\u91cd\u91cf\u6bb5', value: 3 }
+]
 
 const searchColumns = [
   { label: '订单号', prop: 'orderNos', placeholder: '订单号' },
@@ -333,6 +342,19 @@ const searchColumns = [
     placeholder: '请选择',
     props: { clearable: true }
   },
+  {
+    label: '\u8ba1\u8d39\u5931\u8d25',
+    prop: 'billingFailStatuses',
+    component: 'select',
+    options: billingFailStatusOptions,
+    placeholder: '\u8bf7\u9009\u62e9',
+    props: {
+      multiple: true,
+      clearable: true,
+      collapseTags: true,
+      collapseTagsTooltip: true
+    }
+  },
   {
     label: '计费时间',
     prop: 'bizDateRange',
@@ -426,6 +448,7 @@ function hasBatchFeeQuery(q) {
     || hasArr(q.transferNos)
     || hasArr(q.customerCodes)
     || hasArr(q.productCodes)
+    || hasArr(q.billingFailStatuses)
     || hasArr(q.bizDateRange)
     || !!(q.creditArrearsStatus && String(q.creditArrearsStatus).trim())
 }