diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java index 51e93c1f8..7a1a845ea 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberGroupController.java @@ -97,10 +97,6 @@ public class MemberGroupController extends BaseController { return ajaxResult; } - /** - * 会员组添加站点 - */ - /** * 修改会员组 */ @@ -138,4 +134,12 @@ public class MemberGroupController extends BaseController { return getDataTable(memberGroupService.queryMemberList(dto)); } + /** + * 查询会员组/集团 的站点列表 + */ + @PostMapping("/queryStationList") + public TableDataInfo queryStationList(@RequestBody MemberGroupDTO dto) { + startPage(); + return getDataTable(memberGroupService.queryStationList(dto)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java index 059fe4348..a3f30e834 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java @@ -2,6 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberGroup; import com.jsowell.pile.dto.MemberGroupDTO; +import com.jsowell.pile.vo.base.MemberGroupStationVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; @@ -95,4 +96,6 @@ public interface MemberGroupMapper { * @return */ String queryMemberGroupCode(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId); + + List queryStationList(MemberGroupDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java index fff875ac2..a32ca9224 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberGroup; import com.jsowell.pile.dto.MemberGroupDTO; +import com.jsowell.pile.vo.base.MemberGroupStationVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; @@ -92,4 +93,11 @@ public interface MemberGroupService { * @return */ int addMember2MemberGroup(String memberId, String stationId); + + /** + * 查询会员组/集团站点列表 + * @param dto + * @return + */ + List queryStationList(MemberGroupDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 9f7726c34..198ce7ba9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -13,6 +13,7 @@ import com.jsowell.pile.domain.MemberGroupRelation; import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.service.*; +import com.jsowell.pile.vo.base.MemberGroupStationVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.MemberDiscountVO; @@ -257,6 +258,11 @@ public class MemberGroupServiceImpl implements MemberGroupService { return 0; } + @Override + public List queryStationList(MemberGroupDTO dto) { + return memberGroupMapper.queryStationList(dto); + } + /** * 会员与集团的关系保存到数据库 * @param memberId 会员id diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java new file mode 100644 index 000000000..5605b36db --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MemberGroupStationVO.java @@ -0,0 +1,14 @@ +package com.jsowell.pile.vo.base; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MemberGroupStationVO { + private String stationId; + + private String stationName; + + private String remark; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index 4118c8293..326458b45 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -227,4 +227,16 @@ and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} and find_in_set(#{stationId,jdbcType=VARCHAR}, t1.station_id) + + \ No newline at end of file