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-09-14 14:53:05 +08:00
parent 479b72b59f
commit 4bd95cb472
21 changed files with 378 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TmsPriceController.java
+6 -6
View File
@@ -22,7 +22,7 @@ import com.ruoyi.price.domain.vo.TmsPriceQuoteResult;
import com.ruoyi.price.search.EsBizLogSupport;
import com.ruoyi.price.search.EsLogType;
import com.ruoyi.price.search.IBillSearchStore;
import com.ruoyi.price.service.IPrcBillService;
import com.ruoyi.price.service.IPrcOrderBillService;
import com.ruoyi.price.service.ITmsPriceQuoteService;
/**
@@ -44,7 +44,7 @@ public class TmsPriceController extends BaseController
private ITmsPriceQuoteService tmsPriceQuoteService;
@Autowired
private IPrcBillService prcBillService;
private IPrcOrderBillService prcOrderBillService;
@Autowired
private TmsApiProperties tmsApiProperties;
@@ -76,7 +76,7 @@ public class TmsPriceController extends BaseController
}
/**
* Sync order and persist receivable bill (prc_bill / prc_bill_fee).
* Sync order and persist prc_order_bill / prc_income_bill_fee.
* Same price match as quote. Same orderNo upserts.
*/
@PostMapping("/bill")
@@ -93,12 +93,12 @@ public class TmsPriceController extends BaseController
EsBizLogSupport.saveFail(billSearchStore, EsLogType.BILL, EsBizLogSupport.billFailBizId(request), request, e);
throw e;
}
TmsPriceQuoteResult result = prcBillService.bill(request);
TmsPriceQuoteResult result = prcOrderBillService.bill(request);
return success(result);
}
/**
* Query receivable bill by orderNo after sync.
* Query order bill by orderNo after sync.
*/
@GetMapping("/bill/by-order/{orderNo}")
public AjaxResult getBillByOrder(
@@ -107,7 +107,7 @@ public class TmsPriceController extends BaseController
@RequestParam(value = "apiCode", required = false) String apiCode)
{
assertApiCode(headerApiCode, apiCode);
return success(prcBillService.getBillByOrderNo(orderNo));
return success(prcOrderBillService.getBillByOrderNo(orderNo));
}
private void assertApiCode(String headerApiCode, String bodyApiCode)
bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java
+7 -7
View File
@@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.price.domain.PrcBill;
import com.ruoyi.price.domain.PrcOrderBill;
import com.ruoyi.price.domain.PrcQuote;
import com.ruoyi.price.domain.vo.TmsPriceBillRequest;
import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest;
import com.ruoyi.price.domain.vo.TmsPriceQuoteResult;
import com.ruoyi.price.service.IPrcBillService;
import com.ruoyi.price.service.IPrcOrderBillService;
import com.ruoyi.price.service.ITmsPriceQuoteService;
/**
@@ -34,7 +34,7 @@ public class BillingController extends BaseController
private ITmsPriceQuoteService tmsPriceQuoteService;
@Autowired
private IPrcBillService prcBillService;
private IPrcOrderBillService prcOrderBillService;
/**
* Historical quote list.
@@ -71,10 +71,10 @@ public class BillingController extends BaseController
@PreAuthorize("@ss.hasPermi('price:billing:bill')")
@GetMapping("/bill/list")
public TableDataInfo billList(PrcBill query)
public TableDataInfo billList(PrcOrderBill query)
{
startPage();
List<PrcBill> list = prcBillService.selectBillList(query);
List<PrcOrderBill> list = prcOrderBillService.selectBillList(query);
return getDataTable(list);
}
@@ -82,14 +82,14 @@ public class BillingController extends BaseController
@GetMapping("/bill/{billId}")
public AjaxResult getBill(@PathVariable String billId)
{
return success(prcBillService.getBill(billId));
return success(prcOrderBillService.getBill(billId));
}
@PreAuthorize("@ss.hasPermi('price:billing:bill')")
@PostMapping("/bill")
public AjaxResult bill(@Validated @RequestBody TmsPriceBillRequest request)
{
TmsPriceQuoteResult result = prcBillService.bill(request);
TmsPriceQuoteResult result = prcOrderBillService.bill(request);
return success(result);
}
}