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 c7d4506af..41c0492ae 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 @@ -108,12 +108,4 @@ public class MemberGroupController extends BaseController { 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/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java index 60396aa95..2e9cf52df 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 @@ -5,7 +5,6 @@ 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; @@ -78,5 +77,4 @@ public interface MemberGroupService 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 2889066db..5de8d01a1 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 @@ -6,14 +6,12 @@ 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.dto.QueryOrderDTO; import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.service.OrderBasicInfoService; 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 lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -157,10 +155,4 @@ public class MemberGroupServiceImpl implements MemberGroupService { return list; } - @Override - public List queryOrderList(MemberGroupDTO dto) { - QueryOrderDTO queryOrderDTO = new QueryOrderDTO(); - queryOrderDTO.setGroupCode(dto.getGroupCode()); - return orderBasicInfoService.selectOrderBasicInfoList(queryOrderDTO); - } } diff --git a/jsowell-ui/src/api/member/memberGroup.js b/jsowell-ui/src/api/member/memberGroup.js index 7c866548c..3147fcaff 100644 --- a/jsowell-ui/src/api/member/memberGroup.js +++ b/jsowell-ui/src/api/member/memberGroup.js @@ -61,11 +61,3 @@ export function queryMemberList(data) { }) } -// 查询会员组中的订单列表 -export function queryOrderList(data) { - return request({ - url: '/member/memberGroup/queryOrderList', - method: 'post', - data: data - }) -} diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue index 7cbbd3e7e..750b0dbb0 100644 --- a/jsowell-ui/src/views/member/memberGroup/detail.vue +++ b/jsowell-ui/src/views/member/memberGroup/detail.vue @@ -23,7 +23,7 @@ 添加会员 - + @@ -42,11 +42,11 @@ + :limit.sync="queryParams.pageSize" @pagination="getMemberList" style="margin-bottom: 20px" /> - +