From 74762c804379753c403c88860711e7d46581322b Mon Sep 17 00:00:00 2001
From: caojia <1301869380@qq.com>
Date: Mon, 26 Oct 2026 17:59:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bms-front/src/views/ar/bill/components/BillDetail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bms-front/src/views/ar/bill/components/BillDetail.vue b/bms-front/src/views/ar/bill/components/BillDetail.vue
index 1a04330b..bee0a4f4 100644
--- a/bms-front/src/views/ar/bill/components/BillDetail.vue
+++ b/bms-front/src/views/ar/bill/components/BillDetail.vue
@@ -59,7 +59,7 @@
@size-change="handleDetailSizeChange"
/>
-
导出历史{{ exporting ? '生成中' : '导出账单明细' }}
+ 导出历史{{ exporting ? '生成中' : '导出账单明细' }}
From 7e175808bf9b3945bab250c5d1ce287656283ba7 Mon Sep 17 00:00:00 2001
From: wuweihua <88888888>
Date: Mon, 26 Oct 2026 17:59:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=80=80=E8=B4=B9?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../price/service/impl/PrcOrderBillServiceImpl.java | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
index c8abd175..fc41577c 100644
--- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
@@ -767,7 +767,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
{
throw new ServiceException(MessageUtils.message("price.bill.bizDateRequired"));
}
- assertOrderBillNotRefunded(bill);
TmsPriceBillRequest req = buildBillRequestFromBill(bill);
return billLocalWithDbRetry(billId.trim(), req);
}
@@ -1653,7 +1652,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
String billKey = Md5Utils.hash(orderNo);
PrcOrderBill existed = orderBillMapper.selectPrcOrderBillByOrderNo(orderNo);
assertOrderBillEditable(existed);
- assertOrderBillNotRefunded(existed);
BigDecimal previousIncome = existed == null ? BigDecimal.ZERO : nz(existed.getIncomeTotal());
PrcOrderBill bill = existed == null ? new PrcOrderBill() : existed;
if (existed == null)
@@ -2110,14 +2108,6 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
}
}
- /** Block rebill when refundStatus=REFUNDED (order_status=9 alone is logistics return, not fee refund). */
- private void assertOrderBillNotRefunded(PrcOrderBill bill)
- {
- if (bill != null && BillRefundStatus.REFUNDED.getCode().equalsIgnoreCase(bill.getRefundStatus()))
- {
- throw new ServiceException("\u8ba2\u5355\u5df2\u9000\u8d39\uff0c\u4e0d\u53ef\u91cd\u65b0\u8ba1\u8d39");
- }
- }
private static BigDecimal nz(BigDecimal v)
{