修改BUG

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

@@ -309,7 +309,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 rollbackOrderWeightParam.setResidueWeight(answer);
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer);
-            }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+            }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                 rollbackOrderWeightParam.setResidueWeight(answer);
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(answer);
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
@@ -321,10 +321,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 rollbackOrderWeightParam.setResidueWeight(answer.negate());
                 rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
                 rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer.negate());
-            }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
+            }else if (oldOrderGoods.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                 rollbackOrderWeightParam.setResidueWeight(answer.negate());
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(answer.negate());
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                if (VehicleUsageEnum.Status.OWN.getCode().equals(oldOrderGoods.getVehicleUsage())) {
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(answer.negate());
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                } else {
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(answer.negate());
+                }
             }
         }
         log.info("回填吨数：{}", JSONUtil.parse(rollbackOrderWeightParam));

performance-web/src/main/java/com/clx/performance/utils/gd/GdService.java

@@ -46,7 +46,7 @@ public class GdService {
 
     public static List<GdRouteDTO> getRoute(String key, BigDecimal originLongitude, BigDecimal originLatitude,
                                                 BigDecimal destinationLongitude, BigDecimal destinationLatitude) {
-        log.info("高德线路规划开始");
+        //log.info("高德线路规划开始");
         List<GdRouteDTO> routeList = new ArrayList<>();
 
         String url = DIRECTION_API+"?origin=" + originLongitude.doubleValue()+","+originLatitude.doubleValue()
@@ -154,7 +154,7 @@ public class GdService {
         // 按距离升序
         routeList.sort(Comparator.comparingInt(GdRouteDTO::getDistance));
 
-        log.info("高德线路规划结束, route:{}", routeList.size());
+        //log.info("高德线路规划结束, route:{}", routeList.size());
         return routeList;
     }