Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
liuminghui
2026-11-18 13:34:24 +08:00
20 changed files with 385 additions and 99 deletions
@@ -2,7 +2,6 @@ package com.bms.web.controller.price;
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -168,8 +167,9 @@ public class BillingController extends BaseController
{
query = new PrcOrderBill();
}
// 计费列表只展示计费成功的订单。
query.setBillingFailStatuses(limitBillingListFailStatus());
// 计费列表:仅展示 prc_income_bill 存在的订单
query.setRequireIncomeBill(Boolean.TRUE);
query.setBillingFailStatuses(null);
query.setBillingFailStatus(null);
startPage();
List<PrcOrderBill> list = prcOrderBillService.selectBillList(query);
@@ -177,7 +177,7 @@ public class BillingController extends BaseController
}
/**
* 按当前筛选条件异步导出计费列表(状态限定为成功 success=0)。
* 按当前筛选条件异步导出计费列表(仅 prc_income_bill 存在)。
* 需至少一个有效筛选条件。轮询任务完成后再下载。
*/
@PreAuthorize("@ss.hasPermi('price:billing:export')")
@@ -194,7 +194,8 @@ public class BillingController extends BaseController
{
return error(MessageUtils.message("price.bill.export.filterRequired"));
}
query.setBillingFailStatuses(limitBillingListFailStatus());
query.setRequireIncomeBill(Boolean.TRUE);
query.setBillingFailStatuses(null);
query.setBillingFailStatus(null);
return successTask(prcOrderBillService.submitOrderBillExport(
PrcOrderBillExportTask.TYPE_BILLING, query));
@@ -220,13 +221,7 @@ public class BillingController extends BaseController
prcOrderBillService.downloadOrderBillExport(taskId, response);
}
private static List<Integer> limitBillingListFailStatus()
{
// 计费列表仅包含成功数据(billing_fail_status = 0)。
return new ArrayList<Integer>(Arrays.asList(Integer.valueOf(0)));
}
/** 全部 prc_order_bill 记录。计费列表仍限定为状态 0。 */
/** 全部 prc_order_bill 记录。计费列表按 prc_income_bill 存在过滤。 */
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
@GetMapping("/orderBill/list")
public TableDataInfo orderBillList(PrcOrderBill query)
@@ -186,7 +186,7 @@ public class LabelPackageController extends BaseController
return success(payload);
}
@PreAuthorize("@ss.hasPermi('price:label:remove')")
@PreAuthorize("@ss.hasPermi('price:label:edit')")
@Log(title = "打单套餐删除版本", businessType = BusinessType.DELETE)
@DeleteMapping("/{priceSetId}/versions/{versionNo}")
public AjaxResult deleteVersion(@PathVariable Long priceSetId, @PathVariable Integer versionNo)