diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 030fbe991..17d8c9b5e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -296,6 +296,9 @@ from xfsg_point_info a LEFT JOIN xfsg_point_detail_info c on a.id = c.point_id where a.deleted = 0 + + and a.point_name like concat('%', #{request.keyword}, '%') + and a.point_status in( 4,5) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java index d7b3aa576..51a3836e4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/MiniPointRequest.java @@ -17,11 +17,12 @@ public class MiniPointRequest extends PageBasicInfo { @ApiModelProperty(value = "1-推荐铺位,2-我创建的") @NotNull private Integer type; - private Long lineId; - private String partnerId; @ApiModelProperty("省市区编码,传最后一级") private String areaCode; + + @ApiModelProperty("根据关键字搜索") + private String keyword; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index 0548e0972..dd8ec45b6 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -120,8 +120,8 @@ public class MiniShopController { } @ApiOperation("获取推荐铺位和我创建的") - @GetMapping("/getRecommendedOrMyPointList") - public ResponseResult> getRecommendedOrMyPointList(@RequestParam("request")MiniPointRequest request) { + @PostMapping("/getRecommendedOrMyPointList") + public ResponseResult> getRecommendedOrMyPointList(@RequestBody @Validated MiniPointRequest request) { request.setLineId(PartnerUserHolder.getUser().getLineId()); return ResponseResult.success(pointService.getRecommendedOrMyPointList( request)); }