优化相关代码

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

@@ -254,8 +254,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 param.setResidueWeight(residueWeight);
                 param.setOwnResidueCarryWeight(BigDecimal.ZERO);
                 param.setPlatformResidueCarryWeight(residueWeight);
-            }
-            if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+            } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
                 param.setResidueWeight(residueWeight);
                 param.setOwnResidueCarryWeight(residueWeight);
                 param.setPlatformResidueCarryWeight(BigDecimal.ZERO);
@@ -360,11 +359,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         );
     }
 
-    /**
-     * 平台取消订单前置(只修改订单相关状态)
-     *
-     * @param param
-     */
+//    /**
+//     * 平台取消订单前置(只修改订单相关状态)
+//     *
+//     * @param param
+//     */
 //    @Override
 //    @Transactional(rollbackFor = Exception.class)
 //    public void platformCancelOrderPre(OrderCancelParam param) {
@@ -625,8 +624,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     }
 
     private List<OrderGoods> getGoods(String orderNo, FeignOrderVO orderInfoFeign, Map<Integer, BigDecimal> truckDemandMap, Map<Integer, BigDecimal> vehicleUsageMap, RollbackOrderWeightParam rollbackOrderWeightParam, Integer truckDemand) {
-        List<OrderGoods> orderGoodsList;
-        orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
+        List<OrderGoods> orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
 
         if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
             for (OrderGoods orderGoods : orderGoodsList) {

performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -26,6 +28,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public abstract class GoodsOrderStrategy {
 
+    @Autowired
+    private Environment environment;
+
 
     /**
      * 不同的用车需求执行不同的策略   1：one  2:two 3:three
@@ -45,12 +50,15 @@ public abstract class GoodsOrderStrategy {
             throw new ServiceSystemException(ResultEnum.DATA_ERROR, "订单已暂停，无法进行提量");
         }
         String transportBeginTime = orderInfo.getTransportBeginTime();
+        if (!"test".equals(environment.getActiveProfiles()[0])) {
             for (OrderGoodsChildParams param : orderGoodsParams.getOrderGoodsChildParams()) {
                 String pendingOrderTime = param.getPendingOrderTime();
                 if (DateUtils.parseDateTime(pendingOrderTime).get().isBefore(DateUtils.parseDateTime(transportBeginTime).get())) {
                     throw new ServiceSystemException(ResultEnum.DATA_ERROR, "挂单时间不能早于拉运开始时间");
                 }
             }
+        }
+
         //多个定向单不允许车辆重复
         List<OrderGoodsChildParams> orderGoodsChildParams = orderGoodsParams.getOrderGoodsChildParams();
         Set<String> set = new HashSet<>();