修改BUG

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

@@ -654,21 +654,15 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
                 if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                     for (OrderGoods orderGoods : orderGoodsList) {
-                        OrderGoods update = new OrderGoods();
-                        update.setId(orderGoods.getId());
                         truckDemandMap.put(orderGoods.getTruckDemand(),
                                 truckDemandMap.get(orderGoods.getTruckDemand())
                                         .add(orderGoods.getResidueTransportWeight()));
-                        orderGoodsDao.updateEntityByKey(update);
                     }
                 } else {
                     for (OrderGoods orderGoods : orderGoodsList) {
-                        OrderGoods update = new OrderGoods();
-                        update.setId(orderGoods.getId());
                         vehicleUsageMap.put(orderGoods.getVehicleUsage(),
                                 vehicleUsageMap.get(orderGoods.getVehicleUsage())
                                         .add(orderGoods.getResidueTransportWeight()));
-                        orderGoodsDao.updateEntityByKey(update);
                     }
                 }
                 //归还吨数
@@ -769,7 +763,6 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             orderGoodsDao.updateEntityByKey(update);
 
                         }
-
                     }
                 } else {
                     for (OrderGoods orderGoods : orderGoodsList) {
@@ -820,7 +813,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             default:
-                throw new RuntimeException();
+                return;
 
         }
 
@@ -834,6 +827,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (!orderFeign.saveOrderSettlementJobRecord(orderNo).succeed()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
             }
+
         } catch (Exception e) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
 

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

@@ -445,7 +445,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 break;
@@ -485,7 +484,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 break;

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -246,7 +246,7 @@ public class OrderGoodsSqlProvider {
     public String updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value ="residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="status") Integer status,@Param(value ="id") Integer id){
         String sql = new SQL() {{
             UPDATE("order_goods")
-                    .SET("residue_transport_weight = residue_transport_weight - #{residueWeight}")
+                    .SET("residue_transport_weight = residue_transport_weight + #{residueWeight}")
                     .SET("already_transport_weight = already_transport_weight - #{alreadyWeight}")
                     .SET("status = #{status}")