Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into…

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

@@ -8,6 +8,7 @@ import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderStrategyContext;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.constant.RedisConstants;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
@@ -15,6 +16,7 @@ import com.clx.performance.vo.pc.OrderChildPCVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -89,7 +91,9 @@ public class GoodsOrderController {
             sendLazyTime = goodsOrderStrategyContext.strategyContext.get(truckDemand).goodsOrderProcess(orderGoodsParams, orderInfo, now);
 
         } catch (Exception e) {
-            throw new RuntimeException(e);
+           // throw new ServiceSystemException(e);
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
+
         } finally {
             try {
                 if (rLock != null && rLock.isLocked()) {

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

@@ -70,7 +70,7 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
     @Override
     public Optional<List<OrderGoodsTruckBind>> selectListByTruckNo(List<String> truckList) {
         return Optional.ofNullable(baseMapper.selectList(new QueryWrapper<OrderGoodsTruckBind>().lambda()
-                        .ne(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.CANCEL.getCode())
+                        .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
                 .in(OrderGoodsTruckBind::getTruckNo,truckList).select(OrderGoodsTruckBind::getOrderGoodsNo)));
     }
 }

performance-web/src/main/java/com/clx/performance/strategy/impl/TwoGoodsOrderStrategy.java

@@ -81,11 +81,11 @@ public class TwoGoodsOrderStrategy implements GoodsOrderStrategy, InitializingBe
                 BigDecimal.ZERO, BigDecimal::add);
         BigDecimal ownSum = childParamsList.stream().filter(i -> !"1".equals(i.getVehicleUsage())).map(OrderGoodsChildParams::getExtractWeight).reduce(
                 BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal platformCarryWeight = new BigDecimal(orderInfo.getPlatformCarryWeight());
+        BigDecimal platformCarryWeight = new BigDecimal(orderInfo.getPlatformResidueCarryWeight());
         if (platformCarryWeight.compareTo(platSum) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前平台承运货单总吨数已超平台承运订单总吨数");
         }
-        BigDecimal ownCarryWeight = new BigDecimal(orderInfo.getOwnCarryWeight());
+        BigDecimal ownCarryWeight = new BigDecimal(orderInfo.getOwnResidueCarryWeight());
         if (ownCarryWeight.compareTo(ownSum) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前自有承运货单总吨数已超自有承运订单总吨数");
         }