1.修改运单实体字段类型double->bigDecimal

2.托运订单设置停止接单查询
3.托运订单设置停止接单提交

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderSubtask.java

@@ -3,6 +3,8 @@ package com.sckw.transport.model;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -42,12 +44,12 @@ public class KwtWaybillOrderSubtask extends BaseModel {
     /**
      * 已委托量
      */
-    private Double entrustAmount;
+    private BigDecimal entrustAmount;
 
     /**
      * 卸货重量
      */
-    private Double unloadAmount;
+    private BigDecimal unloadAmount;
 
     /**
      * 计划结束日期
@@ -57,7 +59,7 @@ public class KwtWaybillOrderSubtask extends BaseModel {
     /**
      * 装货重量
      */
-    private Double loadAmount;
+    private BigDecimal loadAmount;
 
     /**
      * 计划开始日期
@@ -67,10 +69,10 @@ public class KwtWaybillOrderSubtask extends BaseModel {
     /**
      * 亏吨重量
      */
-    private Double deficitAmount;
+    private BigDecimal deficitAmount;
 
     /**
      * 亏吨扣款
      */
-    private Double deficitPrice;
+    private BigDecimal deficitPrice;
 }

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

@@ -10,10 +10,10 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
-import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.constant.NumberConstant;
 import com.sckw.core.model.enums.*;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.model.page.PageResult;
@@ -30,10 +30,12 @@ import com.sckw.manage.api.RemoteManageService;
 import com.sckw.manage.api.model.dto.res.FindEntCooperateResVo;
 import com.sckw.mongo.enums.BusinessTypeEnum;
 import com.sckw.mongo.model.SckwLogisticsOrder;
-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.*;
+import com.sckw.order.api.model.CompleteLogisticsOrderParam;
+import com.sckw.order.api.model.GoodsLoadingParam;
+import com.sckw.order.api.model.OrderDetailRes;
+import com.sckw.order.api.model.UnitInfoDetailRes;
 import com.sckw.payment.api.dubbo.PaymentDubboService;
 import com.sckw.payment.api.model.dto.SettlementMoney;
 import com.sckw.redis.config.RedisLockUtil;
@@ -216,6 +218,8 @@ public class KwtConsignOrderService {
         if (ObjectUtils.isEmpty(order)) {
             return HttpResult.ok();
         }
+        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = waybillOrderSubtaskMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderSubtask>()
+                        .eq(StringUtils.isNotBlank(order.getId()), KwtWaybillOrderSubtask::getLOrderId, order.getId()));
         List<KwtWaybillOrder> kwtWaybillOrders = kwtWaybillOrderMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrder>()
                         .eq(StringUtils.isNotBlank(order.getId()), KwtWaybillOrder::getLOrderId, order.getId())
                 /**.eq(KwtWaybillOrder::getEntId, LoginUserHolder.getEntId())*/);
