Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -120,6 +120,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setCompanyIds(companyIds);
         }
 
+        if (StringUtils.isNotEmpty(dto.getPlateNumber())){
+          List<String> vehicleIds = vehicleFeign.findbyPlateNumber(dto.getPlateNumber().trim());
+           dto.setVehicleIds(vehicleIds);
+        }
+
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -309,6 +309,13 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private String phone;
 
+        private  List<String> vehicleIds;
+
+        /**
+         * 车牌号
+         */
+        private String plateNumber;
+
         @ApiModelProperty("当前页码")
         Integer page;
         @ApiModelProperty("每页限制")

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -142,6 +142,11 @@
                 and (r.start_time between #{startTime} and #{endTime}
                 or t.start_time between #{startTime} and #{endTime})
             </if>
+            <if test="vehicleIds != null and vehicleIds.size() > 0">
+                AND r.vehicle_id IN <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
+                #{vehicleId}
+            </foreach>
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (r.start_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -36,7 +36,16 @@
         LEFT JOIN tour_good_site s ON v.site_id=s.id
         LEFT JOIN tour_good g ON v.good_id=g.id
         LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
-        WHERE s.company_id=#{companyId} and v.status=#{orderStatus} and p.start_time=#{travelDate} ORDER BY s.depart_time ) as `goodOrder`
+        WHERE <![CDATA[`total_person`<>0]]>
+        <if test='companyId !=null'>
+           and s.company_id=#{companyId}
+        </if>
+        <if test="orderStatus!=null">
+            and v.status=#{orderStatus}
+        </if>
+        <if test="travelDate!=null">
+            and p.start_time=#{travelDate}
+        </if> ORDER BY s.depart_time ) as `goodOrder`
     </select>
     <!-- 获取旅游路线id-->
      <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -149,4 +149,7 @@ public interface VehicleFeign {
      */
     @GetMapping("/cata/add/getCatasByIds/{ids}")
     public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable("ids") String ids);
+
+    @GetMapping("/vehicleInfo/findwith_plate_number")
+    List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1446,4 +1446,16 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public List<String> findExistVehicleIds() {
         return mapper.findExistVehicleIds();
     }
+
+    public List<String> findVehicleIdsByPlateNumber(String plateNumber) {
+         List<String> vehicleIds = Lists.newArrayList();
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andLike("numberPlate",String.format("%%%s%%",plateNumber.trim()));
+        List<Vehicle> vehicles = mapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(vehicles)){
+            return vehicleIds;
+        }
+        return vehicles.stream().map(Vehicle::getId).collect(Collectors.toList());
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -517,4 +517,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public ObjectRestResponse checkBookHourInfo() {
         return vehicleBookHourInfoBiz.checkBookHourInfo();
     }
+
+    @GetMapping("/findwith_plate_number")
+    List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber){
+     return  vehicleBiz.findVehicleIdsByPlateNumber(plateNumber);
+    }
 }