增加司机接单钱包限制

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

 package com.clx.performance.feign;
 
+import com.clx.performance.param.app.collect.CollectTruckParam;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.OrderCancelFeignParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.param.pc.owner.UpdateStatusParam;
+import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
@@ -95,4 +97,8 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/breakContract/getRuleInfo"})
     Result<BreakContractOwnerRuleVO> getRuleInfo(@RequestParam Integer id);
+
+    @PostMapping(value = {"clx-performance/feign/truck/listCollectTruck"})
+    Result<List<AppCollectTruckVO>>  listCollectTruck(@RequestBody CollectTruckParam param);
+
 }

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckParam {
+
+    @ApiModelProperty(value = "车牌", example = "")
+    private List<String> truckNos;
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/collect/AppCollectTruckVO.java

@@ -29,6 +29,7 @@ public class AppCollectTruckVO {
     private String truckNo;
     @ApiModelProperty(value = "卸车类型：1自卸侧翻 2自卸立翻 3非自卸", example = "")
     private Integer unloadType;
+
     @ApiModelProperty(value = "车贷状态：0无车贷 1有车贷", example = "")
     private Integer autoLoanStatus;
     @ApiModelProperty(value = "车贷剩余月份", example = "")

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

+package com.clx.performance.controller.feign;
+
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
+import com.clx.performance.model.collect.CollectTruck;
+import com.clx.performance.param.app.collect.CollectTruckParam;
+import com.clx.performance.service.OrderGoodsTruckBindService;
+import com.clx.performance.service.collect.CollectTruckService;
+import com.clx.performance.vo.app.collect.AppCollectTruckVO;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@RestController
+@RequestMapping("/feign/truck")
+@Validated
+@Api(tags = "司机上报信息Feign")
+@AllArgsConstructor
+public class CollectionTruckController {
+
+    private final CollectTruckService collectTruckService;
+
+    @ApiOperation(value = "司机上报车辆信息")
+    @PostMapping("/listCollectTruck")
+    Result<List<AppCollectTruckVO>> listCollectTruck(@RequestBody  CollectTruckParam param){
+        return Result.ok(collectTruckService.listCollectTruck(param));
+    }
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckDao.java

 package com.clx.performance.dao.collect;
 
 import com.clx.performance.mapper.collect.CollectTruckMapper;
+import com.clx.performance.model.OrderChildPoundLog;
 import com.clx.performance.model.collect.CollectTruck;
+import com.clx.performance.param.app.collect.CollectTruckParam;
+import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 线路排队耗时
@@ -17,5 +22,5 @@ public interface CollectTruckDao extends BaseDao<CollectTruckMapper, CollectTruc
 
     Optional<CollectTruck> getByUserNoAndTruckNo(Long userNo, String truckNo);
 
-
+    List<CollectTruck> listCollectTruck(List<String> param);
 }

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

 package com.clx.performance.dao.impl.collect;
 
 import com.clx.performance.dao.collect.CollectTruckDao;
+import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.mapper.collect.CollectTruckMapper;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoodsTruckBind;
 import com.clx.performance.model.collect.CollectTruck;
+import com.clx.performance.param.app.collect.CollectTruckParam;
+import com.clx.performance.vo.app.collect.AppCollectTruckVO;
 import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Author: aiqinguo
  * @Description: 车辆信息上报
@@ -29,6 +36,7 @@ public class CollectTruckDaoImpl extends BaseDaoImpl<CollectTruckMapper, Collect
                 .set(CollectTruck::getDistanceLineMax, item.getDistanceLineMax())
                 .set(CollectTruck::getDistanceSendAddressMax, item.getDistanceSendAddressMax())
                 .set(CollectTruck::getGoodsType, item.getGoodsType())
+
         );
     }
 
@@ -41,4 +49,9 @@ public class CollectTruckDaoImpl extends BaseDaoImpl<CollectTruckMapper, Collect
                 )
                 .map(super::getOne);
     }
+
+    @Override
+    public List<CollectTruck> listCollectTruck(List<String> truckNos) {
+        return baseMapper.selectList(lQrWrapper().in(CollectTruck::getTruckNo,truckNos));
+    }
 }

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckService.java

 package com.clx.performance.service.collect;
 
+import com.clx.performance.model.collect.CollectTruck;
 import com.clx.performance.param.app.collect.*;
 import com.clx.performance.vo.app.collect.AppCollectTruckVO;
+import com.msl.common.result.Result;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 public interface CollectTruckService {
 
@@ -15,5 +22,6 @@ public interface CollectTruckService {
     void updateGoodsType(CollectTruckReportGoodsTypeUpdateParam param);
 
     AppCollectTruckVO getReportInfo(String truckNo);
+    List<AppCollectTruckVO> listCollectTruck(CollectTruckParam param);
 
 }

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

@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 @Slf4j
@@ -243,4 +245,16 @@ public class CollectTruckServiceImpl implements CollectTruckService {
 
     }
 
+    @Override
+    public List<AppCollectTruckVO> listCollectTruck(CollectTruckParam param) {
+        List<AppCollectTruckVO> returnList = new ArrayList<AppCollectTruckVO>();
+
+        List<CollectTruck> collectTrucks = collectTruckDao.listCollectTruck(param.getTruckNos());
+        for (CollectTruck truck : collectTrucks) {
+            AppCollectTruckVO appCollectTruckVO = collectTruckStruct.convertAppCollectTruckVO(truck);
+            returnList.add(appCollectTruckVO);
+        }
+        return returnList;
+    }
+
 }