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 e580014c1..c7d4506af 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 @@ -7,6 +7,7 @@ import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.MemberGroup; +import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.vo.web.MemberGroupVO; import org.springframework.beans.factory.annotation.Autowired; @@ -89,4 +90,30 @@ public class MemberGroupController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(memberGroupService.deleteMemberGroupByIds(ids)); } + + /** + * 会员组添加会员 + */ + @PostMapping("/addMember") + public AjaxResult addMember(@RequestBody MemberGroupDTO dto) { + return toAjax(memberGroupService.addMember(dto)); + } + + /** + * 查询会员组中会员列表 + */ + @PostMapping("/queryMemberList") + public TableDataInfo queryMemberList(@RequestBody MemberGroupDTO dto) { + startPage(); + return getDataTable(memberGroupService.queryMemberList(dto)); + } + + /** + * 查询会员组的订单列表 + */ + @PostMapping("/queryOrderList") + public TableDataInfo queryOrderList(@RequestBody MemberGroupDTO dto) { + startPage(); + return getDataTable(memberGroupService.queryOrderList(dto)); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java new file mode 100644 index 000000000..6ceebc728 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java @@ -0,0 +1,14 @@ +package com.jsowell.pile.dto; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class MemberGroupDTO { + private String phoneNumber; + + private String groupCode; +} 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 afc1ec79c..60396aa95 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 @@ -1,8 +1,11 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberGroup; +import com.jsowell.pile.dto.MemberGroupDTO; +import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; +import com.jsowell.pile.vo.web.OrderListVO; import java.util.List; @@ -70,4 +73,10 @@ public interface MemberGroupService * @return */ MemberDiscountVO queryMemberDiscount(String merchantId, String stationId, String memberId); + + int addMember(MemberGroupDTO dto); + + List queryMemberList(MemberGroupDTO dto); + + List queryOrderList(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 30c0db86f..0a5719c71 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 @@ -5,6 +5,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.MemberGroup; +import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.vo.web.MemberDiscountVO; @@ -137,4 +138,9 @@ public class MemberGroupServiceImpl implements MemberGroupService { MemberDiscountVO MemberDiscountVO = memberGroupMapper.queryMemberDiscount(merchantId, stationId, memberId); return MemberDiscountVO; } + + @Override + public int addMember(MemberGroupDTO dto) { + return 0; + } } diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js index 63c4df37f..7c866548c 100644 --- a/jsowell-ui/src/api/member/memberGroup.js +++ b/jsowell-ui/src/api/member/memberGroup.js @@ -42,3 +42,30 @@ export function delMemberGroup(id) { method: 'delete' }) } + +// 添加会员 +export function addMember(data) { + return request({ + url: '/member/memberGroup/addMember', + method: 'post', + data: data + }) +} + +// 查询会员组中的会员列表 +export function queryMemberList(data) { + return request({ + url: '/member/memberGroup/queryMemberList', + method: 'post', + data: data + }) +} + +// 查询会员组中的订单列表 +export function queryOrderList(data) { + return request({ + url: '/member/memberGroup/queryOrderList', + method: 'post', + data: data + }) +}