开发：bug修复

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -94,6 +94,9 @@ public class GoodsOrderController {
                 LocalDateTime now = LocalDateTime.now();
                 int beginOrderGoodsId = orderGoodsIdGenerate.getOrderGoodsId("pt", childParamsList.size());
                 for (OrderGoodsChildParams child : childParamsList) {
+                    if (child.getPendingOrderWay().equals(2) && child.getNeedTruckNum() == null) {
+                        throw new RuntimeException("定向派单必须选择车辆");
+                    }
                     OrderGoods orderGoods = new OrderGoods();
                     //提取吨数
                     orderGoods.setExtractWeight(child.getExtractWeight());
@@ -115,6 +118,61 @@ public class GoodsOrderController {
                     orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
                     orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
 
+                    orderGoods.setOrderNo(orderNo);
+                    orderGoods.setOrderGoodsType("PT");
+                    orderGoods.setOrderGoodsNo("PT" + beginOrderGoodsId);
+                    orderGoods.setOrderGoodsStatus(10);
+                    orderGoods.setSendAddressId(orderInfo.getSendAddressId());
+                    orderGoods.setSendAddressShorter(orderInfo.getSendAddressShorter());
+                    //收发货经纬度
+                    orderGoods.setSendLongitude(orderInfo.getSendLongitude());
+                    orderGoods.setSendLatitude(orderInfo.getSendLatitude());
+                    orderGoods.setReceiveLatitude(orderInfo.getReveiveLatitude());
+                    orderGoods.setReceiveLongitude(orderInfo.getReveiveLongitude());
+                    orderGoods.setGoodsName(orderInfo.getGoodsName());
+                    orderGoods.setCreateTime(now);
+                    orderGoods.setModifiedTime(now);
+                    beginOrderGoodsId = beginOrderGoodsId + 1;
+                    orderGoodsMapper.insert(orderGoods);
+                }
+            } else {
+                List<OrderGoodsChildParams> childParamsList = orderGoodsParams.getOrderGoodsChildParams();
+                BigDecimal childSum = childParamsList.stream().map(OrderGoodsChildParams::getExtractWeight).reduce(
+                        BigDecimal.ZERO, BigDecimal::add);
+                if (orderInfo.getResidueWeight().compareTo(childSum) < 0) {
+                    throw new RuntimeException("当前货单总吨数已超订单总吨数");
+                }
+                if (childParamsList.size() > 1) {
+                    throw new RuntimeException("全部自有车辆只能全部提取");
+                }
+                LocalDateTime now = LocalDateTime.now();
+                int beginOrderGoodsId = orderGoodsIdGenerate.getOrderGoodsId("pt", childParamsList.size());
+                for (OrderGoodsChildParams child : childParamsList) {
+
+                    OrderGoods orderGoods = new OrderGoods();
+                    //提取吨数
+                    orderGoods.setExtractWeight(child.getExtractWeight());
+                    orderGoods.setExtractWeight(child.getExtractWeight());
+                    //提取方式 1提取全部 2提取部分
+                    Integer extractWay = child.getExtractWay();
+                    if (extractWay.equals(2)) {
+                        throw new RuntimeException("全部自有车辆只能全部提取");
+                    }
+                    orderGoods.setExtractWay(extractWay);
+                    //需要车辆
+                    orderGoods.setNeedTruckNum(child.getNeedTruckNum());
+                    //挂单方式
+                    orderGoods.setPendingOrderWay(child.getPendingOrderWay());
+                    //挂单时间
+                    orderGoods.setPendingOrderTime(DateUtils.parseDateTime(child.getPendingOrderTime()).get());
+                    orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
+
+                    orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
+                    //定向运单失效时间
+                    orderGoods.setDirectionalExpireTime(DateUtils.parseDateTime(child.getDirectionalExpireTime()).get());
+                    orderGoods.setSeniorLogisticsManagerId(child.getSeniorLogisticsManagerId());
+                    orderGoods.setSeniorLogisticsManagerName(child.getSeniorLogisticsManagerName());
+
                     orderGoods.setOrderNo(orderNo);
                     orderGoods.setOrderGoodsType("PT");
                     orderGoods.setOrderGoodsNo("PT" + beginOrderGoodsId);

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDriverTruckDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.msl.common.dao.BaseDao;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.clx.performance.mapper.OrderGoodsDriverTruckMapper;
@@ -12,5 +13,5 @@ import org.springframework.stereotype.Repository;
  * Time 16:45
  */
 @Repository
-public class OrderGoodsDriverTruckDaoImpl extends BaseDaoImpl<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> implements BaseDao<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> {
+public class OrderGoodsDriverTruckDaoImpl extends BaseDaoImpl<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> implements OrderGoodsDriverTruckDao {
 }

performance-web/src/main/java/com/clx/performance/dao/impl/SeniorLogisticsManagerDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.clx.performance.dao.SeniorLogisticsManagerDao;
 import com.msl.common.dao.BaseDao;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.clx.performance.mapper.SeniorLogisticsManagerMapper;
@@ -12,5 +13,5 @@ import org.springframework.stereotype.Repository;
  * Time 16:45
  */
 @Repository
-public class SeniorLogisticsManagerDaoImpl extends BaseDaoImpl<SeniorLogisticsManagerMapper, SeniorLogisticsManager, Integer> implements BaseDao<SeniorLogisticsManagerMapper, SeniorLogisticsManager, Integer> {
+public class SeniorLogisticsManagerDaoImpl extends BaseDaoImpl<SeniorLogisticsManagerMapper, SeniorLogisticsManager, Integer> implements SeniorLogisticsManagerDao {
 }

performance-web/src/main/java/com/clx/performance/service/impl/SeniorLogisticsManagerServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.List;
 @AllArgsConstructor
 public class SeniorLogisticsManagerServiceImpl  implements SeniorLogisticsManagerService {
 
-    SeniorLogisticsManagerDao seniorLogisticsManagerDao;
+    private final SeniorLogisticsManagerDao seniorLogisticsManagerDao;
 
 
 

performance-web/src/main/resources/bootstrap.yml

@@ -17,7 +17,8 @@ spring:
         server-addr: nacos.devclx.cn:8848
         username: nacos
         password: nacos
-        register-enabled: false
+        register-enabled: true
+        namespace: new-clx-dev
 
       #        namespace: ${spring.profiles.active}
       config: