From 592ba530a08d6b07d1e0a239e4c45806a469c80f Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 15 Jan 2024 11:10:42 +0800 Subject: [PATCH 1/3] update --- .../pile/service/impl/MemberGroupServiceImpl.java | 12 ++++++++++++ jsowell-ui/src/views/member/memberGroup/detail.vue | 11 ++++++++--- jsowell-ui/src/views/member/memberGroup/index.vue | 11 ----------- 3 files changed, 20 insertions(+), 14 deletions(-) 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..be09a254c 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 @@ -8,8 +8,10 @@ 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.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; @@ -143,4 +145,14 @@ public class MemberGroupServiceImpl implements MemberGroupService { public int addMember(MemberGroupDTO dto) { return 0; } + + @Override + public List queryMemberList(MemberGroupDTO dto) { + return null; + } + + @Override + public List queryOrderList(MemberGroupDTO dto) { + return null; + } } diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue index 24969151f..551225af3 100644 --- a/jsowell-ui/src/views/member/memberGroup/detail.vue +++ b/jsowell-ui/src/views/member/memberGroup/detail.vue @@ -48,7 +48,8 @@ export default { queryParams: { groupCode: this.$route.params.groupCode, phoneNumber: null - } + }, + groupCode: this.$route.params.groupCode }; }, @@ -69,7 +70,11 @@ export default { this.queryParams.phoneNumber = '' return false; } - addMemberGroup(this.phoneNumber).then(response => { + const param = { + "phoneNumber": this.phoneNumber, + "groupCode": this.groupCode + }; + addMemberGroup(param).then(response => { console.log(response); this.$modal.msgSuccess("添加成功"); this.queryParams.openAddMember = true; @@ -83,4 +88,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; - }); - }, } }; From 0fc3d40a2df142dc2497bf36988467e34aa1dbfe Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 15 Jan 2024 11:14:43 +0800 Subject: [PATCH 2/3] update --- jsowell-ui/src/views/member/memberGroup/detail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/member/memberGroup/detail.vue b/jsowell-ui/src/views/member/memberGroup/detail.vue index 551225af3..3c59e130c 100644 --- a/jsowell-ui/src/views/member/memberGroup/detail.vue +++ b/jsowell-ui/src/views/member/memberGroup/detail.vue @@ -77,7 +77,7 @@ export default { addMemberGroup(param).then(response => { console.log(response); this.$modal.msgSuccess("添加成功"); - this.queryParams.openAddMember = true; + this.openAddMember = false; }); }, cancel() { From d3557071f2c9deb9a1fdc1a04adb15eb2b726fe1 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 15 Jan 2024 11:51:21 +0800 Subject: [PATCH 3/3] update --- .../com/jsowell/pile/dto/MemberGroupDTO.java | 5 ++++- .../pile/mapper/MemberGroupMapper.java | 3 +++ .../service/impl/MemberGroupServiceImpl.java | 14 +++++++++++--- .../mapper/pile/MemberGroupMapper.xml | 19 +++++++++++++++++++ 4 files changed, 37 insertions(+), 4 deletions(-) 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 be09a254c..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,8 +6,10 @@ 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; @@ -31,6 +33,9 @@ public class MemberGroupServiceImpl implements MemberGroupService { @Autowired private MemberGroupMapper memberGroupMapper; + @Autowired + private OrderBasicInfoService orderBasicInfoService; + /** * 查询会员组 * @@ -143,16 +148,19 @@ public class MemberGroupServiceImpl implements MemberGroupService { @Override public int addMember(MemberGroupDTO dto) { - return 0; + return 1; } @Override public List queryMemberList(MemberGroupDTO dto) { - return null; + List list = memberGroupMapper.queryMemberList(dto.getGroupCode()); + return list; } @Override public List queryOrderList(MemberGroupDTO dto) { - return null; + 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