|
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page;
|
|
import com.itextpdf.text.DocumentException;
|
|
import com.itextpdf.text.DocumentException;
|
|
import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
|
|
import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
|
|
import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
|
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.util.Log;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -36,6 +37,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "司机订单列表")
|
|
@GetMapping("/selectOrderInfo")
|
|
@GetMapping("/selectOrderInfo")
|
|
public Page<OrderInfo> selectOrderInfo(OrderInfo orderInfo) {
|
|
public Page<OrderInfo> selectOrderInfo(OrderInfo orderInfo) {
|
|
return orderInfoService.selectOrderInfo(orderInfo);
|
|
return orderInfoService.selectOrderInfo(orderInfo);
|
|
@@ -47,6 +49,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "货主订单列表")
|
|
@GetMapping("/selectCargoOwnerOrder")
|
|
@GetMapping("/selectCargoOwnerOrder")
|
|
public Page<OrderInfo> selectCargoOwnerOrder(OrderInfo orderInfo) {
|
|
public Page<OrderInfo> selectCargoOwnerOrder(OrderInfo orderInfo) {
|
|
return orderInfoService.selectCargoOwnerOrder(orderInfo);
|
|
return orderInfoService.selectCargoOwnerOrder(orderInfo);
|
|
@@ -58,6 +61,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "查询订单集合")
|
|
@GetMapping("/selectOrderInfoList")
|
|
@GetMapping("/selectOrderInfoList")
|
|
public List<OrderInfo> selectOrderInfoList() {
|
|
public List<OrderInfo> selectOrderInfoList() {
|
|
return orderInfoService.selectOrderInfoList();
|
|
return orderInfoService.selectOrderInfoList();
|
|
@@ -70,6 +74,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "获取一个月内司机的订单")
|
|
@GetMapping("/getData")
|
|
@GetMapping("/getData")
|
|
List<OrderInfo> getData(String commonId) {
|
|
List<OrderInfo> getData(String commonId) {
|
|
return orderInfoService.getData(commonId);
|
|
return orderInfoService.getData(commonId);
|
|
@@ -81,6 +86,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "获取司机和货主两人关联的订单")
|
|
@GetMapping("/getAssociatedOrder")
|
|
@GetMapping("/getAssociatedOrder")
|
|
List<OrderInfo> getAssociatedOrder(OrderInfo orderInfo) {
|
|
List<OrderInfo> getAssociatedOrder(OrderInfo orderInfo) {
|
|
return orderInfoService.getAssociatedOrder(orderInfo);
|
|
return orderInfoService.getAssociatedOrder(orderInfo);
|
|
@@ -89,6 +95,7 @@ public class OrderInfoController {
|
|
/**
|
|
/**
|
|
* 订单详情
|
|
* 订单详情
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "订单详情")
|
|
@GetMapping("/getOrderInfo")
|
|
@GetMapping("/getOrderInfo")
|
|
public OrderInfo getOrderInfo(@RequestParam String id) {
|
|
public OrderInfo getOrderInfo(@RequestParam String id) {
|
|
return orderInfoService.getOrderInfo(id);
|
|
return orderInfoService.getOrderInfo(id);
|
|
@@ -100,6 +107,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "订单货主/司机详情,好评率")
|
|
@GetMapping("/selectHaoPing")
|
|
@GetMapping("/selectHaoPing")
|
|
public OrderInfo selectHaoPing(@RequestParam String commonId, String evaluateFlag) {
|
|
public OrderInfo selectHaoPing(@RequestParam String commonId, String evaluateFlag) {
|
|
return orderInfoService.selectHaoPing(commonId, evaluateFlag);
|
|
return orderInfoService.selectHaoPing(commonId, evaluateFlag);
|
|
@@ -111,6 +119,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "终止订单")
|
|
@PostMapping("/api/end")
|
|
@PostMapping("/api/end")
|
|
public String end(@RequestBody OrderInfo orderInfo) {
|
|
public String end(@RequestBody OrderInfo orderInfo) {
|
|
return orderInfoService.end(orderInfo);
|
|
return orderInfoService.end(orderInfo);
|
|
@@ -122,6 +131,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "确认运费")
|
|
@PostMapping("/api/confirmFreight")
|
|
@PostMapping("/api/confirmFreight")
|
|
public String confirmFreight(@RequestBody OrderInfo orderInfo) {
|
|
public String confirmFreight(@RequestBody OrderInfo orderInfo) {
|
|
return orderInfoService.confirmFreight(orderInfo);
|
|
return orderInfoService.confirmFreight(orderInfo);
|
|
@@ -133,6 +143,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "完结订单")
|
|
@PostMapping("/api/editEnd")
|
|
@PostMapping("/api/editEnd")
|
|
public String editEnd(@RequestBody OrderInfo orderInfo) {
|
|
public String editEnd(@RequestBody OrderInfo orderInfo) {
|
|
return orderInfoService.editEnd(orderInfo);
|
|
return orderInfoService.editEnd(orderInfo);
|
|
@@ -144,6 +155,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "接单(拒绝)")
|
|
@PostMapping("/api/orderReceiving")
|
|
@PostMapping("/api/orderReceiving")
|
|
public String orderReceiving(@RequestBody OrderInfo orderInfo) {
|
|
public String orderReceiving(@RequestBody OrderInfo orderInfo) {
|
|
return orderInfoService.orderReceiving(orderInfo);
|
|
return orderInfoService.orderReceiving(orderInfo);
|
|
@@ -155,6 +167,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "订单审核列表")
|
|
@GetMapping("/selectOrderInfoPage")
|
|
@GetMapping("/selectOrderInfoPage")
|
|
public Page<OrderInfo> selectOrderInfoPage(OrderInfo orderInfo) {
|
|
public Page<OrderInfo> selectOrderInfoPage(OrderInfo orderInfo) {
|
|
return orderInfoService.selectOrderInfoPage(orderInfo);
|
|
return orderInfoService.selectOrderInfoPage(orderInfo);
|
|
@@ -166,6 +179,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "订单审核")
|
|
@PostMapping("/api/examine")
|
|
@PostMapping("/api/examine")
|
|
public String examine(@RequestBody OrderInfo orderInfo) throws ParseException {
|
|
public String examine(@RequestBody OrderInfo orderInfo) throws ParseException {
|
|
return orderInfoService.examine(orderInfo);
|
|
return orderInfoService.examine(orderInfo);
|
|
@@ -178,6 +192,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "批量开票")
|
|
@PostMapping("/api/readXmlManagement")
|
|
@PostMapping("/api/readXmlManagement")
|
|
public List<String> readXmlManagement(@RequestBody OrderInfo orderInfo) {
|
|
public List<String> readXmlManagement(@RequestBody OrderInfo orderInfo) {
|
|
List<OrderInfo> orderInfoList = orderInfo.getOrderInfoList();
|
|
List<OrderInfo> orderInfoList = orderInfo.getOrderInfoList();
|
|
@@ -202,6 +217,7 @@ public class OrderInfoController {
|
|
* @param orderInfo
|
|
* @param orderInfo
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "司机签合同")
|
|
@GetMapping("/setPdf")
|
|
@GetMapping("/setPdf")
|
|
public String setPdf(OrderInfo orderInfo) throws DocumentException, IOException, URISyntaxException {
|
|
public String setPdf(OrderInfo orderInfo) throws DocumentException, IOException, URISyntaxException {
|
|
return orderInfoService.setPdf(orderInfo);
|
|
return orderInfoService.setPdf(orderInfo);
|
|
@@ -214,6 +230,7 @@ public class OrderInfoController {
|
|
* @param
|
|
* @param
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "货主订单列表")
|
|
@GetMapping("/selectRouterPath")
|
|
@GetMapping("/selectRouterPath")
|
|
public void selectRouterPath() throws IOException {
|
|
public void selectRouterPath() throws IOException {
|
|
orderInfoService.selectRouterPath();
|
|
orderInfoService.selectRouterPath();
|
|
@@ -225,6 +242,7 @@ public class OrderInfoController {
|
|
* @return
|
|
* @return
|
|
* @throws Exception
|
|
* @throws Exception
|
|
*/
|
|
*/
|
|
|
|
+ @Log(title = "后台管理订单导出")
|
|
@PostMapping("/api/export")
|
|
@PostMapping("/api/export")
|
|
public void export(@RequestBody OrderInfo orderInfo, HttpServletResponse response) throws Exception {
|
|
public void export(@RequestBody OrderInfo orderInfo, HttpServletResponse response) throws Exception {
|
|
orderInfoService.export(orderInfo, response);
|
|
orderInfoService.export(orderInfo, response);
|