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

修改计费订单ID类型为Long，优化相关逻辑

Browse Source
This commit is contained in:
wuweihua
2026-11-14 00:23:47 +08:00
parent 87eab12d51
commit 8b7c346ec4
71 changed files with 929 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java
+11 -11
View File
@@ -253,7 +253,7 @@ public class BillingController extends BaseController
/** 订单列表弹窗：按 billId 查询计费失败原因（受数据权限控制）。 */
@PreAuthorize("@ss.hasPermi('price:orderBill:list')")
@GetMapping("/orderBill/{billId}/failReason")
public AjaxResult orderBillFailReason(@PathVariable("billId") String billId)
public AjaxResult orderBillFailReason(@PathVariable("billId") Long billId)
{
return success(prcOrderBillService.getBillingFailReason(billId));
}
@@ -380,7 +380,7 @@ public class BillingController extends BaseController
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list')")
@GetMapping("/bill/{billId}")
public AjaxResult getBill(@PathVariable String billId)
public AjaxResult getBill(@PathVariable Long billId)
{
return success(prcOrderBillService.getBill(billId));
}
@@ -391,13 +391,13 @@ public class BillingController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('price:billing:bill') or @ss.hasPermi('price:orderBill:list')")
@GetMapping("/bill/{billId}/history")
public TableDataInfo billHistory(@PathVariable("billId") String billId)
public TableDataInfo billHistory(@PathVariable("billId") Long billId)
{
if (StringUtils.isEmpty(billId))
if (billId == null)
{
return getDataTable(new ArrayList<BillSyncSnapshot>());
}
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId.trim());
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId);
if (bill == null)
{
TableDataInfo empty = new TableDataInfo();
@@ -482,13 +482,13 @@ public class BillingController extends BaseController
@PreAuthorize("@ss.hasPermi('price:billing:refund')")
@Log(title = "Billing refund", businessType = BusinessType.UPDATE)
@PostMapping("/bill/{billId}/refund")
public AjaxResult refundBill(@PathVariable("billId") String billId)
public AjaxResult refundBill(@PathVariable("billId") Long billId)
{
if (StringUtils.isEmpty(billId))
if (billId == null)
{
return error("billId required");
}
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId.trim());
TmsPriceQuoteResult bill = prcOrderBillService.getBill(billId);
if (bill == null || StringUtils.isEmpty(bill.getOrderNo()))
{
return error("bill not found");
@@ -519,7 +519,7 @@ public class BillingController extends BaseController
@PreAuthorize("@ss.hasPermi('price:billing:arrearsUpdate')")
@Log(title = "Billing credit arrears", businessType = BusinessType.UPDATE)
@PutMapping("/bill/creditArrears")
public AjaxResult updateCreditArrears(@RequestBody java.util.List<String> billIds)
public AjaxResult updateCreditArrears(@RequestBody java.util.List<Long> billIds)
{
if (billIds == null || billIds.isEmpty())
{
@@ -527,7 +527,7 @@ public class BillingController extends BaseController
}
int success = 0;
java.util.List<String> fails = new java.util.ArrayList<String>();
for (String billId : billIds)
for (Long billId : billIds)
{
try
{
@@ -664,7 +664,7 @@ public class BillingController extends BaseController
@PreAuthorize("@ss.hasPermi('price:billing:feeRemove')")
@Log(title = "Billing income fee", businessType = BusinessType.DELETE)
@DeleteMapping("/bill/fee/{feeId}")
public AjaxResult deleteIncomeFee(@PathVariable String feeId)
public AjaxResult deleteIncomeFee(@PathVariable Long feeId)
{
return success(prcOrderBillService.deleteIncomeFee(feeId));
}
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PayProductController.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class PayProductController extends BaseController
@PreAuthorize("@ss.hasAnyPermi('price:billing:bill,price:pay:edit')")
@Log(title = "应付账单", businessType = BusinessType.INSERT)
@PostMapping("/order/{billId}")
public AjaxResult generateOrderCost(@PathVariable String billId)
public AjaxResult generateOrderCost(@PathVariable Long billId)
{
payOrderCostService.generate(billId);
return success("操作成功");