Merge branch 'master-modify-background-bug-1'

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -115,6 +115,8 @@ public interface UserFeign {
     @GetMapping("/app/user/one")
     public AppUserLogin one(@RequestParam(value = "username")String username);
 
+    @GetMapping("/app/user/getOne")
+    public List<AppUserLogin> getOne(@RequestParam(value = "username")String username,@RequestParam(value = "realName")String realName);
 
     @GetMapping("/api/app/imi/{imiId}")
     ImiVo findUserInfoByImiId(@PathVariable(value = "imiId") Integer imiId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

@@ -28,4 +28,7 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
 
 
     List<Integer> selectAllExistUserIds();
+
+
+    List<AppUserLogin> getUserByUsernameAndRealName(@Param("username") String username, @Param("realName")String realName);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -262,6 +262,15 @@ public class AppUserController extends CommonBaseController{
         return appUserLoginBiz.getUserByUsername(username);
     }
 
+    /**
+     * 根据用户真实姓名和手机号模糊查询寻用户
+     * @param username
+     * @return
+     */
+    @GetMapping("/getOne")
+    public List<AppUserLogin> getOne(@RequestParam(value = "username",required = false)String username, @RequestParam(value = "realName",required = false)String realName){
+        return appUserLoginBiz.getUserByUsernameAndRealName(username,realName);
+    }
     @GetMapping("/findusersByIds")
     public Map<Integer,AppUserLogin> findAppUsersByUserIds(@RequestParam(value = "userIds") List<Integer> userIds){
      return appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(userIds);

ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml

@@ -5,10 +5,10 @@
     <select id="selectbyPhones" resultType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
         select `id`,`username` from `app_user_login` where `username` in
         <foreach collection="phones" item="phone" open="(" close=")" separator=",">
-          #{phone}
+            #{phone}
         </foreach>
     </select>
-    
+
     <update id="bindOpenId" parameterType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
         UPDATE  app_user_login SET wx_openid=#{wxOpenid},unionid=#{unionid},openid=#{openid} where  id=#{id}
     </update>
@@ -16,4 +16,15 @@
     <select id="selectAllExistUserIds" resultType="integer">
         SELECT  `id` FROM `app_user_login`  WHERE `isdel`=0;
     </select>
+    <select id="getUserByUsernameAndRealName" resultType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
+        select l.* from app_user_login l left  join app_user_detail d on l.id=d.userid where 1=1
+
+        <if test="username!=null ">
+         and   l.username like concat('%',#{username},'%')
+        </if>
+
+        <if test="realName !=null">
+            and   d.realname like concat('%',#{realName},'%')
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -30,6 +30,7 @@ public class OrderListVo extends BaseOrder {
 
     private String endCompanyName;
 
+    private String realName;
     /**
      * 是否是用户匹配公司
      */

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -48,6 +49,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Array;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -103,10 +105,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setEndTime(new Date().getTime());
             }
         }
-        if (StringUtils.isNotBlank(dto.getPhone())) {
-            AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
-            if (appUserLogin != null) {
-                dto.setUserId(appUserLogin.getId());
+        if (StringUtils.isNotBlank(dto.getPhone())||StringUtils.isNotBlank(dto.getRealName())) {
+            List<AppUserLogin> appUserLoins = userFeign.getOne(dto.getPhone(),dto.getRealName());
+            if (CollectionUtil.isNotEmpty(appUserLoins)) {
+                List<Integer> collect = appUserLoins.parallelStream().map(AppUserLogin::getId).collect(Collectors.toList());
+                dto.setUserIds(collect);
             }else {
                 return ObjectRestResponse.succ(new PageDataVO<>());
             }
@@ -121,8 +124,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
             dto.setCompanyIds(companyIds);
         }
 
-        if (StringUtils.isNotEmpty(dto.getPlateNumber())){
-          List<String> vehicleIds = vehicleFeign.findbyPlateNumber(dto.getPlateNumber().trim());
+        if (StringUtils.isNotEmpty(dto.getPlateNumber())||StringUtils.isNotEmpty(dto.getVehicleCode())){
+          List<String> vehicleIds = vehicleFeign.findbyPlateNumberAndVehicleCod(dto.getPlateNumber(),dto.getVehicleCode());
            dto.setVehicleIds(vehicleIds);
         }
 
@@ -148,6 +151,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 if(appUserVo != null) {
                     orderPageVO.setTelephone(appUserVo.getUsername());
                     orderPageVO.setUsername(appUserVo.getNickname());
+                    orderPageVO.setRealName(appUserVo.getRealname());
                 }
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                     RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());

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

@@ -309,8 +309,15 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private String phone;
 
+        private String realName;
+
+        private String vehicleCode;
+
+        private List<Integer> userIds;
         private  List<String> vehicleIds;
 
+
+
         /**
          * 车牌号
          */

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

@@ -120,8 +120,12 @@
             <if test="crtUser != null">
                 and b.crt_user = #{crtUser}
             </if>
-            <if test="userId != null">
-                and b.user_id = #{userId}
+            <if test="userIds != null and userIds.size() > 0">
+                and b.user_id in
+                <foreach collection="userIds" item="item"  open="("  separator="," close=")">
+                    #{item}
+                </foreach>
+
             </if>
             <if test="status != null">
                 and b.status = #{status}

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

@@ -152,4 +152,7 @@ public interface VehicleFeign {
 
     @GetMapping("/vehicleInfo/findwith_plate_number")
     List<String> findbyPlateNumber(@RequestParam(value = "plateNumber") String plateNumber);
+
+    @GetMapping("/vehicleInfo/findVehicleIds")
+    List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
 }

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

@@ -1474,4 +1474,24 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         int count = mapper.selectCountByExample(example);
         return count > 0;
     }
+
+
+    public List<String> findbyPlateNumberAndVehicleCod(String plateNumber,String vehicleCode) {
+        List<String> vehicleIds = Lists.newArrayList();
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(plateNumber)) {
+            criteria.andLike("numberPlate", String.format("%%%s%%", plateNumber.trim()));
+        }
+
+        if (StringUtils.isNotBlank(vehicleCode)) {
+            criteria.andLike("code", String.format("%%%s%%", vehicleCode.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/biz/VehicleModelBiz.java

@@ -53,6 +53,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
+
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();
@@ -127,7 +128,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
                         WeekendSqls.<VehicleModel>custom()
                                 .andEqualTo(VehicleModel::getIsdel, 0)
                                 .andEqualTo(VehicleModel::getHotSign,1)
-                ).orderByDesc("id").build();
+                ).orderByAsc("sort").build();
         List<VehicleModel> vehicleModels = selectByExample(example);
         if (CollectionUtils.isEmpty(vehicleModels)) {
             return null;

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

@@ -529,4 +529,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(exist);
     }
 
+
+    @GetMapping("/findVehicleIds")
+   public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){
+        return  vehicleBiz.findbyPlateNumberAndVehicleCod(plateNumber,vehicleCode);
+    }
 }

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

@@ -156,6 +156,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return vehicleModelBiz.findVehicleModelPage(vmqc);
     }
 
+
     @GetMapping(value = "/app/unauth/findRandomVehicle")
     @IgnoreUserToken
     @ApiOperation("获取随机车型")
@@ -197,6 +198,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (StringUtils.isBlank(host)) {
             return ObjectRestResponse.createDefaultFail();
         }
+
+
         //设置信息
         vm.setCrtName(uorr.getData().getName());
         vm.setCrtUser(uorr.getData().getId());
@@ -281,7 +284,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                     }
                     vehicleCataBiz.inserts(vcs);
                 }
-
             }
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -53,7 +53,7 @@
             </foreach>
           )
       </if>
-      ORDER BY	vmqc.id ASC
+      ORDER BY	vmqc.sort ASC
   </select>
 
     <update id="updateScoreByModelIdAndavgScore">