From 2431a5caacb51664145e2b5083725624811bb9f9 Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Fri, 16 Oct 2026 11:27:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bms/price/domain/PrcOrderBill.java | 2 ++ .../mapper/price/PrcOrderBillMapper.xml | 9 ++++++++ .../src/views/monitor/orderSource/index.vue | 2 ++ bms-front/src/views/price/billing/bill.vue | 23 +++++++++++++++++++ 4 files changed, 36 insertions(+) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java index 500b6d68..7fb0fc44 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java +++ b/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 billingFailStatuses; private String roundMode; private List incomeFees; diff --git a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index 9f6de43c..05bc058c 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -287,6 +287,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.credit_arrears_status = #{creditArrearsStatus} + + AND p.billing_fail_status = #{billingFailStatus} + + + AND p.billing_fail_status IN + + #{bfs} + + AND p.refund_status = #{refundStatus} diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue index 07998d5f..e3e0474e 100644 --- a/bms-front/src/views/monitor/orderSource/index.vue +++ b/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" >