运输服务controller定义

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -42,7 +42,6 @@ public class AcceptCarriageOrderController {
 
     /**
      * 承运订单首页统计查询
-     * @param query 查询参数
      * @return
      */
     @RequestMapping(value = "/count", method = RequestMethod.GET)
@@ -65,7 +64,7 @@ public class AcceptCarriageOrderController {
         try {
             return acceptCarriageOrderService.subcontractConsignment(query);
         } catch (Exception e) {
-            log.error("承运订单首页统计查询:{}", e.getMessage(), e);
+            log.error("分包托运 error:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -0,0 +1,42 @@
+package com.sckw.transport.controller;
+
+import com.sckw.core.web.constant.HttpStatus;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import com.sckw.transport.service.LogisticsConsignmentService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lfdc
+ * @description 托运订单/承运订单-物流托运Controller
+ * @date 2023-06-28 11:06:06
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/logisticsConsignment")
+public class LogisticsConsignmentController {
+
+    @Autowired
+    LogisticsConsignmentService logisticsConsignmentService;
+
+    /**
+     * 托运订单/承运订单-物流托运
+     * @param query 查询参数
+     * @return
+     */
+    @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
+    public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
+        try {
+            return logisticsConsignmentService.subcontractConsignment(query);
+        } catch (Exception e) {
+            log.error("物流托运 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ConsignmentVo.java

@@ -9,5 +9,6 @@ import lombok.Data;
  */
 @Data
 public class ConsignmentVo {
+    private String a;
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/AcceptCarriageOrderService.java

@@ -13,7 +13,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lfdc
@@ -28,13 +30,24 @@ public class AcceptCarriageOrderService {
         List<AcceptCarriageOrderVo> list=new ArrayList<>();
         AcceptCarriageOrderVo acceptCarriageOrderVo = new AcceptCarriageOrderVo();
         List<CarWaybillVo> carWaybillVoList = new ArrayList<>();
+        CarWaybillVo carWaybillVo=new CarWaybillVo();
+        carWaybillVoList.add(carWaybillVo);
         List<ConsignmentVo> consignmentVos = new ArrayList<>();
+        ConsignmentVo consignmentVo=new ConsignmentVo();
+        consignmentVos.add(consignmentVo);
         acceptCarriageOrderVo.setCarWaybillList(carWaybillVoList);
         acceptCarriageOrderVo.setConsignmentList(consignmentVos);
         list.add(acceptCarriageOrderVo);
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
         PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok(pageResult);
+        Map<String,Object> map=new HashMap<>();
+        map.put("data",pageResult);
+        Map<String,Object> map1=new HashMap<>();
+        map1.put("data1","1");
+        map1.put("data12","12");
+        map1.put("data13","13");
+        map.put("statistics",map1);
+        return HttpResult.ok(map);
     }
 
     public HttpResult count(AcceptCarriageOrderQuery query) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -0,0 +1,21 @@
+package com.sckw.transport.service;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lfdc
+ * @description 物流托运/分包托运Service
+ * @date 2023-06-28 11:06:07
+ */
+@Slf4j
+@Service
+public class LogisticsConsignmentService {
+
+    public HttpResult subcontractConsignment(AcceptCarriageOrderQuery query) {
+        return null;
+    }
+
+}