fix

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -151,7 +151,6 @@ public class HotelController extends WebConfig {
      * @param pageSize
      * @param sort     0推荐排序 1 距离优先 2低价优先 3评分优先 4评论数优先
      * @param keyWord  搜索关键字
-     * @param req
      * @return
      */
     @ApiOperation(value = "可入住酒店列表", notes = "可入住酒店列表")
@@ -160,13 +159,13 @@ public class HotelController extends WebConfig {
     public Result<IPage<BusHotel>> getCanUseHotelList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                       @RequestParam(name = "sort", defaultValue = "0") Integer sort,
+                                                      @RequestParam(name = "city", defaultValue = "") String city,
                                                       @RequestParam(name = "keyWord", defaultValue = "") String keyWord,
                                                       @RequestParam(name = "lat", defaultValue = "0") BigDecimal lat,
-                                                      @RequestParam(name = "lng", defaultValue = "0") BigDecimal lng,
-                                                      HttpServletRequest req) {
+                                                      @RequestParam(name = "lng", defaultValue = "0") BigDecimal lng) {
         Page<BusHotel> page = new Page<BusHotel>(pageNo, pageSize);
         String tenantId = TenantContextHolder.getTenantId();
-        IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, keyWord, sort, lat, lng);
+        IPage<BusHotel> pageList = busHotelService.pageList(page, tenantId, city, keyWord, sort, lat, lng);
         return Result.OK(pageList);
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusHotelMapper.java

@@ -35,6 +35,7 @@ public interface BusHotelMapper extends BaseMapper<BusHotel> {
             "on l.hotel_id=h.id\n" +
             "where h.del_flag=0 and h.`status`=1 and h.check_status=1\n" +
             "<if test='tenantId != null and tenantId !=\"\"'> and h.tenant_id = '${tenantId}' </if>" +
+            "<if test='city != null and city !=\"\"'> and h.address LIKE concat(concat('%',#{city}),'%') </if>" +
             "<if test='keyWord != null and keyWord !=\"\"'> and (h.address LIKE concat(concat('%',#{keyWord}),'%') or h.name LIKE concat(concat('%',#{keyWord}),'%')) </if>" +
             "<if test='sort != null and sort ==0'> order by h.create_time desc </if>" +
             "<if test='sort != null and sort ==1'> order by distance asc </if>" +
@@ -42,7 +43,7 @@ public interface BusHotelMapper extends BaseMapper<BusHotel> {
             "<if test='sort != null and sort ==3'> order by score desc </if>" +
             "<if test='sort != null and sort ==4'> order by commentNum desc </if>" +
             "</script>")
-    public List<BusHotel> pageList(Page<BusHotel> page,@Param("tenantId") String tenantId, @Param("keyWord") String keyWord, @Param("sort") Integer sort, @Param("lat") BigDecimal lat, @Param("lng") BigDecimal lng);
+    public List<BusHotel> pageList(Page<BusHotel> page,@Param("tenantId") String tenantId, @Param("city") String city, @Param("keyWord") String keyWord, @Param("sort") Integer sort, @Param("lat") BigDecimal lat, @Param("lng") BigDecimal lng);
 
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusHotelService.java

@@ -36,5 +36,5 @@ public interface IBusHotelService extends IService<BusHotel> {
      * @param sort 0推荐排序 1 距离优先 2低价优先 3评分优先 4评论数优先
      * @return
      */
-    public Page<BusHotel> pageList(Page<BusHotel> page, String tenantId, String keyWord, Integer sort, BigDecimal lat, BigDecimal lng);
+    public Page<BusHotel> pageList(Page<BusHotel> page, String tenantId,String city, String keyWord, Integer sort, BigDecimal lat, BigDecimal lng);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusHotelServiceImpl.java

@@ -115,7 +115,7 @@ public class BusHotelServiceImpl extends ServiceImpl<BusHotelMapper, BusHotel> i
      * @param sort 0推荐排序 1 距离优先 2低价优先 3评分优先 4评论数优先
      * @return
      */
-    public Page<BusHotel> pageList(Page<BusHotel> page, String tenantId, String keyWord, Integer sort,BigDecimal lat, BigDecimal lng) {
-        return page.setRecords(this.busHotelMapper.pageList(page, tenantId, keyWord, sort, lat, lng));
+    public Page<BusHotel> pageList(Page<BusHotel> page, String tenantId,String city, String keyWord, Integer sort,BigDecimal lat, BigDecimal lng) {
+        return page.setRecords(this.busHotelMapper.pageList(page, tenantId,city, keyWord, sort, lat, lng));
     }
 }