From d5078154db3ea13d6c48c5c9e24eeff7386a4672 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 26 Feb 2024 14:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=A7=BB=E9=99=A4=E4=BC=9A?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pile/MemberGroupController.java | 8 ++++++++ .../main/java/com/jsowell/pile/dto/MemberGroupDTO.java | 2 ++ .../jsowell/pile/mapper/MemberGroupRelationMapper.java | 5 ++++- .../jsowell/pile/service/MemberGroupRelationService.java | 1 + .../com/jsowell/pile/service/MemberGroupService.java | 2 ++ .../service/impl/MemberGroupRelationServiceImpl.java | 9 +++++++++ .../pile/service/impl/MemberGroupServiceImpl.java | 5 +++++ .../resources/mapper/pile/MemberGroupRelationMapper.xml | 6 ++++++ 8 files changed, 37 insertions(+), 1 deletion(-) 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 7fb95cad5..e17380f9c 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 @@ -150,4 +150,12 @@ public class MemberGroupController extends BaseController { public AjaxResult removeStationFromMemberGroup(@RequestBody MemberGroupDTO dto) { return toAjax(memberGroupService.removeStationFromMemberGroup(dto)); } + + /** + * 集团移除会员 + */ + @PostMapping("/removeMemberFromMemberGroup") + public AjaxResult removeMemberFromMemberGroup(@RequestBody MemberGroupDTO dto) { + return toAjax(memberGroupService.removeMemberFromMemberGroup(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 index 4557def36..83185e5a5 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 @@ -21,4 +21,6 @@ public class MemberGroupDTO extends BaseEntity { private List merchantIdList; private String stationId; + + private String memberId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupRelationMapper.java index 7696207b3..2f866a44c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupRelationMapper.java @@ -1,9 +1,10 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberGroupRelation; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface MemberGroupRelationMapper { /** * delete by primary key @@ -56,4 +57,6 @@ public interface MemberGroupRelationMapper { int updateBatchSelective(List list); int batchInsert(@Param("list") List list); + + int deleteRelationByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupRelationService.java index 6a07d319a..86138ae11 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupRelationService.java @@ -27,4 +27,5 @@ public interface MemberGroupRelationService{ int batchInsert(List list); + int deleteRelationByGroupCodeAndMemberId(String groupCode, String memberId); } 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 bb720a083..95bda260a 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 @@ -106,6 +106,8 @@ public interface MemberGroupService { int removeStationFromMemberGroup(MemberGroupDTO dto); + int removeMemberFromMemberGroup(MemberGroupDTO dto); + /** * 根据memberGroup查询车辆消费记录 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java index dccfdec76..42bfc70d3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupRelationServiceImpl.java @@ -1,5 +1,6 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberGroupRelation; import com.jsowell.pile.mapper.MemberGroupRelationMapper; import com.jsowell.pile.service.MemberGroupRelationService; @@ -72,4 +73,12 @@ public class MemberGroupRelationServiceImpl implements MemberGroupRelationServic return memberGroupRelationMapper.batchInsert(list); } + @Override + public int deleteRelationByGroupCodeAndMemberId(String groupCode, String memberId) { + if (StringUtils.isBlank(groupCode) || StringUtils.isBlank(memberId)) { + return 0; + } + return memberGroupRelationMapper.deleteRelationByGroupCodeAndMemberId(groupCode, memberId); + } + } 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 6f19b04ce..95a912041 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 @@ -299,6 +299,11 @@ public class MemberGroupServiceImpl implements MemberGroupService { return result; } + @Override + public int removeMemberFromMemberGroup(MemberGroupDTO dto) { + return memberGroupRelationService.deleteRelationByGroupCodeAndMemberId(dto.getGroupCode(), dto.getMemberId()); + } + @Override public List queryMemberGroupConsumptionList(String groupCode) { List resultList = Lists.newArrayList(); diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupRelationMapper.xml index ea03d2346..35c517f95 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupRelationMapper.xml @@ -369,4 +369,10 @@ + + + delete from member_group_relation + where group_code = #{groupCode,jdbcType=VARCHAR} + and member_id = #{memberId,jdbcType=VARCHAR} + \ No newline at end of file