阿里规范代码提交

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

@@ -53,7 +53,7 @@ public class AcceptCarriageOrderController {
      * 承运订单首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/selectAcceptCarriageOrderList", method = RequestMethod.POST)
     public HttpResult acceptCarriageOrderList(@Valid @RequestBody AcceptCarriageOrderQuery query) {
@@ -71,13 +71,12 @@ public class AcceptCarriageOrderController {
      * 承运订单top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/statisticsAcceptCarriage", method = RequestMethod.POST)
     public HttpResult statisticsAcceptCarriage(@Valid @RequestBody AcceptCarriageOrderQuery query) {
         try {
-            HttpResult result = acceptCarriageOrderService.statisticsAcceptCarriage(query, "2");
-            return result;
+            return acceptCarriageOrderService.statisticsAcceptCarriage(query, "2");
         } catch (Exception e) {
             log.error("承运订单top统计 查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -86,9 +85,7 @@ public class AcceptCarriageOrderController {
 
     /**
      * 承运订单导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/acceptCarriageOrderExport", method = RequestMethod.POST)
@@ -104,8 +101,8 @@ public class AcceptCarriageOrderController {
     /**
      * 获取订单详情-托运订单-承运订单-销售订单-采购订单
      *
-     * @param dto
-     * @return
+     * @param dto   获取订单数据请求参数
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.POST)
@@ -124,7 +121,7 @@ public class AcceptCarriageOrderController {
      * 承运合同/托运合同-根据合同id获取托运订单列表
      *
      * @param contractParam 请求参数
-     * @return
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/getLogisticsOrderContract", method = RequestMethod.POST)
@@ -140,8 +137,8 @@ public class AcceptCarriageOrderController {
     /**
      * 托运订单/承运订单-撤销托运
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  订单请求数据
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/cancelConsign", method = RequestMethod.POST)
@@ -157,8 +154,8 @@ public class AcceptCarriageOrderController {
     /**
      * 对账管理-运费收款对账界面查询接口
      *
-     * @param logisticsOrderParam
-     * @return
+     * @param logisticsOrderParam   物流请求数据
+     * @return  物流订单响应结果
      */
     @RequestMapping(value = "/getAcceptCarriageOrder", method = RequestMethod.POST)
     public HttpResult getAcceptCarriageOrder(@RequestBody @Valid LogisticsOrderParam logisticsOrderParam) {
@@ -175,8 +172,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-接单
      *
-     * @param orderDTO
-     * @return
+     * @param orderDTO  物流订单接单请求数据
+     * @return  接单响应结果
      */
     @RequestMapping(value = "/orderTaking", method = RequestMethod.POST)
     public HttpResult orderTaking(@Validated @RequestBody OrderTakingDTO orderDTO) {
@@ -187,7 +184,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-分包托运
      *
      * @param query 请求参数
-     * @return
+     * @return 操作响应数据
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/subcontractConsignment", method = RequestMethod.POST)
@@ -205,7 +202,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-分包托运-订单详情
      *
      * @param id 物流订单id
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/subcontractConsignmentOrderDetail", method = RequestMethod.GET)
     public HttpResult subcontractConsignmentOrderDetail(@NotNull(message = "物流订单不能为空") @RequestParam("id") String id) {
@@ -222,7 +219,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取运单详情
      *
      * @param wOrderId 运单id
-     * @return
+     * @return  运单数据
      */
     @RequestMapping(value = "/getWaybillData", method = RequestMethod.GET)
     public HttpResult getWaybillData(@NotNull(message = "物流订单id不能为空") @RequestParam("wOrderId") String wOrderId) {
@@ -239,9 +236,9 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取分包托运列表
      *
      * @param lOrderIds 单据id
-     * @param page
-     * @param pageSize
-     * @return
+     * @param page  请求当前页数
+     * @param pageSize  请求每页条数
+     * @return  响应结果
      */
     @RequestMapping(value = "/getSubcontractConsignment", method = RequestMethod.GET)
     public HttpResult getSubcontractConsignment(@RequestParam("lOrderIds") @NotBlank(message = "单据id不能为空") String lOrderIds,
@@ -259,7 +256,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-获取分包托运列表-数据统计
      *
      * @param lOrderId 单据id
-     * @return
+     * @return  统计响应结果
      */
     @RequestMapping(value = "/getSubcontractConsignmentCount", method = RequestMethod.GET)
     public HttpResult getSubcontractConsignmentCount(@RequestParam("lOrderId") @NotBlank(message = "单据id不能为空") String lOrderId) {
@@ -273,8 +270,8 @@ public class AcceptCarriageOrderController {
 
     /**
      * 承运订单-停止接单-查询
-     *
-     * @return
+     * @param driverParam   查询订单数据
+     * @return  查询结果数据
      */
     @RequestMapping(value = "/acceptStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult stopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
@@ -290,8 +287,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-设置停止接单-循环单提交
      *
-     * @param stopOrderTakingDTO
-     * @return
+     * @param stopOrderTakingDTO    停止接单请求数据
+     * @return  响应结果
      */
     @RequestMapping(value = "/acceptStopDocumentCommit", method = RequestMethod.POST)
     public HttpResult stopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
@@ -308,7 +305,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-取消派车(撤回派车)/单趟撤回
      *
      * @param baseList 车辆运单id
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/cancelDelivery", method = RequestMethod.POST)
     public HttpResult cancelDelivery(@Valid @RequestBody BaseList baseList) {
@@ -325,8 +322,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-完结订单-页面数据查询
      *
-     * @param orderId
-     * @return
+     * @param orderId 物流订单id
+     * @return  查询响应结果
      */
     @RequestMapping(value = "/acceptCarriageOrderFinishDetail", method = RequestMethod.GET)
     public HttpResult acceptCarriageOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
@@ -342,8 +339,8 @@ public class AcceptCarriageOrderController {
     /**
      * 承运订单-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/commitAcceptCarriageOrderFinish", method = RequestMethod.POST)
     public HttpResult commitAcceptCarriageOrderFinish(@Valid @RequestBody OrderFinishDTO orderFinishDTO) {
@@ -359,7 +356,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-查看撤销原因+驳回原因
      *
      * @param id 物流订单
-     * @return
+     * @return 响应结果
      */
     @RequestMapping(value = "/getCancelReason", method = RequestMethod.GET)
     public HttpResult getCancelReason(@NotBlank(message = "物流订单id不能为空") @RequestParam("id") String id,
@@ -376,7 +373,7 @@ public class AcceptCarriageOrderController {
      * 承运订单-新建订单
      *
      * @param addOrderDTO 页面传递参数
-     * @return
+     * @return  响应结果
      */
     @RepeatSubmit(interval = 3000,message ="两次请求间隔未超过3秒")
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
@@ -394,7 +391,7 @@ public class AcceptCarriageOrderController {
     /**
      * 工作台-承运业务统计
      * @param dateType 1代表周 2代表月
-     * @return
+     * @return 统计结果
      */
     @RequestMapping(value = "/workbenchStatisticsByAcceptCarriage", method = RequestMethod.GET)
     public HttpResult workbenchStatistics(@RequestParam("dateType") @NotBlank(message = "类型不能为空") String dateType) {
@@ -409,8 +406,8 @@ public class AcceptCarriageOrderController {
 
     /**
      * 工作台-物流运输数据统计-承运
-     *
-     * @return
+     * @param logisticsOrderStatistics  物流统计请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/workbenchLogisticsOrderStatistics", method = RequestMethod.POST)
     public HttpResult workbenchLogisticsOrderStatistics(@RequestBody LogisticsOrderStatisticsParam logisticsOrderStatistics) {

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

@@ -52,7 +52,7 @@ public class ConsignOrderController {
      * 托运订单首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/selectConsignOrderList", method = RequestMethod.POST)
     public HttpResult selectConsignOrderList(@Valid @RequestBody AcceptCarriageOrderQuery query) {
@@ -70,25 +70,21 @@ public class ConsignOrderController {
      * 托运订单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/statisticsConsign", method = RequestMethod.POST)
     public HttpResult statisticsConsign(@Valid @RequestBody AcceptCarriageOrderQuery query) {
         try {
-            HttpResult result = consignOrderService.statisticsConsign(query, "1");
-            return result;
+            return consignOrderService.statisticsConsign(query, "1");
         } catch (Exception e) {
             log.error("托运订单-top统计 查询失败:{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
 
-
     /**
-     * 托运订单-导出
-     *
+     *  托运订单-导出
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/consignExport", method = RequestMethod.POST)
     public void exportConsign(@Validated @RequestBody ConsignOrderQuery query) {
@@ -103,9 +99,8 @@ public class ConsignOrderController {
 
     /**
      * 托运订单/承运订单-获取车辆运单
-     *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单请求数据
+     * @return  车辆运单响应结果
      */
     @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrder(@Validated @RequestBody OrderDTO orderDto) {
@@ -123,7 +118,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-物流订单id查询-针对循环单
      *
      * @param baseList 页面请求数据
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentDetailByOrderIds", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetailByOrderIds(@Valid @RequestBody BaseList baseList) {
@@ -140,7 +135,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-条件查询-针对循环单
      *
      * @param driverParam 页面请求数据
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
@@ -158,7 +153,7 @@ public class ConsignOrderController {
      * 托运订单-设置停止接单-提交-针对循环单
      *
      * @param stopOrderTakingDTO 请求参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignStopDocumentCommit", method = RequestMethod.POST)
     public HttpResult consignStopDocumentCommit(@Validated @RequestBody StopOrderTakingDTO stopOrderTakingDTO) {
@@ -209,8 +204,8 @@ public class ConsignOrderController {
     /**
      * 托运订单/承运订单-获取车辆运单-统计
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单数据
+     * @return  车辆运单响应结果
      */
     @RequestMapping(value = "/getCarWaybillByOrderCount", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrderCount(@Validated @RequestBody OrderDTO orderDto) {
@@ -227,8 +222,8 @@ public class ConsignOrderController {
     /**
      * 托运订单查看驳回原因
      *
-     * @param id
-     * @return
+     * @param id    物流订单id
+     * @return  响应结果
      */
     @RequestMapping(value = "/getRejectReason", method = RequestMethod.GET)
     public HttpResult getRejectReasonById(@NotBlank @RequestParam("id") String id,
@@ -239,8 +234,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-获取车辆信息
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/getCarListByOrder", method = RequestMethod.POST)
     public HttpResult getCarListByOrder(@Validated @RequestBody OrderDTO orderDto) {
@@ -256,8 +251,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-完结订单-页面数据查询
      *
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @return  响应结果
      */
     @RequestMapping(value = "/consignOrderFinishDetail", method = RequestMethod.GET)
     public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
@@ -273,8 +268,8 @@ public class ConsignOrderController {
     /**
      * 托运订单-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/commitConsignOrderFinish", method = RequestMethod.POST)
     public HttpResult commitConsignOrderFinish(@Validated @RequestBody OrderFinishDTO orderFinishDTO) {
@@ -291,7 +286,7 @@ public class ConsignOrderController {
      * 托运订单-新建订单
      *
      * @param addOrderDTO 页面传递参数
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
     public HttpResult addOrder(@Valid @RequestBody AddOrderDTO addOrderDTO) {
@@ -319,8 +314,8 @@ public class ConsignOrderController {
 
     /**
      * 工作台-托运业务统计
-     *
-     * @return
+     * @param dateType  请求参数 1周 2月
+     * @return  统计响应结果
      */
     @RequestMapping(value = "/workbenchStatistics", method = RequestMethod.GET)
     public HttpResult workbenchStatistics(@RequestParam("dateType") @NotBlank(message = "类型不能为空") String dateType) {
@@ -336,8 +331,8 @@ public class ConsignOrderController {
 
     /**
      * 工作台-物流运输数据统计-托运业务
-     *
-     * @return
+     * @param logisticsOrderStatistics  物流订单统计请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/workbenchLogisticsOrderStatistics", method = RequestMethod.POST)
     public HttpResult workbenchLogisticsOrderStatistics(@RequestBody LogisticsOrderStatisticsParam logisticsOrderStatistics) {

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

@@ -48,8 +48,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购订单-物流托运生成托运订单
      *
-     * @param logisticsConsignmentParam
-     * @return
+     * @param logisticsConsignmentParam 页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsConsignment", method = RequestMethod.POST)
@@ -68,7 +68,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-销售订单id
      *
      * @param orderQuery 销售订单id
-     * @return
+     * @return  查询物流订单结果
      */
     @RequestMapping(value = "/purchaseLogisticsOrder", method = RequestMethod.POST)
     public HttpResult purchaseLogisticsOrder(@RequestBody @Valid OrderQuery orderQuery) {
@@ -85,7 +85,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-下方数据统计-贸易订单id
      *
      * @param id 贸易订单id
-     * @return
+     * @return  物流订单结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsOrderCount", method = RequestMethod.GET)
@@ -103,7 +103,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-撤销托运
      *
      * @param baseList 物流运单ids
-     * @return
+     * @return  操作结果
      */
     @Validated
     @RequestMapping(value = "/purchaseCancelConsign", method = RequestMethod.POST)
@@ -122,8 +122,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购购订单-车辆信息-销售订单ids
      *
-     * @param orderQuery
-     * @return
+     * @param orderQuery    销售订单请求数据
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseLogisticsCar", method = RequestMethod.POST)
@@ -140,8 +140,8 @@ public class LogisticsConsignmentController {
     /**
      * 采购/销售订单-完成车次统计
      *
-     * @param tradeOrderId
-     * @return
+     * @param tradeOrderId  贸易订单id
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/statisticsWaybillCount", method = RequestMethod.GET)
@@ -159,7 +159,7 @@ public class LogisticsConsignmentController {
      * 采购订单-托运订单列表-订单完结-数据查询
      *
      * @param orderId 物流订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/selectPurchaseOrderFinish", method = RequestMethod.GET)
@@ -176,15 +176,15 @@ public class LogisticsConsignmentController {
     /**
      * 采购订单-托运订单列表-完结订单
      *
-     * @param OrderFinishDTO
-     * @return
+     * @param orderFinishDTO    物流订单完结-页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/purchaseOrderFinish", method = RequestMethod.POST)
-    public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderFinishDTO OrderFinishDTO) {
-        log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(OrderFinishDTO));
+    public HttpResult purchaseOrderFinish(@RequestBody @Validated OrderFinishDTO orderFinishDTO) {
+        log.info("采购订单-托运订单列表-完结订单 传递参数信息:{}", JSONObject.toJSONString(orderFinishDTO));
         try {
-            return logisticsConsignmentService.orderFinish(OrderFinishDTO, "1");
+            return logisticsConsignmentService.orderFinish(orderFinishDTO, "1");
         } catch (Exception e) {
             log.error("采购订单-托运订单列表-完结订单 error :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -195,8 +195,8 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-物流托运生成托运订单
      *
-     * @param logisticsConsignmentParam
-     * @return
+     * @param logisticsConsignmentParam 页面请求参数
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsConsignment", method = RequestMethod.POST)
     public HttpResult sellLogisticsConsignment(@Valid @RequestBody LogisticsConsignmentParam logisticsConsignmentParam) {
@@ -214,7 +214,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-销售订单id
      *
      * @param query 订单查询
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsOrder", method = RequestMethod.POST)
     public HttpResult sellLogisticsOrder(@Valid @RequestBody OrderQuery query) {
@@ -231,7 +231,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-下方数据统计-贸易订单id
      *
      * @param id 贸易订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/sellLogisticsOrderCount", method = RequestMethod.GET)
@@ -249,7 +249,7 @@ public class LogisticsConsignmentController {
      * 销售订单-车辆列表-销售订单id
      *
      * @param orderQuery 销售订单ids
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellLogisticsCar", method = RequestMethod.POST)
     public HttpResult sellLogisticsCar(@Valid @RequestBody OrderQuery orderQuery) {
@@ -266,7 +266,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-撤销托运
      *
      * @param baseList 物流订单id
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/sellCancelConsign", method = RequestMethod.POST)
     @GlobalTransactional(name = "default_tx_group")
@@ -285,7 +285,7 @@ public class LogisticsConsignmentController {
      * 销售订单-托运订单列表-订单完结-数据查询
      *
      * @param orderId 物流订单id
-     * @return
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/selectSellOrderFinish", method = RequestMethod.GET)
@@ -302,8 +302,8 @@ public class LogisticsConsignmentController {
     /**
      * 销售订单-托运订单列表-完结订单
      *
-     * @param orderFinishDTO
-     * @return
+     * @param orderFinishDTO    完结数据页面请求参数
+     * @return  响应结果
      */
     @Validated
     @RequestMapping(value = "/sellOrderFinish", method = RequestMethod.POST)
@@ -354,7 +354,7 @@ public class LogisticsConsignmentController {
 
     /**
      * 生成物流订单编号demo
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addLogisticsNumberDemo", method = RequestMethod.GET)
     public HttpResult addLogisticsNumberDemo() {
@@ -364,7 +364,7 @@ public class LogisticsConsignmentController {
 
     /**
      * 生成车辆订单编号demo
-     * @return
+     * @return  响应结果
      */
     @RequestMapping(value = "/addWaybillNumberDemo", method = RequestMethod.GET)
     public HttpResult addWaybillNumberDemo() {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppConsignController.java

@@ -32,8 +32,8 @@ public class AppConsignController {
 
     /**
      * 企业app订单管理数据托运订单统计
-     * @param query
-     * @return
+     * @param query 请求参数
+     * @return  统计响应结果
      */
     @RequestMapping(name = "企业app订单管理数据托运订单统计", path = "/statisticsConsign", method = RequestMethod.POST)
     public HttpResult statisticsConsign(@Valid  @RequestBody AcceptCarriageOrderQuery query) {
@@ -48,8 +48,8 @@ public class AppConsignController {
 
     /**
      * 企业app托运订单详情统计-统计车辆运单
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @return  车辆运单数据
      */
     @RequestMapping(name = "企业app托运订单详情统计", path = "/statisticsConsignByOrderId", method = RequestMethod.GET)
     public HttpResult statisticsConsignByOrderId(@NotBlank(message = "订单id不能为空") @RequestParam("orderId") String orderId) {
@@ -64,8 +64,8 @@ public class AppConsignController {
 
     /**
      * 企业app托运订单循环车辆运单列表查询
-     * @param driverParam
-     * @return
+     * @param driverParam   循环单查询请求数据
+     * @return  车辆运单列表数据
      */
     @RequestMapping(name = "企业app托运订单循环车辆运单列表查询", path = "/consignStopDocumentDetail", method = RequestMethod.POST)
     public HttpResult consignStopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -25,8 +25,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单统计分类 - [运输中|已完成]
-     * @param keyword
-     * @return
+     * @param keyword   查询关键字
+     * @return  统计响应结果
      */
     @Valid
     @RequestMapping(name = "APP运单统计分类", value = "/waybillStatistic", method = RequestMethod.GET)
@@ -43,8 +43,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单列表 - [运输中|已完成]
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   运单查询请求dto
+     * @return  运单查询结果
      */
     @Valid
     @RequestMapping(name = "APP运单列表", value = "/waybillData", method = RequestMethod.POST)
@@ -59,8 +59,8 @@ public class AppWayBillController {
 
     /**
      * APP 运单列表吨量统计 - [运输中|已完成]
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   统计运单数据查询
+     * @return  运单重量响应结果
      */
     @Valid
     @RequestMapping(name = "APP运单吨量统计", value = "/waybillAmountStatistic", method = RequestMethod.POST)
@@ -75,8 +75,8 @@ public class AppWayBillController {
 
     /**
      * APP 物流订单-运单列表
-     * @param waybillOrderDTO
-     * @return
+     * @param waybillOrderDTO   物流订单查询
+     * @return  车辆运单响应结果
      */
     @Valid
     @RequestMapping(name = "物流订单-运单列表", value = "/logisticOrderWaybillData", method = RequestMethod.POST)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementLogisticsOrderController.java

@@ -45,7 +45,7 @@ public class ManagementLogisticsOrderController {
      * 运营管理端-物流订单-首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  物流订单数据查询结果
      */
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     public HttpResult selectLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
@@ -64,14 +64,13 @@ public class ManagementLogisticsOrderController {
      * 运营管理端-物流订单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  物流订单统计结果
      */
     @RequestMapping(value = "/statistics", method = RequestMethod.POST)
     public HttpResult statisticsLogisticsOrder(@Valid @RequestBody ManagementLogisticsOrderQuery query) {
         log.info("运营管理端-物流订单-top统计 查询 :{}", JSONObject.toJSONString(query));
         try {
-            HttpResult result = managementLogisticsOrderService.statisticsLogisticsOrder(query);
-            return result;
+            return managementLogisticsOrderService.statisticsLogisticsOrder(query);
         } catch (Exception e) {
             log.error("运营管理端-物流订单-top统计 失败 :{}", e.getMessage(), e);
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
@@ -80,9 +79,7 @@ public class ManagementLogisticsOrderController {
 
     /**
      * 运营管理端-物流订单-导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public void exportLogisticsOrder(@Validated @RequestBody ManagementLogisticsOrderQuery query) {
@@ -99,9 +96,9 @@ public class ManagementLogisticsOrderController {
 
     /**
      * 运营端-物流订单-获取订单详情
-     *
-     * @param orderId
-     * @return
+     * @param orderId   物流订单id
+     * @param orderNo   物流订单编号
+     * @return  订单详情数据
      */
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.GET)
     public HttpResult getOrderDetail(@RequestParam("orderId") @NotBlank(message = "订单id不能为空") String orderId,
@@ -119,8 +116,8 @@ public class ManagementLogisticsOrderController {
     /**
      * 运营端-物流订单-获取运单信息
      *
-     * @param orderDto
-     * @return
+     * @param orderDto  物流订单查询请求参数
+     * @return  车辆运单信息
      */
     @RequestMapping(value = "/getCarWaybillByOrder", method = RequestMethod.POST)
     public HttpResult getCarWaybillByOrder(@Valid @RequestBody LogisticsOrderQuery orderDto) {
@@ -137,7 +134,7 @@ public class ManagementLogisticsOrderController {
      * 基础档案-物流合同档案-根据合同id获取托运订单列表
      *
      * @param contractParam 请求参数[合同ids]
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/getLogisticsContract", method = RequestMethod.POST)
     public HttpResult getLogisticsContract(@Valid @RequestBody ManagementContractParam contractParam) {
@@ -155,7 +152,7 @@ public class ManagementLogisticsOrderController {
      * 运营端-贸易订单-获取物流订单
      *
      * @param query 订单查询
-     * @return
+     * @return  物流订单数据
      */
     @RequestMapping(value = "/selectLogisticsOrder", method = RequestMethod.POST)
     public HttpResult selectLogisticsOrderByTradeOrder(@Valid @RequestBody OrderQuery query) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/operationManagement/ManagementWaybillOrderController.java

@@ -40,7 +40,7 @@ public class ManagementWaybillOrderController {
      * 运营管理端-运单-首页条件查询
      *
      * @param query 查询参数
-     * @return
+     * @return  运单响应结果数据
      */
     @RequestMapping(value = "/select", method = RequestMethod.POST)
     public HttpResult selectWaybillOrder(@Valid @RequestBody ManagementWaybillOrderQuery query) {
@@ -57,7 +57,7 @@ public class ManagementWaybillOrderController {
      * 运营管理端-运单-top统计
      *
      * @param query 查询参数
-     * @return
+     * @return  运单统计结果
      */
     @RequestMapping(value = "/statistics", method = RequestMethod.POST)
     public HttpResult statisticsWaybillOrder(@Valid @RequestBody ManagementWaybillOrderQuery query) {
@@ -70,11 +70,9 @@ public class ManagementWaybillOrderController {
         }
     }
 
-    /**
+    /***
      * 运营管理端-运单-导出
-     *
      * @param query 查询参数
-     * @return
      */
     @RequestMapping(value = "/export", method = RequestMethod.POST)
     public void exportWaybillOrder(@Validated @RequestBody ManagementWaybillOrderQuery query) {
@@ -91,8 +89,8 @@ public class ManagementWaybillOrderController {
     /**
      * 运营端-运单-获取订单详情
      *
-     * @param id
-     * @return
+     * @param id 订单id
+     * @return  订单数据
      */
     @RequestMapping(value = "/getOrderDetail", method = RequestMethod.GET)
     public HttpResult getOrderDetail(@RequestParam("id") Long id) {

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

@@ -135,9 +135,6 @@ public class AcceptCarriageOrderService {
     @Autowired
     private KwtWaybillOrderTicketMapper waybillOrderTicketMapper;
 
-    @Autowired
-    private KwtWaybillOrderTrackMapper waybillOrderTrackMapper;
-
     @Autowired
     public KwtLogisticsOrderGoodsMapper kwtLogisticsOrderGoodsMapper;
 
@@ -160,8 +157,8 @@ public class AcceptCarriageOrderService {
     /**
      * 承运订单-分包托运
      *
-     * @param bo
-     * @return
+     * @param bo    请求数据
+     * @return  响应结果
      */
     @Transactional(rollbackFor = Exception.class)
     public HttpResult subcontractConsignment(SubcontractConsignmentDTO bo) {
@@ -227,11 +224,8 @@ public class AcceptCarriageOrderService {
         String substring = pidOrderNo.substring(0, 11);
         String lOrderNo = substring + logisticsOrder.getType() + String.valueOf(level) + String.valueOf(number + 1);
         Long orderId = new IdWorker(NumberConstant.ONE).nextId();
-        /**分包托运需要判断处于哪一级分包托运
-         * 需要记录当前分包数据-分包上游数据
-         * */
-        /**
-         * 判断是否已存在分包【当前分包只允许加上主单一共四级】*/
+        //分包托运需要判断处于哪一级分包托运,需要记录当前分包数据-分包上游数据
+       //判断是否已存在分包【当前分包只允许加上主单一共四级】
         if (level >= 4) {
             throw new RuntimeException("分包次数已达上限!");
         }
@@ -451,8 +445,8 @@ public class AcceptCarriageOrderService {
     /**
      * 分包托运-承运订单-单据状态
      *
-     * @param bo
-     * @param orderId
+     * @param bo    请求参数
+     * @param orderId   单据id
      */
     private void insertLogisticsOrderTrack(SubcontractConsignmentDTO bo, Long orderId, Integer orderStatus) {
         KwtLogisticsOrderTrack entity = new KwtLogisticsOrderTrack();