集团移除会员

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));
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberGroupDTO.java

@@ -21,4 +21,6 @@ public class MemberGroupDTO extends BaseEntity {
     private List<String> merchantIdList;
 
     private String stationId;
+
+    private String memberId;
 }

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<MemberGroupRelation> list);
 
     int batchInsert(@Param("list") List<MemberGroupRelation> list);
+
+    int deleteRelationByGroupCodeAndMemberId(@Param("groupCode") String groupCode, @Param("memberId") String memberId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupRelationService.java

@@ -27,4 +27,5 @@ public interface MemberGroupRelationService{
 
     int batchInsert(List<MemberGroupRelation> list);
 
+    int deleteRelationByGroupCodeAndMemberId(String groupCode, String memberId);
 }

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查询车辆消费记录
      */

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);
+    }
+
 }

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<MemberGroupConsumptionVO> queryMemberGroupConsumptionList(String groupCode) {
         List<MemberGroupConsumptionVO> resultList = Lists.newArrayList();

jsowell-pile/src/main/resources/mapper/pile/MemberGroupRelationMapper.xml

@@ -369,4 +369,10 @@
       </if>
     </trim>
   </insert>
+
+  <delete id="deleteRelationByGroupCodeAndMemberId">
+    delete from member_group_relation
+    where group_code = #{groupCode,jdbcType=VARCHAR}
+    and member_id = #{memberId,jdbcType=VARCHAR}
+  </delete>
 </mapper>