增加产品价和红线价重计费功能

This commit is contained in:
wuweihua
2026-10-15 16:09:05 +08:00
parent 41ce05a08a
commit 071e7f0c55
9 changed files with 615 additions and 25 deletions
@@ -41,6 +41,7 @@ import com.bms.price.domain.vo.BatchAddIncomeBillFeeRequest;
import com.bms.price.domain.vo.BillingTaskSubmitRequest;
import com.bms.price.domain.vo.ChargeWeightImportRow;
import com.bms.price.domain.vo.ChargeWeightTemplateRequest;
import com.bms.price.domain.vo.RecalcBillPriceRequest;
import com.bms.price.domain.vo.UpdateChargeWeightRequest;
import com.bms.price.domain.vo.UpdateIncomeBillFeeRequest;
import com.bms.price.domain.vo.TmsPriceBillRequest;
@@ -303,6 +304,53 @@ public class BillingController extends BaseController
return success(task);
}
/** Async recalc product_amount only. Poll /bill/recalcPrice/task/{taskId}. */
@PreAuthorize("@ss.hasPermi('price:billing:recalc')")
@Log(title = "Billing recalc product amount", businessType = BusinessType.UPDATE)
@PostMapping("/bill/recalcProduct")
public AjaxResult submitRecalcProductAmount(@RequestBody RecalcBillPriceRequest request)
{
if (request == null)
{
request = new RecalcBillPriceRequest();
}
request.setMode("PRODUCT");
return successTask(prcOrderBillService.submitRecalcBillPrice(request));
}
/** Async recalc redline_amount only. Poll /bill/recalcPrice/task/{taskId}. */
@PreAuthorize("@ss.hasPermi('price:billing:recalc')")
@Log(title = "Billing recalc redline amount", businessType = BusinessType.UPDATE)
@PostMapping("/bill/recalcRedline")
public AjaxResult submitRecalcRedlineAmount(@RequestBody RecalcBillPriceRequest request)
{
if (request == null)
{
request = new RecalcBillPriceRequest();
}
request.setMode("REDLINE");
return successTask(prcOrderBillService.submitRecalcBillPrice(request));
}
@PreAuthorize("@ss.hasPermi('price:billing:recalc')")
@GetMapping("/bill/recalcPrice/task/{taskId}")
public AjaxResult getRecalcBillPriceTask(@PathVariable String taskId)
{
BatchAddIncomeBillFeeTask task = prcOrderBillService.getRecalcBillPriceTask(taskId);
if (task == null)
{
return error(MessageUtils.message("price.bill.recalc.taskNotExists"));
}
return success(task);
}
private AjaxResult successTask(String taskId)
{
Map<String, Object> payload = new HashMap<String, Object>();
payload.put("taskId", taskId);
return success(payload);
}
@PreAuthorize("@ss.hasPermi('price:billing:feeEdit')")
@Log(title = "Billing income fee", businessType = BusinessType.UPDATE)
@PutMapping("/bill/fee")