Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/MaTechnicianMapper.java

@@ -150,7 +150,7 @@ public interface MaTechnicianMapper extends BaseMapper<MaTechnician>
             "      AND p.is_delete = 0" +
             "      AND p.audit_status = 1" +
             "      AND p.merchant_type = 0" +
-            "      AND p.project_is_enable = 1   -- 根据实际业务调整：1启用，0禁用" +
+            "      AND p.project_is_enable = 1" +
             ") AS has_merchant_with_service")
     Boolean isHasMerchantCity(@Param("areaCode")  String areaCode);
 }

nightFragrance-massage/src/main/java/com/ylx/userhome/area/controller/CustomerCityController.java

@@ -47,11 +47,11 @@ public class CustomerCityController {
         }
     }
 
-//    @ApiOperation(value="首页选中的城市是否有开通服务", notes="首页选中的城市是否有开通服务;true表示该城市有开通服务")
-//    @GetMapping(value = "/isHasMerchantCity")
-//    public R<Boolean> isHasMerchantCity(@RequestParam("areaCode") String areaCode) {
-//            return R.ok(iMaTechnicianService.isHasMerchantCity(areaCode));
-//    }
+    @ApiOperation(value="首页选中的城市是否有开通服务", notes="首页选中的城市是否有开通服务;true表示该城市有开通服务")
+    @GetMapping(value = "/isHasMerchantCity")
+    public R<Boolean> isHasMerchantCity(@RequestParam("areaCode") String areaCode) {
+            return R.ok(iMaTechnicianService.isHasMerchantCity(areaCode));
+    }
 
     /**
      * 首页-城市列表查询
@@ -60,7 +60,7 @@ public class CustomerCityController {
      * @return Result
      */
     @ApiOperation(value="首页-城市列表查询", notes="首页-城市列表查询")
-    @PostMapping(value = "/getCityByName")
+    @GetMapping(value = "/getCityByName")
     public R<List<CityVo>> getCityByName(@RequestParam(value = "name",required = false) String name) {
         try {
             List<CityVo> list = areaService.getCityName(name);

nightFragrance-massage/src/main/resources/mapper/massage/MaTechnicianMapper.xml

@@ -495,7 +495,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND t.audit_status = 2
           AND t.n_status2 = 0
           AND t.merchant_status = 0   -- 注意 merchant_status 是字符串类型
-          AND t.te_area_code = #{cityCode}   -- 新增城市过滤
+          AND t.te_area_code = #{dto.cityCode}   -- 新增城市过滤
         ORDER BY COALESCE(o.sales, 0) DESC
         LIMIT 5
     </select>