From 6225c37d2f53adf26daf6b4859af5fb5c6fad088 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 15 五月 2023 16:45:34 +0800
Subject: [PATCH] broker 卡车公司端
---
src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java b/src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java
index b282893..f719f9c 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/controller/FinanceController.java
@@ -44,12 +44,13 @@
@ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
@ApiImplicitParam(name = "time", value = "时间 （时间 - 时间）", required = false, dataType = "String"),
@ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
})
@PostMapping(value = "/list")
@ResponseBody
- public Object list(int pageNumber,int pageSize,String time,String name) {
+ public Object list(int pageNumber,int pageSize,String time,String name,int id) {
Page<ReceivableVo> receivableVoPage = new Page<>(pageNumber, pageSize);
- return new SuccessTip(orderService.getReceivable(receivableVoPage,time,name));
+ return new SuccessTip(orderService.getReceivable(receivableVoPage,time,name,id));
}
@@ -60,13 +61,14 @@
@ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
@ApiImplicitParam(name = "time", value = "时间 （时间 - 时间）", required = false, dataType = "String"),
@ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "int"),
})
@PostMapping(value = "/payList")
@ResponseBody
- public Object payList(int pageNumber,int pageSize,String time,String name) {
+ public Object payList(int pageNumber,int pageSize,String time,String name,int id) {
Page<ShouldPayVo> receivableVoPage = new Page<>(pageNumber, pageSize);
- return new SuccessTip(orderService.getPayList(receivableVoPage,time,name));
+ return new SuccessTip(orderService.getPayList(receivableVoPage,time,name,id));
}
@ApiOperation(value = "应收款票据列表",notes="应收款票据列表")
@@ -79,12 +81,13 @@
@ApiImplicitParam(name = "invoicesId", value = "invoicesId", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "orderId", value = "orderId", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "state", value = "1未支付完 2已支付", required = false, dataType = "Integer"),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
})
@PostMapping(value = "/listOfReceivables")
@ResponseBody
- public Object listOfReceivables(int pageNumber,int pageSize,String time,String name,Integer invoicesId,Integer orderId,Integer state) {
+ public Object listOfReceivables(int pageNumber,int pageSize,String time,String name,Integer invoicesId,Integer orderId,Integer state,Integer id) {
Page<ReceivablesList> receivableVoPage = new Page<>(pageNumber, pageSize);
- List<ReceivablesList> receivablesLists = orderService.listOfReceivables(receivableVoPage, time, name, invoicesId, orderId, state);
+ List<ReceivablesList> receivablesLists = orderService.listOfReceivables(receivableVoPage, time, name, invoicesId, orderId, state,id);
receivableVoPage.setRecords(receivablesLists);
return new SuccessTip(receivableVoPage);
}
@@ -144,29 +147,15 @@
@ApiOperation(value = "应收款票据详情--编辑价格",notes="应收款票据详情--编辑价格")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(name = "id", value = "价格id", required = true, dataType = "int"),
- @ApiImplicitParam(name = "type", value = "价格类型名称", required = false, dataType = "String"),
- @ApiImplicitParam(name = "price", value = "价格", required = false, dataType = "Double"),
})
- @GetMapping(value = "/updatePrice")
+ @PostMapping(value = "/updatePrice")
@ResponseBody
- public Object updatePrice(int id,String type,Double price) {
- TPrice tPrice = priceService.selectById(id);
- if(ToolUtil.isNotEmpty(type)){
- tPrice.setType(type);
- }
- if(ToolUtil.isNotEmpty(price)){
- BigDecimal bigDecimal = new BigDecimal(price);
- tPrice.setPrice(bigDecimal);
- tPrice.setCarPrice(bigDecimal);
- }
- try {
- priceService.updateById(tPrice);
- return new SuccessTip();
- }catch (Exception e){
- e.printStackTrace();
- }
- return new ErrorTip(500,"ERROR");
+ public Object updatePrice(@RequestBody List<TPrice> prices,String note) {
+ priceService.insertBatch(prices);
+ Long orderId = prices.get(0).getOrderId();
+ TOrder tOrder = orderService.selectById(orderId);
+ tOrder.setNote(note);
+ return new SuccessTip();
}
@ApiOperation(value = "应收款票据详情--删除价格",notes="应收款票据详情--删除价格")
@@ -196,12 +185,13 @@
@ApiImplicitParam(name = "billId", value = "billId", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "orderId", value = "orderId", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "state", value = "1未支付完 2已支付", required = false, dataType = "Integer"),
+ @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Integer"),
})
@GetMapping(value = "/listOfPay")
@ResponseBody
- public Object listOfPay(int pageNumber,int pageSize,String time,String name,Integer billId,Integer orderId,Integer state) {
+ public Object listOfPay(int pageNumber,int pageSize,String time,String name,Integer billId,Integer orderId,Integer state,Integer id) {
Page<PayList> receivableVoPage = new Page<>(pageNumber, pageSize);
- List<PayList> payLists = orderService.listOfPay(receivableVoPage, time, name, billId, orderId, state);
+ List<PayList> payLists = orderService.listOfPay(receivableVoPage, time, name, billId, orderId, state,id);
receivableVoPage.setRecords(payLists);
return new SuccessTip(receivableVoPage);
}
--
Gitblit v1.7.1