From a18a478b366c3254a6a1f1376d1203847d04cd9f Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Tue, 31 Dec 2024 15:05:15 +0800 Subject: [PATCH] =?UTF-8?q?style:=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcwl-admin/pom.xml | 12 ++++ .../main/java/com/mcwl/McWlApplication.java | 2 + .../myInvitation/ConsumeController.java | 4 +- .../myInvitation/InvitationController.java | 5 +- .../src/main/resources/application-druid.yml | 4 +- .../com/mcwl/memberCenter/MemberTest.java | 24 ++++++++ mcwl-memberCenter/pom.xml | 41 +++++++++++++ .../com/mcwl/memberCenter/domain/Member.java | 33 +++++++++++ .../mcwl/memberCenter/domain/UserMember.java | 59 +++++++++++++++++++ .../mcwl/memberCenter/enums/MemberMenu.java | 17 ++++++ .../memberCenter/mapper/MemberMapper.java | 11 ++++ .../memberCenter/mapper/UserMemberMapper.java | 9 +++ .../memberCenter/service/MemberService.java | 11 ++++ .../service/UserMemberService.java | 7 +++ .../service/impl/MemberServiceImpl.java | 14 +++++ .../service/impl/UserMemberServiceImpl.java | 11 ++++ .../main/resources/mapper/MemberMapper.xml | 9 +++ .../mcwl/myInvitation/domain/Commission.java | 3 + .../com/mcwl/myInvitation/domain/Consume.java | 3 + .../mcwl/myInvitation/domain/Invitation.java | 3 + pom.xml | 1 + 21 files changed, 278 insertions(+), 5 deletions(-) create mode 100644 mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberTest.java create mode 100644 mcwl-memberCenter/pom.xml create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/Member.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/UserMember.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/enums/MemberMenu.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/MemberMapper.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/UserMemberMapper.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/UserMemberService.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java create mode 100644 mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/UserMemberServiceImpl.java create mode 100644 mcwl-memberCenter/src/main/resources/mapper/MemberMapper.xml diff --git a/mcwl-admin/pom.xml b/mcwl-admin/pom.xml index 85736cc..d54670c 100644 --- a/mcwl-admin/pom.xml +++ b/mcwl-admin/pom.xml @@ -62,6 +62,18 @@ 3.8.8 + + com.mcwl + mcwl-memberCenter + 3.8.8 + + + + org.springframework.boot + spring-boot-starter-test + test + + com.mcwl diff --git a/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java b/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java index bd02bff..9b2be11 100644 --- a/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java +++ b/mcwl-admin/src/main/java/com/mcwl/McWlApplication.java @@ -1,5 +1,6 @@ package com.mcwl; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author mcwl */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@MapperScan(basePackages = "com.mcwl") public class McWlApplication { public static void main(String[] args) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/ConsumeController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/ConsumeController.java index ad4868f..dbec591 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/ConsumeController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/ConsumeController.java @@ -1,9 +1,11 @@ package com.mcwl.web.controller.myInvitation; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@RestController("/consume") +@RestController() +@RequestMapping("/consume") public class ConsumeController { diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java index 8043992..1d09926 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/myInvitation/InvitationController.java @@ -8,15 +8,16 @@ import com.mcwl.myInvitation.domain.Invitation; import com.mcwl.myInvitation.service.InvitationService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; import static com.mcwl.common.core.domain.AjaxResult.success; -@RestController("/invitation") +@RestController() @RequiredArgsConstructor - +@RequestMapping("/invitation") public class InvitationController { private final InvitationService invitationService; diff --git a/mcwl-admin/src/main/resources/application-druid.yml b/mcwl-admin/src/main/resources/application-druid.yml index 98ecb56..abfa090 100644 --- a/mcwl-admin/src/main/resources/application-druid.yml +++ b/mcwl-admin/src/main/resources/application-druid.yml @@ -61,9 +61,9 @@ spring: multi-statement-allow: true mybatis-plus: # Mapper XML文件位置 - mapper-locations: classpath:mapper/**/*.xml + mapper-locations: classpath*:mapper/**/*.xml # 配置实体类所在的包名，MyBatis-Plus会自动扫描并注册为别名 - type-aliases-package: com.mcwl.**.mapper + type-aliases-package: com.mcwl.**.domain # 全局配置 global-config: db-config: diff --git a/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberTest.java b/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberTest.java new file mode 100644 index 0000000..88b9416 --- /dev/null +++ b/mcwl-admin/src/test/java/com/mcwl/memberCenter/MemberTest.java @@ -0,0 +1,24 @@ +package com.mcwl.memberCenter; + +import com.mcwl.McWlApplication; +import com.mcwl.memberCenter.service.MemberService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = McWlApplication.class) +public class MemberTest { + + + @Autowired + private MemberService memberService; + + @Test + public void memberServiceTest() { + System.out.println(memberService.list()); + } + +} diff --git a/mcwl-memberCenter/pom.xml b/mcwl-memberCenter/pom.xml new file mode 100644 index 0000000..4992997 --- /dev/null +++ b/mcwl-memberCenter/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.mcwl + mcwl + 3.8.8 + + + mcwl-memberCenter + + + 8 + 8 + UTF-8 + 3.5.2 + + + + + + com.mcwl + mcwl-common + + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + \ No newline at end of file diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/Member.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/Member.java new file mode 100644 index 0000000..735803a --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/Member.java @@ -0,0 +1,33 @@ +package com.mcwl.memberCenter.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.mcwl.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Objects; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("mem_member") +public class Member extends BaseEntity { + + @TableId + private Long id; + + // 会员类型 + private String member_type; + + // 会员名称 + private String member_name; + + // 会员价格 + private Double unit_price; + + // 会员原价 + private Double original_price; + + // 删除标志（0代表存在 2代表删除） + private String delFlag; +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/UserMember.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/UserMember.java new file mode 100644 index 0000000..6ec452f --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/UserMember.java @@ -0,0 +1,59 @@ +package com.mcwl.memberCenter.domain; + + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.mcwl.common.core.domain.BaseEntity; +import com.mcwl.memberCenter.enums.MemberMenu; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("mem_member") +public class UserMember extends BaseEntity { + + @TableId + private Long id; + + // 用户ID + private Long userId; + + // 会员ID + private Long memberId; + + // 会员开始时间 + private Date startDate; + + // 会员结束时间 + private Date endDate; + + // 会员积分 + private Integer points; + + // 订阅状态 active（活跃）、inactive（非活跃）、pending（待支付）和expired（过期） + @EnumValue + private MemberMenu subscriptionStatus; + + // 支付方式 + private String paymentMethod; + + // 上次支付时间 + private Date lastPaymentDate; + + // 下次计费时间 + private Date nextBillingDate; + + // 上次登录时间 + private Date lastLoginDate; + + // 状态(0:正常 1:禁用) + private String status; + + // 删除标志（0代表存在 2代表删除） + private String delFlag; + +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/enums/MemberMenu.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/enums/MemberMenu.java new file mode 100644 index 0000000..aabb0f9 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/enums/MemberMenu.java @@ -0,0 +1,17 @@ +package com.mcwl.memberCenter.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MemberMenu { + MEMBER_CENTER_ACTIVE("active", "活跃"), + MEMBER_CENTER_INACTIVE("inactive", "非活跃"), + MEMBER_CENTER_PENDING("pending", "待支付"), + MEMBER_CENTER_EXPIRED("expired", "过期"); + + private final String name; + + private final String value; +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/MemberMapper.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/MemberMapper.java new file mode 100644 index 0000000..c127692 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/MemberMapper.java @@ -0,0 +1,11 @@ +package com.mcwl.memberCenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mcwl.memberCenter.domain.Member; +import org.apache.ibatis.annotations.Mapper; + +//@Mapper +public interface MemberMapper extends BaseMapper { + + +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/UserMemberMapper.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/UserMemberMapper.java new file mode 100644 index 0000000..80311c6 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/mapper/UserMemberMapper.java @@ -0,0 +1,9 @@ +package com.mcwl.memberCenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mcwl.memberCenter.domain.UserMember; +import org.apache.ibatis.annotations.Mapper; + +//@Mapper +public interface UserMemberMapper extends BaseMapper { +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java new file mode 100644 index 0000000..41aaeaf --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java @@ -0,0 +1,11 @@ +package com.mcwl.memberCenter.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mcwl.memberCenter.domain.Member; + +import java.util.List; + +public interface MemberService extends IService { + + +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/UserMemberService.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/UserMemberService.java new file mode 100644 index 0000000..c079952 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/UserMemberService.java @@ -0,0 +1,7 @@ +package com.mcwl.memberCenter.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.mcwl.memberCenter.domain.UserMember; + +public interface UserMemberService extends IService { +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java new file mode 100644 index 0000000..13dda34 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java @@ -0,0 +1,14 @@ +package com.mcwl.memberCenter.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mcwl.memberCenter.domain.Member; +import com.mcwl.memberCenter.mapper.MemberMapper; +import com.mcwl.memberCenter.service.MemberService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MemberServiceImpl extends ServiceImpl implements MemberService { + +} diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/UserMemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/UserMemberServiceImpl.java new file mode 100644 index 0000000..2f9f891 --- /dev/null +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/UserMemberServiceImpl.java @@ -0,0 +1,11 @@ +package com.mcwl.memberCenter.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mcwl.memberCenter.domain.UserMember; +import com.mcwl.memberCenter.mapper.UserMemberMapper; +import com.mcwl.memberCenter.service.UserMemberService; +import org.springframework.stereotype.Service; + +@Service +public class UserMemberServiceImpl extends ServiceImpl implements UserMemberService { +} diff --git a/mcwl-memberCenter/src/main/resources/mapper/MemberMapper.xml b/mcwl-memberCenter/src/main/resources/mapper/MemberMapper.xml new file mode 100644 index 0000000..ea8093a --- /dev/null +++ b/mcwl-memberCenter/src/main/resources/mapper/MemberMapper.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java index bb7cd4a..6d3307e 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Commission.java @@ -27,6 +27,9 @@ public class Commission extends BaseEntity { // 支付状态 private Integer payStatus; + // 删除标志（0代表存在 2代表删除） + private String delFlag; + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java index 1cd9935..4b661ac 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java @@ -25,6 +25,9 @@ public class Consume extends BaseEntity { // 消费时间 private Date consumeDate; + // 删除标志（0代表存在 2代表删除） + private String delFlag; + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Invitation.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Invitation.java index 3076d14..5460377 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Invitation.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Invitation.java @@ -25,6 +25,9 @@ public class Invitation extends BaseEntity { // 邀请码 private String invitationCode; + // 删除标志（0代表存在 2代表删除） + private String delFlag; + @Override public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; diff --git a/pom.xml b/pom.xml index bb609ff..c2d583d 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,7 @@ mcwl-common mcwl-myInvitation mcwl-resource + mcwl-memberCenter pom