用户端 查询服务列表增加城市筛选

pz-applet/src/main/java/com/pz/applet/AppletServicesController.java

@@ -42,9 +42,12 @@ public class AppletServicesController extends BaseController {
      * 查询服务列表
      * 查询服务列表
      */
      */
     @GetMapping("/list")
     @GetMapping("/list")
-    public TableDataInfo<ServicesVo> list(ServicesBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ServicesVo> list(@RequestHeader("city_id") Integer cityId, ServicesBo bo, PageQuery pageQuery) {
+        // 增加城市筛选
+        bo.setCityId(cityId);
         return iServicesService.queryPageList(bo, pageQuery);
         return iServicesService.queryPageList(bo, pageQuery);
     }
     }
+
     /**
     /**
      * 获取服务详细信息
      * 获取服务详细信息
      *
      *
@@ -53,7 +56,7 @@ public class AppletServicesController extends BaseController {
     @SaCheckPermission("system:services:query")
     @SaCheckPermission("system:services:query")
     @GetMapping("/{id}")
     @GetMapping("/{id}")
     public R<ServicesVo> getInfo(@NotNull(message = "主键不能为空")
     public R<ServicesVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Integer id) {
+                                 @PathVariable Integer id) {
         return R.ok(iServicesService.queryById(id));
         return R.ok(iServicesService.queryById(id));
     }
     }
 
 

pz-merchant/src/main/java/com/pz/merchant/controller/applet/CompanyController.java

 package com.pz.merchant.controller.applet;
 package com.pz.merchant.controller.applet;
 
 
-import cn.dev33.satoken.annotation.SaIgnore;
-import com.dtflys.forest.annotation.Get;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
-import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.validate.EditGroup;
 import com.pz.common.core.validate.EditGroup;
-import com.pz.common.helper.LoginHelper;
 import com.pz.merchant.domain.bo.CompanyBalanceBo;
 import com.pz.merchant.domain.bo.CompanyBalanceBo;
 import com.pz.merchant.domain.bo.ModifyCompanyInfoBo;
 import com.pz.merchant.domain.bo.ModifyCompanyInfoBo;
 import com.pz.merchant.domain.vo.CompanyAppVo;
 import com.pz.merchant.domain.vo.CompanyAppVo;

pz-system/src/main/java/com/pz/system/domain/bo/ServicesBo.java

@@ -80,5 +80,10 @@ public class ServicesBo extends BaseEntity {
      */
      */
     private String info;
     private String info;
 
 
+    /**
+     * 城市ID
+     */
+    private Integer cityId;
+
 
 
 }
 }