修改提前还车逻辑

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

@@ -52,6 +52,9 @@ public interface UserFeign {
     public ObjectRestResponse<AppUserDTO> userDetailById(@RequestParam("id") Integer id);
 
 
+    @GetMapping("/app/user/app/unauth/getUserIdByUsername")
+    public List<Integer> getUserIdByUsername(@RequestParam(value="realName")String realName, @RequestParam(value="username")String username);
+
     /**
      *status:0-判断是否认证过,1-认证成功后修改用户认证状态
      *userId:用户登录时的id,必须

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

@@ -144,4 +144,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         appUserInfoVo.setNickname(userDetail.getNickname());
         return  appUserInfoVo;
     }
+
+    public List<Integer> getUserIdByUsername(String realName, String username) {
+        return mapper.getUserIdByUsername(realName, username);
+    }
+
 }

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

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

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

@@ -280,6 +280,14 @@ public class AppUserController extends CommonBaseController{
          return ObjectRestResponse.succ(appUserInfoVo);
     }
 
+    @GetMapping("/app/unauth/getUserIdByUsername")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public List<Integer> getUserIdByUsername(String realName, String username){
+        List<Integer> userIds = userDetailBiz.getUserIdByUsername(realName, username);
+        return userIds;
+    }
+
     @GetMapping("/app/unauth/test")
     @IgnoreUserToken
     @IgnoreClientToken

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

@@ -42,6 +42,22 @@
      where d.userid = #{userId}  limit 1
   </select>
 
+
+    <select id="getUserIdByUsername" resultType="java.lang.Integer">
+        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>
+    </select>
+
+
     <select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
             resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
         select

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

@@ -214,6 +214,20 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setEndTime(new Date().getTime());
             }
         }
+        List<Integer> userIds = new ArrayList<>();
+        if(StringUtils.isNotBlank(dto.getUsername())) {
+          List<Integer> list =  userFeign.getUserIdByUsername("", dto.getUsername());
+          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) {
             return ObjectRestResponse.succ(new PageDataVO<>());

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

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

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

@@ -178,8 +178,11 @@
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
         where b.type = 1
-        <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="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
         </if>
         <if test="status != null and status == -1">
             AND b.status in (6,-1)