merge

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -76,8 +76,6 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus")
     Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
 
-    @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getCancelOrderGoods")
-    List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<OrderGoodsTruckBind> param);
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "getAlreadyTransportWeight")
     BigDecimal getAlreadyTransportWeight(@Param("orderNo") String orderNo);
     List<OrderGoodsAPPVO> getCancelOrderGoods(@Param(value = "param") List<String> param);

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

@@ -13,7 +13,6 @@ import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
-import com.clx.performance.dao.OrderGoodsTruckBindDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.model.OrderChild;
@@ -25,12 +24,9 @@ import com.clx.performance.service.OrderCancelService;
 import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.clx.performance.service.OwnerAccountService;
-import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
-import com.msl.common.base.PageParam;
-import com.msl.common.enums.ResultEnum;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
@@ -46,7 +42,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j