wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增订单状态字段并调整提货时间字段，更新相关导出和展示逻辑

Browse Source
This commit is contained in:
wuweihua
2026-10-27 16:23:02 +08:00
parent 4067bfc277
commit b55f0010ed
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcBillingBillListExportRow.java
+4 -2
View File
@@ -45,6 +45,8 @@ public class PrcBillingBillListExportRow implements Serializable
private BigDecimal payTotal;
@Excel(name = "计价来源", width = 16)
private String matchSourceLabel;
@Excel(name = "订单状态", width = 12)
private String orderStatusLabel;
@Excel(name = "计费状态", width = 14)
private String billingFailStatusLabel;
@Excel(name = "客户状态", width = 12)
@@ -54,9 +56,9 @@ public class PrcBillingBillListExportRow implements Serializable
@Excel(name = "计费时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bizDate;
@Excel(name = "下单时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "提货时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderTime;
private Date pickupDate;
@Excel(name = "销售员", width = 12)
private String belongSaler;
@Excel(name = "结算员", width = 12)
bms-back/bms-system/src/main/java/com/bms/price/service/support/OrderBillExportSupport.java
+2 -1
View File
@@ -193,11 +193,12 @@ public final class OrderBillExportSupport
row.setIncomeTotal(bill.getIncomeTotal());
row.setPayTotal(bill.getPayTotal());
row.setMatchSourceLabel(matchSourceLabel(bill.getMatchSource()));
row.setOrderStatusLabel(orderStatusLabel(bill.getOrderStatus()));
row.setBillingFailStatusLabel(billingFailStatusLabel(bill.getBillingFailStatus()));
row.setCustomerActiveStatusLabel(customerActiveLabel(bill.getCustomerActiveStatus()));
row.setCreditArrearsStatusLabel(creditArrearsLabel(bill.getCreditArrearsStatus()));
row.setBizDate(bill.getBizDate());
row.setOrderTime(bill.getOrderTime());
row.setPickupDate(bill.getPickupDate());
row.setBelongSaler(bill.getBelongSaler());
row.setSettlementMan(bill.getSettlementMan());
row.setServiceMan(bill.getServiceMan());