@@ -235,8 +239,8 @@ public class KwtConsignOrderService {
         BigDecimal defectiveWeighNumber = NumberConstant.ZERO_TWO;
         //扣亏量/吨
         BigDecimal deductWeighNumber = NumberConstant.ZERO_TWO;
-        if (CollectionUtils.isNotEmpty(kwtWaybillOrders)) {
-            for (KwtWaybillOrder kwtWaybillOrder : kwtWaybillOrders) {
+        if (CollectionUtils.isNotEmpty(waybillOrderSubtasks)) {
+            for (KwtWaybillOrderSubtask kwtWaybillOrder : waybillOrderSubtasks) {
                 //派车量
                 BigDecimal sendCarWeigh = kwtWaybillOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : kwtWaybillOrder.getEntrustAmount();
                 /**亏吨量/吨->装货量-卸货量
@@ -267,7 +271,7 @@ public class KwtConsignOrderService {
                 deductWeighNumber = deductWeighNumber.add(deduct);
             }
         }
-        statistics.put("count", kwtWaybillOrders.size());
+        statistics.put("count", waybillOrderSubtasks.size());
         statistics.put("sendCarWeighNumber", sendCarWeighNumber);
         statistics.put("loadAmountNumber", loadAmountNumber);
         statistics.put("unloadAmountNumber", unloadAmountNumber);
@@ -473,37 +477,41 @@ public class KwtConsignOrderService {
         if (CollectionUtils.isNotEmpty(list)) {
             list.forEach(circulateId -> {
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("circulateId", circulateId);
-                KwtLogisticsOrderCirculate circulate = kwtLogisticsOrderCirculateMapper.selectOne(new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                        .eq(KwtLogisticsOrderCirculate::getId, circulateId)
+                jsonObject.put("id", circulateId);
+//                KwtLogisticsOrderCirculate circulate = kwtLogisticsOrderCirculateMapper.selectOne(new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
+//                        .eq(KwtLogisticsOrderCirculate::getId, circulateId)
+//                );
+                List<KwtWaybillOrderSubtask> subtasks = waybillOrderSubtaskMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderSubtask>()
+                        .eq(KwtWaybillOrderSubtask::getId, circulateId)
+                        .eq(KwtWaybillOrderSubtask::getDelFlag, 0)
                 );
-                if (circulate == null) {
+                if (subtasks == null) {
                     jsonObject.put("status", HttpStatus.GLOBAL_EXCEPTION_CODE);
                     jsonObject.put("message", "单据不存在或者单据异常");
                 } else {
                     /**循环单逻辑失效 如果已生成趟次数据，则不处理趟次数据*/
-                    kwtLogisticsOrderCirculateMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderCirculate>()
-                            .set(KwtLogisticsOrderCirculate::getStatus, NumberConstant.ONE)
-                            .set(KwtLogisticsOrderCirculate::getUpdateBy, LoginUserHolder.getUserId())
-                            .set(KwtLogisticsOrderCirculate::getUpdateTime, new Date())
-                            .eq(KwtLogisticsOrderCirculate::getId, circulateId)
-                            .eq(KwtLogisticsOrderCirculate::getLOrderId, Long.parseLong(lOrderId))
+                    waybillOrderSubtaskMapper.update(null, new LambdaUpdateWrapper<KwtWaybillOrderSubtask>()
+                            .set(KwtWaybillOrderSubtask::getStatus, NumberConstant.ONE)
+                            .set(KwtWaybillOrderSubtask::getUpdateBy, LoginUserHolder.getUserId())
+                            .set(KwtWaybillOrderSubtask::getUpdateTime, new Date())
+                            .eq(KwtWaybillOrderSubtask::getId, circulateId)
+                            .eq(KwtWaybillOrderSubtask::getLOrderId, Long.parseLong(lOrderId))
                     );
-                    /**更新MongoDB*/
-                    if (circulate.getWOrderId() != null) {
-                        SckwWaybillOrder order = new SckwWaybillOrder();
-                        order.set_id(circulate.getWOrderId());
-                        order.setWOrderId(circulate.getWOrderId());
-//                        order.setStatus(NumberConstant.ONE);
-                        order.setUpdateTime(new Date());
-                        order.setUpdateByName(LoginUserHolder.getUserName());
-                        order.setUpdateBy(LoginUserHolder.getUserId());
-                        SckwBusSum busSum = new SckwBusSum();
-                        busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
-                        busSum.setMethod(NumberConstant.TWO);
-                        busSum.setObject(order);
-                        streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
-                    }
+//                    /**更新MongoDB*/
+//                    if (circulate.getWOrderId() != null) {
+//                        SckwWaybillOrder order = new SckwWaybillOrder();
+//                        order.set_id(circulate.getWOrderId());
+//                        order.setWOrderId(circulate.getWOrderId());
+////                        order.setStatus(NumberConstant.ONE);
+//                        order.setUpdateTime(new Date());
+//                        order.setUpdateByName(LoginUserHolder.getUserName());
+//                        order.setUpdateBy(LoginUserHolder.getUserId());
+//                        SckwBusSum busSum = new SckwBusSum();
+//                        busSum.setBusSumType(BusinessTypeEnum.WAYBILL_ORDER_TYPE.getName());
+//                        busSum.setMethod(NumberConstant.TWO);
+//                        busSum.setObject(order);
+//                        streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
+//                    }
                     jsonObject.put("status", HttpStatus.SUCCESS_CODE);
                     jsonObject.put("message", "停止接单成功");
                 }
@@ -572,7 +580,14 @@ public class KwtConsignOrderService {
         }
         /**请求参数校验*/
         checkParam(driverParam);
-        List<DriverListVo> list = kwtLogisticsOrderMapper.selectLoopOrderAndDriverListByOrderId(driverParam);
+//        List<DriverListVo> list = kwtLogisticsOrderMapper.selectLoopOrderAndDriverListByOrderId(driverParam);
+        List<Integer> orderStatus = new ArrayList<>() {{
+            add(CarWaybillEnum.APPROVAL_PASS.getCode());
+            add(CarWaybillEnum.APPROVAL_IN.getCode());
+            add(CarWaybillEnum.APPROVAL_NO_PASS.getCode());
+            add(CarWaybillEnum.APPROVAL_TREAT.getCode());
+        }};
+        List<DriverListVo> list = waybillOrderSubtaskMapper.selectLoopOrderAndDriverListByOrderId(driverParam, 1, orderStatus);
         Map<String, RTruckVo> truck = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<String> collect = list.stream().map(DriverListVo::getTruckNo).distinct().collect(Collectors.toList());

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

@@ -734,7 +734,7 @@ public class KwtWaybillOrderService {
             orderSubtask.setWOrderId(waybillOrder.getId());
             orderSubtask.setWOrderNo(waybillOrder.getWOrderNo());
             orderSubtask.setUnit(logisticsOrder != null ? logisticsOrder.getUnit() : null);
-            orderSubtask.setEntrustAmount(entrustAmount.get(key).doubleValue());
+            orderSubtask.setEntrustAmount(entrustAmount.get(key));
             orderSubtask.setLoadTime(loadTime1.get(Global.NUMERICAL_ZERO));
             orderSubtask.setUnloadTime(unloadTime1.get(Global.NUMERICAL_ZERO));
             orderSubtask.setStatus(waybillOrder.getStatus());

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

@@ -47,11 +47,11 @@ public class KwtWaybillOrderSubtaskService {
         orderSubtask.setWOrderId(waybillOrder.getId());
         orderSubtask.setWOrderNo(waybillOrder.getWOrderNo());
         orderSubtask.setUnit(logisticsOrder != null ? logisticsOrder.getUnit() : null);
-        orderSubtask.setEntrustAmount(entrustAmount.doubleValue());
+        orderSubtask.setEntrustAmount(entrustAmount);
         orderSubtask.setLoadTime(loadTime.get(Global.NUMERICAL_ZERO));
-        orderSubtask.setLoadAmount(NumberConstant.ZERO_TWO.doubleValue());
+        orderSubtask.setLoadAmount(NumberConstant.ZERO_TWO);
         orderSubtask.setUnloadTime(unloadTime.get(Global.NUMERICAL_ZERO));
-        orderSubtask.setUnloadAmount(NumberConstant.ZERO_TWO.doubleValue());
+        orderSubtask.setUnloadAmount(NumberConstant.ZERO_TWO);
         orderSubtask.setStatus(waybillOrder.getStatus());
         waybillOrderSubtaskDao.insert(orderSubtask);
         return orderSubtask;

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

@@ -1180,7 +1180,7 @@ public class KwtWaybillOrderV1Service {
                 KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
                 //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
                 BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-                logisticsOrder.setEntrustAmount(entrustAmount.subtract(BigDecimal.valueOf(subtask.getEntrustAmount())));
+                logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
                 logisticsOrderDao.updateById(logisticsOrder);
             }
         }
@@ -1251,7 +1251,7 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
             //承运订单已委派量=承运订单原委派量+当前车辆运单委派量
             BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-            logisticsOrder.setEntrustAmount(entrustAmount.add(BigDecimal.valueOf(subtask.getEntrustAmount())));
+            logisticsOrder.setEntrustAmount(entrustAmount.add(subtask.getEntrustAmount()));
             logisticsOrderDao.updateById(logisticsOrder);
         }
         return HttpResult.ok();
@@ -1316,7 +1316,7 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
             //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
             BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-            logisticsOrder.setEntrustAmount(entrustAmount.subtract(BigDecimal.valueOf(subtask.getEntrustAmount())));
+            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
             logisticsOrderDao.updateById(logisticsOrder);
         }
 
@@ -1444,7 +1444,7 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(subtask.getLOrderId());
             //承运订单已委派量=承运订单原委派量-当前车辆运单委派量
             BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? NumberConstant.ZERO_TWO : logisticsOrder.getEntrustAmount();
-            logisticsOrder.setEntrustAmount(entrustAmount.subtract(BigDecimal.valueOf(subtask.getEntrustAmount())));
+            logisticsOrder.setEntrustAmount(entrustAmount.subtract(subtask.getEntrustAmount()));
             logisticsOrderDao.updateById(logisticsOrder);
         }
 
@@ -1535,7 +1535,7 @@ public class KwtWaybillOrderV1Service {
         KwtWaybillOrderSubtask orderSubtask = waybillOrderSubtaskDao.selectById(params.getWSubtaskId());
         //榜单信息
         List<WaybillOrderTicketLoadingDto> loading = params.getLoading();
-        orderSubtask.setLoadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), BigDecimal.valueOf(orderSubtask.getLoadAmount())).doubleValue());
+        orderSubtask.setLoadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getLoadAmount()));
         orderSubtask.setStatus(waybillOrder.getStatus());
         waybillOrderSubtaskDao.updateById(orderSubtask);
 
