订单结算单任务处理Feign

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -81,4 +81,7 @@ public interface PerformanceFeign {
 
     @PostMapping(value = {"clx-performance/pc/carrier/settlementOwner/updateStatusByOrderNo"})
     Result<Object> updateStatusByOrderNo(@RequestBody UpdateStatusParam param);
+
+    @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
+    Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
 }

performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

@@ -180,7 +180,7 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                 }
                 OrderGoods orderGoods = optional.get();
 
-                List<OrderChild> orderChildrenList = orderChildDao.selectInTransitOrderChild(orderGoodsNo);
+                List<OrderChild> orderChildrenList = orderChildDao.selectArriveSendOrderChild(orderGoodsNo);
 
                 BigDecimal childSum = BigDecimal.ZERO;
 

performance-web/src/main/java/com/clx/performance/controller/feign/OrderChildFeignController.java

 package com.clx.performance.controller.feign;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.service.OrderChildService;
+import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @RestController
 @RequestMapping("/feign/orderChild")
@@ -21,8 +25,24 @@ public class OrderChildFeignController {
     private final OrderChildService orderChildService;
 
     @GetMapping({"/getOrderChildTotalByUserNo"})
-    Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo){
+    Integer getTrucksByOrderGoodsNo(@RequestParam("userNo") @NotNull(message = "用户编号不可为空") Long userNo) {
         Integer totalByUserNo = orderChildService.getOrderChildTotalByUserNo(userNo);
         return totalByUserNo;
     }
+
+    /**
+     * 查询在途运单
+     *
+     * @param orderNo
+     * @return
+     */
+    @GetMapping({"/selectInTransitOrderChild"})
+    Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo) {
+        List<OrderChild> orderChildren = orderChildService.selectInTransitOrderChild(orderNo);
+        if (CollectionUtil.isNotEmpty(orderChildren)) {
+            return Result.ok(true);
+        } else {
+            return Result.ok(false);
+        }
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -89,11 +89,11 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> selectResidueWeightByOrderGoodsNo(String orderGoodsNo,Integer status,List<String> truckList);
 
     /**
-     * 查询在途运单
+     * 查询未到达货源地的运单
      * @param orderGoodsNo
      * @return
      */
-    List<OrderChild> selectInTransitOrderChild(String orderGoodsNo);
+    List<OrderChild> selectArriveSendOrderChild(String orderGoodsNo);
 
 
     void batchUpdateOrderChildStatus(Integer status, List<Integer> ids);
@@ -103,4 +103,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     List<OrderChild> selectListByOrderGoodsList(List<String> orderGoodsList);
 
     List<OrderChild> listOrderChildByOrderNoAndStatus(String orderNo,List<Integer> status);
+
+    List<OrderChild> selectInTransitOrderChild(String orderNo);
 }

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

 package com.clx.performance.dao.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -287,13 +286,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public List<OrderChild> selectResidueWeightByOrderGoodsNo(String orderGoodsNo, Integer status, List<String> truckList) {
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo,orderGoodsNo)
                 .lt(ObjectUtil.isNotEmpty(status),OrderChild::getStatus, status)
-                .in(CollectionUtil.isNotEmpty(truckList),OrderChild::getTruckNo, truckList)
+                .in(OrderChild::getTruckNo, truckList)
         );
     }
 
 
     @Override
-    public List<OrderChild> selectInTransitOrderChild(String orderGoodsNo) {
+    public List<OrderChild> selectArriveSendOrderChild(String orderGoodsNo) {
         //查询小于 40 未到达货源地的运单
         return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderGoodsNo, orderGoodsNo)
                 .lt(OrderChild::getStatus, OrderChildEnum.Status.ARRIVE_SEND.getCode())
@@ -357,4 +356,11 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
                         .in(OrderChild :: getStatus,status)
         );
     }
+
+    @Override
+    public List<OrderChild> selectInTransitOrderChild(String orderNo) {
+        return baseMapper.selectList(lQrWrapper().eq(OrderChild::getOrderNo, orderNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE.getCode())
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -70,4 +70,11 @@ public interface OrderChildService {
     List<String> getOrderChildTruckByOrderNo(String orderNo);
 
     void orderChildExpect();
+
+    /**
+     * 查询在途运单
+     * @param orderNo
+     * @return
+     */
+    List<OrderChild> selectInTransitOrderChild(String orderNo);
 }

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

@@ -11,7 +11,6 @@ import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
-import com.clx.performance.dao.breakcontract.BreakContractOwnerRuleDao;
 import com.clx.performance.dto.OrderChildExpectDTO;
 import com.clx.performance.dto.gd.GdRouteDTO;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
@@ -32,7 +31,6 @@ import com.clx.performance.service.OrderChildLogService;
 import com.clx.performance.service.OrderChildPoundLogService;
 import com.clx.performance.service.OrderChildService;
 import com.clx.performance.service.OrderGoodsService;
-import com.clx.performance.service.*;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
@@ -1805,6 +1803,11 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
     }
 
+    @Override
+    public List<OrderChild> selectInTransitOrderChild(String orderNo) {
+        return orderChildDao.selectInTransitOrderChild(orderNo);
+    }
+
     /**
      * @return
      * @Author kavin