企业app新增托运详情查询接口

处理页面字段翻译字典-null

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

@@ -1,14 +1,17 @@
 package com.sckw.transport.controller.enterpriseApp;
 
 import com.alibaba.fastjson.JSONObject;
+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.model.param.DriverParam;
 import com.sckw.transport.service.ConsignOrderService;
 import com.sckw.transport.service.KwtWaybillOrderService;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -27,6 +30,11 @@ public class AppConsignController {
     @Autowired
     private KwtWaybillOrderService waybillOrderService;
 
+    /**
+     * 企业app订单管理数据托运订单统计
+     * @param query
+     * @return
+     */
     @RequestMapping(name = "企业app订单管理数据托运订单统计", path = "/statisticsConsign", method = RequestMethod.POST)
     public HttpResult statisticsConsign(@Valid  @RequestBody AcceptCarriageOrderQuery query) {
         log.info("企业app订单管理数据托运订单统计 query :{}", JSONObject.toJSONString(query));
@@ -38,7 +46,11 @@ public class AppConsignController {
         }
     }
 
-
+    /**
+     * 企业app托运订单详情统计
+     * @param orderId
+     * @return
+     */
     @RequestMapping(name = "企业app托运订单详情统计", path = "/statisticsConsignByOrderId", method = RequestMethod.GET)
     public HttpResult statisticsConsignByOrderId(@NotBlank(message = "订单id不能为空") @RequestParam("orderId") String orderId) {
         log.info("企业app托运订单详情统计 query :{}",orderId);
@@ -49,4 +61,20 @@ public class AppConsignController {
             return HttpResult.error(e.getMessage());
         }
     }
+
+    /**
+     * 企业app托运订单循环车辆运单列表查询
+     * @param driverParam
+     * @return
+     */
+    @RequestMapping(name = "企业app托运订单循环车辆运单列表查询", path = "/consignStopDocumentDetail", method = RequestMethod.POST)
+    public HttpResult consignStopDocumentDetail(@Validated @RequestBody DriverParam driverParam) {
+        log.info("企业app托运订单循环车辆运单列表查询 query {}", JSONObject.toJSONString(driverParam));
+        try {
+            return consignOrderService.consignStopDocumentDetail(driverParam);
+        } catch (Exception e) {
+            log.error("企业app托运订单循环车辆运单列表查询:query {},error {} ", JSONObject.toJSONString(driverParam), e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticsOrderDTO.java

@@ -38,6 +38,12 @@ public class LogisticsOrderDTO {
      * 单据状态
      */
     private String status;
+
+    /**
+     * 单据状态
+     */
+    private String statusLabel;
+
     /**
      * 承运单位
      */

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

@@ -36,6 +36,7 @@ import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.mongo.model.TableTops;
 import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.CompleteLogisticsOrderParam;
+import com.sckw.order.api.model.CreateOrCancelLogisticsOrderParam;
 import com.sckw.order.api.model.OrderDetailRes;
 import com.sckw.order.api.model.UnitInfoDetailRes;
 import com.sckw.product.api.dubbo.GoodsInfoService;
@@ -697,6 +698,22 @@ public class AcceptCarriageOrderService {
                     .set(KwtLogisticsOrder::getStatus, orderStatus)
                     .set(KwtLogisticsOrder::getUpdateTime, new Date())
                     .set(KwtLogisticsOrder::getUpdateBy, LoginUserHolder.getUserId()));
+
+            /**数据回退至贸易订单*/
+            if (logisticsOrder.getTOrderId() != null) {
+                /**将生成的分配量->贸易订单*/
+                CreateOrCancelLogisticsOrderParam param = new CreateOrCancelLogisticsOrderParam();
+                param.setTOrderId(Long.valueOf(logisticsOrder.getTOrderId()));
+                param.setEntrustAmount(logisticsOrder.getAmount().negate());
+                param.setUpdateBy(LoginUserHolder.getUserId());
+                param.setUpdateByName(LoginUserHolder.getUserName());
+                HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);
+                if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
+                    log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
+                    throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!");
+                }
+            }
+
         }
         //状态表新增状态数据
         KwtLogisticsOrderTrack track = logisticsOrderTrackMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderTrack>()
@@ -1974,7 +1991,7 @@ public class AcceptCarriageOrderService {
         PageHelper.startPage(query.getPage(), query.getPageSize());
         List<Integer> orderList = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getStatus())) {
-            if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())) {
+            if (String.valueOf(NumberConstant.SEVEN).equals(query.getStatus())) {
                 orderList.add(LogisticsOrderEnum.REJECT_ORDER.getCode());
                 orderList.add(LogisticsOrderEnum.CANCEL_ORDER.getCode());
             } else {

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

@@ -1530,7 +1530,7 @@ public class ConsignOrderService {
         PageHelper.startPage(query.getPage(), query.getPageSize());
         List<Integer> orderList = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getStatus())) {
-            if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())) {
+            if (String.valueOf(NumberConstant.SEVEN).equals(query.getStatus())) {
                 orderList.add(LogisticsOrderEnum.REJECT_ORDER.getCode());
                 orderList.add(LogisticsOrderEnum.CANCEL_ORDER.getCode());
             } else {

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

@@ -161,7 +161,7 @@ public class LogisticsConsignmentService {
         if (!bo.getIsFullDose()) {
             BigDecimal amount = bo.getAmount();
             BigDecimal carryingCapacity = bo.getCarryingCapacity();
-            if (bo.getCarryingCapacity().compareTo(new BigDecimal("0.00")) == 0){
+            if (bo.getCarryingCapacity().compareTo(new BigDecimal("0.00")) == 0) {
                 log.error("可分配量分配错误:{}", bo.getTOrderId());
                 throw new BusinessException("可分配量分配必须填写大于0");
             }
@@ -643,7 +643,7 @@ public class LogisticsConsignmentService {
                 list = kwtLogisticsOrderMapper.selectOrderListNotPage(id, type);
                 if (CollectionUtils.isNotEmpty(list)) {
                     for (LogisticsOrderDTO logisticsOrderDTO : list) {
-//                        logisticsOrderDTO.setStatus(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
+                        logisticsOrderDTO.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
                         String createName = StringUtils.isBlank(logisticsOrderDTO.getCreateBy()) ? null :
                                 (remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())) == null ? null :
                                         remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())).getName());
@@ -723,8 +723,8 @@ public class LogisticsConsignmentService {
         List<LogisticsOrderDTO> returnList = new ArrayList<>();
         for (String id : stringList) {
             OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.parseLong(id));
-            log.info("贸易订单数据:{}",JSONObject.toJSONString(orderDetailRes));
-            log.info("贸易订单数据类型:{}",orderDetailRes.getPickupType());
+            log.info("贸易订单数据:{}", JSONObject.toJSONString(orderDetailRes));
+            log.info("贸易订单数据类型:{}", orderDetailRes.getPickupType());
             /**
              * 0销售展示是供应配送  1采购展示是采购自提
              * 根据提货方式（0供应配送/1采购自提）
@@ -743,7 +743,7 @@ public class LogisticsConsignmentService {
                 list = kwtLogisticsOrderMapper.selectOrderListNotPage(id, type);
                 if (CollectionUtils.isNotEmpty(list)) {
                     for (LogisticsOrderDTO logisticsOrderDTO : list) {
-//                        logisticsOrderDTO.setStatus(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
+                        logisticsOrderDTO.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
                         String createName = StringUtils.isBlank(logisticsOrderDTO.getCreateBy()) ? null :
                                 (remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())) == null ? null :
                                         remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())).getName());

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

@@ -57,10 +57,10 @@ public class TransportCommonService {
     @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 10000)
     RemoteSystemService remoteSystemService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     TradeOrderInfoService tradeOrderInfoService;
 
-    @DubboReference(version = "1.0.0", group = "design", check = false)
+    @DubboReference(version = "1.0.0", group = "design", check = false, timeout = 6000)
     RemoteContractService remoteContractService;
 
     @Autowired