@@ -1614,11 +1614,11 @@ public class KwtWaybillOrderV1Service {
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(orderSubtask.getLOrderId());
         //榜单信息
         List<WaybillOrderTicketLoadingDto> loading = params.getLoading();
-        orderSubtask.setUnloadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), BigDecimal.valueOf(orderSubtask.getUnloadAmount())).doubleValue());
-        orderSubtask.setDeficitAmount(BigDecimal.valueOf(orderSubtask.getLoadAmount()).subtract(BigDecimal.valueOf(orderSubtask.getUnloadAmount())).doubleValue());
-        BigDecimal deficitPrice = deficitPrice(BigDecimal.valueOf(orderSubtask.getLoadAmount()), BigDecimal.valueOf(orderSubtask.getDeficitAmount()),
+        orderSubtask.setUnloadAmount(waybillOrderTicketService.countAmount(loading, orderSubtask.getUnit(), orderSubtask.getUnloadAmount()));
+        orderSubtask.setDeficitAmount(orderSubtask.getLoadAmount().subtract(orderSubtask.getUnloadAmount()));
+        BigDecimal deficitPrice = deficitPrice(orderSubtask.getLoadAmount(), orderSubtask.getDeficitAmount(),
                                   logisticsOrder.getLoss(), logisticsOrder.getLossUnit(), logisticsOrder.getGoodsPrice());
-        orderSubtask.setDeficitPrice(deficitPrice.doubleValue());
+        orderSubtask.setDeficitPrice(deficitPrice);
         orderSubtask.setStatus(waybillOrder.getStatus());
         waybillOrderSubtaskDao.updateById(orderSubtask);
 
@@ -1699,10 +1699,10 @@ public class KwtWaybillOrderV1Service {
             subtaskNew.setId(null);
             subtaskNew.setWOrderId(waybillOrderNew.getId());
             subtaskNew.setWOrderNo(waybillOrderNew.getWOrderNo());
-            subtaskNew.setLoadAmount(NumberConstant.ZERO_TWO.doubleValue());
-            subtaskNew.setUnloadAmount(NumberConstant.ZERO_TWO.doubleValue());
-            subtaskNew.setDeficitAmount(NumberConstant.ZERO_TWO.doubleValue());
-            subtaskNew.setDeficitPrice(NumberConstant.ZERO_TWO.doubleValue());
+            subtaskNew.setLoadAmount(NumberConstant.ZERO_TWO);
+            subtaskNew.setUnloadAmount(NumberConstant.ZERO_TWO);
+            subtaskNew.setDeficitAmount(NumberConstant.ZERO_TWO);
+            subtaskNew.setDeficitPrice(NumberConstant.ZERO_TWO);
             subtaskNew.setStatus(waybillOrderNew.getStatus());
             subtaskNew.setCreateTime(null);
             subtaskNew.setUpdateTime(null);
@@ -1775,12 +1775,12 @@ public class KwtWaybillOrderV1Service {
         BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
         //卸货-总量
         BigDecimal unloadAmount = unloadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
-        orderSubtask.setLoadAmount(loadAmount.doubleValue());
-        orderSubtask.setUnloadAmount(unloadAmount.doubleValue());
-        orderSubtask.setDeficitAmount(BigDecimal.valueOf(orderSubtask.getLoadAmount()).subtract(BigDecimal.valueOf(orderSubtask.getUnloadAmount())).doubleValue());
-        BigDecimal deficitPrice = deficitPrice(BigDecimal.valueOf(orderSubtask.getLoadAmount()), BigDecimal.valueOf(orderSubtask.getDeficitAmount()),
+        orderSubtask.setLoadAmount(loadAmount);
+        orderSubtask.setUnloadAmount(unloadAmount);
+        orderSubtask.setDeficitAmount(orderSubtask.getLoadAmount().subtract(orderSubtask.getUnloadAmount()));
+        BigDecimal deficitPrice = deficitPrice(orderSubtask.getLoadAmount(), orderSubtask.getDeficitAmount(),
                 logisticsOrder.getLoss(), logisticsOrder.getLossUnit(), logisticsOrder.getGoodsPrice());
-        orderSubtask.setDeficitPrice(deficitPrice.doubleValue());
+        orderSubtask.setDeficitPrice(deficitPrice);
         waybillOrderSubtaskDao.updateById(orderSubtask);
 
         /*4、更新车辆运单子单状态*/
@@ -1988,12 +1988,12 @@ public class KwtWaybillOrderV1Service {
             BigDecimal loadAmount = loadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
             //卸货-总量
             BigDecimal unloadAmount = unloadTickets.stream().map(KwtWaybillOrderTicket::getAmount ).reduce(BigDecimal.ZERO, BigDecimal::add);
-            orderSubtask.setLoadAmount(loadAmount.doubleValue());
-            orderSubtask.setUnloadAmount(unloadAmount.doubleValue());
-            orderSubtask.setDeficitAmount(BigDecimal.valueOf(orderSubtask.getLoadAmount()).subtract(BigDecimal.valueOf(orderSubtask.getUnloadAmount())).doubleValue());
-            BigDecimal deficitPrice = deficitPrice(BigDecimal.valueOf(orderSubtask.getLoadAmount()), BigDecimal.valueOf(orderSubtask.getDeficitAmount()),
+            orderSubtask.setLoadAmount(loadAmount);
+            orderSubtask.setUnloadAmount(unloadAmount);
+            orderSubtask.setDeficitAmount(orderSubtask.getLoadAmount().subtract(orderSubtask.getUnloadAmount()));
+            BigDecimal deficitPrice = deficitPrice(orderSubtask.getLoadAmount(), orderSubtask.getDeficitAmount(),
                     logisticsOrder.getLoss(), logisticsOrder.getLossUnit(), logisticsOrder.getGoodsPrice());
-            orderSubtask.setDeficitPrice(deficitPrice.doubleValue());
+            orderSubtask.setDeficitPrice(deficitPrice);
             waybillOrderSubtaskDao.updateById(orderSubtask);
         }
     }
@@ -2022,7 +2022,7 @@ public class KwtWaybillOrderV1Service {
             WaybillCountVo unloadCount = waybillOrderV1Dao.findTicketCountByAddress(queryParams);
 
             //委派量多退少补entrustAmount(委派未运量=运单子单承运委派量-运单子单装货量)
-            BigDecimal residue = BigDecimal.valueOf(subtask.getEntrustAmount()).subtract(BigDecimal.valueOf(subtask.getLoadAmount()));
+            BigDecimal residue = subtask.getEntrustAmount().subtract(subtask.getLoadAmount());
             logisticsOrder.setEntrustAmount(logisticsOrder.getEntrustAmount().subtract(residue));
             logisticsOrder.setLoadAmount(loadCount.getAmount());
             logisticsOrder.setLoadTime(loadCount.getLoadTime());