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 index 6ceebc728..14e566926 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java @@ -1,5 +1,6 @@ package com.jsowell.pile.dto; +import com.jsowell.common.core.domain.BaseEntity; import lombok.*; @Getter @@ -7,7 +8,9 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @Builder -public class MemberGroupDTO { +public class MemberGroupDTO extends BaseEntity { + private int pageSize; + private int pageNum; private String phoneNumber; private String groupCode; 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 8d3502b7b..8e94a2a49 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 @@ -1,6 +1,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberGroup; +import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; import org.apache.ibatis.annotations.Param; @@ -74,4 +75,6 @@ public interface MemberGroupMapper { * @return */ MemberDiscountVO queryMemberDiscount(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId); + + List queryMemberList(@Param("groupCode") String groupCode); } 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 0a5719c71..2889066db 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,10 +6,14 @@ 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; @@ -29,6 +33,9 @@ public class MemberGroupServiceImpl implements MemberGroupService { @Autowired private MemberGroupMapper memberGroupMapper; + @Autowired + private OrderBasicInfoService orderBasicInfoService; + /** * 查询会员组 * @@ -141,6 +148,19 @@ public class MemberGroupServiceImpl implements MemberGroupService { @Override public int addMember(MemberGroupDTO dto) { - return 0; + return 1; + } + + @Override + public List queryMemberList(MemberGroupDTO dto) { + List list = memberGroupMapper.queryMemberList(dto.getGroupCode()); + return list; + } + + @Override + public List queryOrderList(MemberGroupDTO dto) { + QueryOrderDTO queryOrderDTO = new QueryOrderDTO(); + queryOrderDTO.setGroupCode(dto.getGroupCode()); + return orderBasicInfoService.selectOrderBasicInfoList(queryOrderDTO); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index deb717117..ca7f4c39e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -139,4 +139,23 @@ AND t1.station_id = #{stationId,jdbcType=VARCHAR} AND t2.member_id = #{memberId,jdbcType=VARCHAR} + + + + \ No newline at end of file diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue index fa679fad3..e0ad804d6 100644 --- a/jsowell-ui/src/views/member/memberGroup/detail.vue +++ b/jsowell-ui/src/views/member/memberGroup/detail.vue @@ -183,4 +183,4 @@ export default { }; - \ No newline at end of file + diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue index b73245fdb..7b207d82f 100644 --- a/jsowell-ui/src/views/member/memberGroup/index.vue +++ b/jsowell-ui/src/views/member/memberGroup/index.vue @@ -111,8 +111,6 @@ v-hasPermi="['member:memberGroup:edit']">修改 删除 - @@ -336,15 +334,6 @@ export default { ...this.queryParams }, `memberGroup_${new Date().getTime()}.xlsx`) }, - /** 添加会员按钮 */ - handleAddMember(row) { - this.reset(); - const id = row.id || this.ids - getMemberGroup(id).then(response => { - this.form = response.data; - this.openAddMember = true; - }); - }, } };