修改提前还车逻辑

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

@@ -53,7 +53,7 @@ public interface UserFeign {
 
 
     @GetMapping("/app/user/app/unauth/getUserIdByUsername")
-    public List<Integer> getUserIdByUsername(@RequestParam(value="realName")String realName, @RequestParam(value="username")String username);
+    public List<Integer> getUserIdByUsername(@RequestParam(value="keywords")String keywords);
 
     /**
      *status:0-判断是否认证过,1-认证成功后修改用户认证状态

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -145,8 +145,8 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         return  appUserInfoVo;
     }
 
-    public List<Integer> getUserIdByUsername(String realName, String username) {
-        return mapper.getUserIdByUsername(realName, username);
+    public List<Integer> getUserIdByUsername(String keywords) {
+        return mapper.getUserIdByUsername(keywords);
     }
 
 }

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

@@ -20,5 +20,5 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     void updateUserPositionByUserId(@Param("userId") Integer id, @Param("positionId") Integer positionId);
 
-    List<Integer> getUserIdByUsername(@Param("realName") String realName, @Param("username") String username);
+    List<Integer> getUserIdByUsername(@Param("keywords") String keywords);
 }
\ No newline at end of file

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

@@ -283,8 +283,8 @@ public class AppUserController extends CommonBaseController{
     @GetMapping("/app/unauth/getUserIdByUsername")
     @IgnoreUserToken
     @IgnoreClientToken
-    public List<Integer> getUserIdByUsername(String realName, String username){
-        List<Integer> userIds = userDetailBiz.getUserIdByUsername(realName, username);
+    public List<Integer> getUserIdByUsername(@RequestParam("keywords") String keywords){
+        List<Integer> userIds = userDetailBiz.getUserIdByUsername(keywords);
         return userIds;
     }
 

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

@@ -47,14 +47,7 @@
         select d.userid  from app_user_login l
         left join  app_user_detail d
         on d.userid = l.id
-        <where>
-            <if test="realName != null and realName != ''">
-                and d.realname like concat("%", '#{realName}', "%")
-            </if>
-            <if test="username != null and username != ''">
-                and l.username like concat("%", '#{username}', "%")
-            </if>
-        </where>
+        where d.realname like concat("%", '#{keywords}', "%") or l.username like concat("%", '#{keywords}', "%")
     </select>
 
 

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

@@ -215,18 +215,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
             }
         }
         List<Integer> userIds = new ArrayList<>();
-        if(StringUtils.isNotBlank(dto.getUsername())) {
-          List<Integer> list =  userFeign.getUserIdByUsername("", dto.getUsername());
+        if(StringUtils.isNotBlank(dto.getKeywords())) {
+          List<Integer> list =  userFeign.getUserIdByUsername(dto.getKeywords());
           if(list != null) {
               userIds.addAll(list);
           }
         }
-        if(StringUtils.isNotBlank(dto.getRealName())) {
-            List<Integer> list =  userFeign.getUserIdByUsername(dto.getRealName(), "");
-            if(list != null) {
-                userIds.addAll(list);
-            }
-        }
         dto.setUserIds(userIds);
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {

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

@@ -313,10 +313,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         //订单用户ID列表
         private List<Integer> userIds;
-        //订单用户手机号
-        private String username;
-        //订单用户真实姓名
-        private String realName;
+        //订单用户手机号或订单用户真实姓名
+        private String keywords;
 
         /**
          * 车牌号