diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java index d981777c..417179ba 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/entity/CustomerMain.java @@ -99,5 +99,11 @@ public class CustomerMain extends TenantBaseDO { * 客户状态 */ private String status; + /** + * + * 会员表id + * + */ + private String memberLevelId; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/controller/admin/MemberLevelController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/controller/admin/MemberLevelController.java index f0b923d1..471bdc71 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/controller/admin/MemberLevelController.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/controller/admin/MemberLevelController.java @@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -114,6 +116,15 @@ public class MemberLevelController { Page page = new Page<>(pageNo, pageSize); return success(levelService.queryListPage(pageReqVO,page)); } - + /** + * 获取全部会员 + * + **/ + @GetMapping("/all") + @Operation(summary = "获得全部会员") + @PreAuthorize("@ss.hasPermission('member:level:query')") + public CommonResult> getLevelAll(MemberLevelPageReqVO pageReqVO) { + return success(levelService.queryListAll(pageReqVO)); + } } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/entity/ActiveMain.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/entity/ActiveMain.java index f4bc091a..0edc1899 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/entity/ActiveMain.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/entity/ActiveMain.java @@ -61,5 +61,9 @@ public class ActiveMain extends TenantBaseDO { private String isPack; /**是否关联卡券*/ private String isCoupon; + /** + * 是否重复参与 + */ + private String isParticipate; } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/MemberLevelService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/MemberLevelService.java index 0e2ea5d2..424efa4c 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/MemberLevelService.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/MemberLevelService.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * 会员等级 Service 接口 * @@ -54,4 +56,11 @@ public interface MemberLevelService extends IService { **/ IPage queryListPage(MemberLevelPageReqVO pageReqVO, Page page); + /** + * 获取全部会员 + * + **/ + List queryListAll(MemberLevelPageReqVO pageReqVO); + + } \ No newline at end of file diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/impl/MemberLevelServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/impl/MemberLevelServiceImpl.java index 7f4115fd..b5dd3b83 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/impl/MemberLevelServiceImpl.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/member/service/impl/MemberLevelServiceImpl.java @@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.member.service.MemberLevelService; import cn.iocoder.yudao.module.member.vo.MemberLevelPageReqVO; import cn.iocoder.yudao.module.member.vo.MemberLevelRespVO; import cn.iocoder.yudao.module.member.vo.MemberLevelSaveReqVO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.List; /** * 会员等级 Service 实现类 @@ -82,5 +84,14 @@ public class MemberLevelServiceImpl extends ServiceImpl queryListAll(MemberLevelPageReqVO pageReqVO) { + + QueryWrapper q = new QueryWrapper<>(); + q.eq("status","01"); + List memberLevels = this.levelMapper.selectList(q); + return memberLevels; + } + } \ No newline at end of file