Merge branch 'test' into dev-lms

share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java

@@ -25,17 +25,15 @@ import share.common.enums.RoleTypeEnum;
 import share.common.exception.base.BaseException;
 import share.common.utils.BaseUtil;
 import share.common.utils.DateUtil;
-import share.system.domain.SConsumerCoupon;
-import share.system.domain.SRoomPack;
-import share.system.domain.SStoreConsumer;
+import share.system.domain.*;
 import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.SConsumerVo;
 import share.system.mapper.SConsumerMapper;
-import share.system.domain.SConsumer;
 import share.system.mapper.SStoreConsumerMapper;
 import share.system.request.RegisterThirdSConsumerRequest;
 import share.system.service.ISConsumerCouponService;
 import share.system.service.SConsumerService;
+import share.system.service.SConsumerTokenService;
 
 /**
  * 会员用户Service业务层处理
@@ -53,6 +51,8 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
     private ISConsumerCouponService sConsumerCouponService;
     @Autowired
     private SStoreConsumerMapper storeConsumerMapper;
+    @Autowired
+    private SConsumerTokenService sConsumerTokenService;
 
     /**
      * 查询会员用户
@@ -118,6 +118,9 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
     @Override
     public int deleteSConsumerByIds(Long[] ids)
     {
+        List<Long> idList = ListUtil.toList(ids);
+        storeConsumerMapper.delete(new LambdaQueryWrapper<SStoreConsumer>().in(SStoreConsumer::getConsumerId, idList));
+        sConsumerTokenService.remove(new LambdaQueryWrapper<SConsumerToken>().in(SConsumerToken::getUid, idList));
         return baseMapper.deleteSConsumerByIds(ids);
     }