From ac00a2f49e3131ba9ba579ce5fe75e248c7868b4 Mon Sep 17 00:00:00 2001 From: zzy Date: Sat, 25 Apr 2026 21:26:28 +0800 Subject: [PATCH] =?UTF-8?q?member=E4=BB=A3=E7=A0=81=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/community}/auth/AuthConvert.java | 9 +- .../admin/user/MemberUserController.java | 68 ++++ .../admin/user/vo/MemberUserBaseVO.java | 2 +- .../admin/user/vo/MemberUserPageReqVO.java | 2 +- .../admin/user/vo/MemberUserRespVO.java | 2 +- .../user/vo/MemberUserUpdateLevelReqVO.java | 2 +- .../user/vo/MemberUserUpdatePointReqVO.java | 2 +- .../admin/user/vo/MemberUserUpdateReqVO.java | 2 +- .../app/auth/AppAuthController.http | 0 .../app/auth/AppAuthController.java | 8 +- .../app/auth/vo/AppAuthCheckCodeReqVO.java | 2 +- .../app/auth/vo/AppAuthLoginReqVO.java | 2 +- .../app/auth/vo/AppAuthLoginRespVO.java | 2 +- .../app/auth/vo/AppAuthSmsLoginReqVO.java | 2 +- .../app/auth/vo/AppAuthSmsSendReqVO.java | 2 +- .../app/auth/vo/AppAuthSmsValidateReqVO.java | 2 +- .../app/auth/vo/AppAuthSocialLoginReqVO.java | 2 +- .../vo/AppAuthWeixinMiniAppLoginReqVO.java | 2 +- .../vo/AuthWeixinJsapiSignatureRespVO.java | 2 +- .../app/user/AppMemberUserController.http | 0 .../app/user/AppMemberUserController.java | 8 +- .../app/user/vo/AppMemberUserInfoRespVO.java | 2 +- .../vo/AppMemberUserResetPasswordReqVO.java | 2 +- ...ppMemberUserUpdateMobileByWeixinReqVO.java | 2 +- .../vo/AppMemberUserUpdateMobileReqVO.java | 2 +- .../vo/AppMemberUserUpdatePasswordReqVO.java | 2 +- .../app/user/vo/AppMemberUserUpdateReqVO.java | 2 +- .../dal/dataobject/user/MemberUserDO.java | 6 +- .../user/MemberUserTenantRelDO.java | 2 +- .../dal/mysql/user/MemberUserMapper.java | 6 +- .../mysql/user/MemberUserTenantRelMapper.java | 4 +- .../enums/MemberErrorCodeConstants.java | 25 ++ .../web/config/MemberWebConfiguration.java | 2 +- .../CommunityActivityServiceImpl.java | 10 +- .../service/auth/MemberAuthService.java | 4 +- .../service/auth/MemberAuthServiceImpl.java | 16 +- .../service/house/HouseServiceImpl.java | 4 +- .../memberhouse/MemberHouseServiceImpl.java | 34 +- .../service/user/MemberUserService.java | 10 +- .../service/user/MemberUserServiceImpl.java | 35 +- .../user/MemberUserTenantRelService.java | 4 +- .../user/MemberUserTenantRelServiceImpl.java | 6 +- fjrcloud-module-member/pom.xml | 86 ----- .../member/api/address/MemberAddressApi.java | 29 -- .../api/address/MemberAddressApiImpl.java | 33 -- .../api/address/dto/MemberAddressRespDTO.java | 42 --- .../member/api/config/MemberConfigApi.java | 18 -- .../api/config/MemberConfigApiImpl.java | 28 -- .../api/config/dto/MemberConfigRespDTO.java | 32 -- .../member/api/level/MemberLevelApi.java | 41 --- .../member/api/level/MemberLevelApiImpl.java | 48 --- .../api/level/dto/MemberLevelRespDTO.java | 41 --- .../member/api/message/package-info.java | 4 - .../message/user/MemberUserCreateMessage.java | 21 -- .../module/member/api/package-info.java | 4 - .../member/api/point/MemberPointApi.java | 36 --- .../member/api/point/MemberPointApiImpl.java | 50 --- .../module/member/api/user/MemberUserApi.java | 68 ---- .../member/api/user/MemberUserApiImpl.java | 58 ---- .../api/user/dto/MemberUserRespDTO.java | 55 ---- .../admin/address/AddressController.java | 41 --- .../admin/address/package-info.java | 1 - .../admin/address/vo/AddressBaseVO.java | 35 -- .../admin/address/vo/AddressRespVO.java | 22 -- .../admin/config/MemberConfigController.java | 45 --- .../admin/config/vo/MemberConfigBaseVO.java | 31 -- .../admin/config/vo/MemberConfigRespVO.java | 17 - .../config/vo/MemberConfigSaveReqVO.java | 13 - .../admin/group/MemberGroupController.java | 81 ----- .../admin/group/vo/MemberGroupBaseVO.java | 29 -- .../group/vo/MemberGroupCreateReqVO.java | 14 - .../admin/group/vo/MemberGroupPageReqVO.java | 30 -- .../admin/group/vo/MemberGroupRespVO.java | 22 -- .../group/vo/MemberGroupSimpleRespVO.java | 18 -- .../group/vo/MemberGroupUpdateReqVO.java | 20 -- .../MemberExperienceRecordController.java | 52 --- .../admin/level/MemberLevelController.java | 80 ----- .../level/MemberLevelRecordController.java | 52 --- .../MemberExperienceRecordBaseVO.java | 43 --- .../MemberExperienceRecordPageReqVO.java | 36 --- .../MemberExperienceRecordRespVO.java | 22 -- .../level/vo/level/MemberLevelBaseVO.java | 53 ---- .../vo/level/MemberLevelCreateReqVO.java | 14 - .../level/vo/level/MemberLevelListReqVO.java | 18 -- .../level/vo/level/MemberLevelRespVO.java | 22 -- .../vo/level/MemberLevelSimpleRespVO.java | 21 -- .../vo/level/MemberLevelUpdateReqVO.java | 20 -- .../vo/record/MemberLevelRecordBaseVO.java | 47 --- .../vo/record/MemberLevelRecordPageReqVO.java | 30 -- .../vo/record/MemberLevelRecordRespVO.java | 22 -- .../point/MemberPointRecordController.java | 56 ---- .../vo/recrod/MemberPointRecordPageReqVO.java | 27 -- .../vo/recrod/MemberPointRecordRespVO.java | 42 --- .../signin/MemberSignInConfigController.java | 74 ----- .../signin/MemberSignInRecordController.java | 55 ---- .../vo/config/MemberSignInConfigBaseVO.java | 45 --- .../config/MemberSignInConfigCreateReqVO.java | 12 - .../vo/config/MemberSignInConfigRespVO.java | 19 -- .../config/MemberSignInConfigUpdateReqVO.java | 18 -- .../record/MemberSignInRecordPageReqVO.java | 33 -- .../vo/record/MemberSignInRecordRespVO.java | 30 -- .../admin/tag/MemberTagController.java | 94 ------ .../admin/tag/vo/MemberTagBaseVO.java | 19 -- .../admin/tag/vo/MemberTagCreateReqVO.java | 14 - .../admin/tag/vo/MemberTagPageReqVO.java | 27 -- .../admin/tag/vo/MemberTagRespVO.java | 22 -- .../admin/tag/vo/MemberTagUpdateReqVO.java | 20 -- .../admin/user/MemberUserController.java | 123 ------- .../app/address/AppAddressController.http | 54 ---- .../app/address/AppAddressController.java | 75 ----- .../app/address/vo/AppAddressBaseVO.java | 35 -- .../app/address/vo/AppAddressCreateReqVO.java | 14 - .../app/address/vo/AppAddressRespVO.java | 20 -- .../app/address/vo/AppAddressUpdateReqVO.java | 20 -- .../AppMemberExperienceRecordController.java | 41 --- .../app/level/AppMemberLevelController.java | 38 --- .../AppMemberExperienceRecordRespVO.java | 24 -- .../level/vo/level/AppMemberLevelRespVO.java | 28 -- .../point/AppMemberPointRecordController.java | 40 --- .../vo/AppMemberPointRecordPageReqVO.java | 23 -- .../point/vo/AppMemberPointRecordRespVO.java | 27 -- .../AppMemberSignInConfigController.java | 39 --- .../AppMemberSignInRecordController.java | 53 ---- .../config/AppMemberSignInConfigRespVO.java | 16 - .../record/AppMemberSignInRecordRespVO.java | 24 -- .../AppMemberSignInRecordSummaryRespVO.java | 19 -- .../app/social/AppSocialUserController.java | 79 ----- .../app/social/vo/AppSocialUserBindReqVO.java | 28 -- .../app/social/vo/AppSocialUserRespVO.java | 19 -- .../social/vo/AppSocialUserUnbindReqVO.java | 24 -- .../social/vo/AppSocialWxaQrcodeReqVO.java | 39 --- .../AppSocialWxaSubscribeTemplateRespVO.java | 27 -- .../member/controller/package-info.java | 6 - .../convert/address/AddressConvert.java | 45 --- .../convert/config/MemberConfigConvert.java | 25 -- .../convert/group/MemberGroupConvert.java | 35 -- .../level/MemberExperienceRecordConvert.java | 34 -- .../convert/level/MemberLevelConvert.java | 39 --- .../level/MemberLevelRecordConvert.java | 37 --- .../module/member/convert/package-info.java | 6 - .../point/MemberPointRecordConvert.java | 37 --- .../signin/MemberSignInConfigConvert.java | 33 -- .../signin/MemberSignInRecordConvert.java | 74 ----- .../member/convert/tag/MemberTagConvert.java | 33 -- .../convert/user/MemberUserConvert.java | 59 ---- ...道 Spring Boot 对象转换 MapStruct 入门》.md | 1 - .../dataobject/address/MemberAddressDO.java | 56 ---- .../dal/dataobject/config/MemberConfigDO.java | 48 --- .../dal/dataobject/group/MemberGroupDO.java | 45 --- .../level/MemberExperienceRecordDO.java | 64 ---- .../dal/dataobject/level/MemberLevelDO.java | 64 ---- .../dataobject/level/MemberLevelRecordDO.java | 71 ----- .../dataobject/point/MemberPointRecordDO.java | 69 ---- .../signin/MemberSignInConfigDO.java | 50 --- .../signin/MemberSignInRecordDO.java | 46 --- .../dal/dataobject/tag/MemberTagDO.java | 34 -- .../mysql/address/MemberAddressMapper.java | 22 -- .../dal/mysql/config/MemberConfigMapper.java | 14 - .../dal/mysql/group/MemberGroupMapper.java | 31 -- .../level/MemberExperienceRecordMapper.java | 35 -- .../dal/mysql/level/MemberLevelMapper.java | 33 -- .../mysql/level/MemberLevelRecordMapper.java | 26 -- .../mysql/point/MemberPointRecordMapper.java | 42 --- .../signin/MemberSignInConfigMapper.java | 24 -- .../signin/MemberSignInRecordMapper.java | 65 ---- .../member/dal/mysql/tag/MemberTagMapper.java | 28 -- .../module/member/dal/package-info.java | 9 - .../module/member/dal/redis/package-info.java | 4 - .../member/enums/DictTypeConstants.java | 15 - .../member/enums/ErrorCodeConstants.java | 58 ---- .../enums/MemberExperienceBizTypeEnum.java | 51 --- .../enums/point/MemberPointBizTypeEnum.java | 58 ---- .../module/member/framework/package-info.java | 6 - .../member/framework/web/package-info.java | 4 - .../member/mq/consumer/package-info.java | 4 - .../member/mq/message/package-info.java | 4 - .../member/mq/producer/package-info.java | 4 - .../mq/producer/user/MemberUserProducer.java | 31 -- .../community/module/member/package-info.java | 8 - .../service/address/AddressService.java | 67 ---- .../service/address/AddressServiceImpl.java | 97 ------ .../service/config/MemberConfigService.java | 29 -- .../config/MemberConfigServiceImpl.java | 44 --- .../service/group/MemberGroupService.java | 84 ----- .../service/group/MemberGroupServiceImpl.java | 103 ------ .../level/MemberExperienceRecordService.java | 53 ---- .../MemberExperienceRecordServiceImpl.java | 55 ---- .../level/MemberLevelRecordService.java | 37 --- .../level/MemberLevelRecordServiceImpl.java | 39 --- .../service/level/MemberLevelService.java | 102 ------ .../service/level/MemberLevelServiceImpl.java | 299 ------------------ .../point/MemberPointRecordService.java | 42 --- .../point/MemberPointRecordServiceImpl.java | 96 ------ .../signin/MemberSignInConfigService.java | 62 ---- .../signin/MemberSignInConfigServiceImpl.java | 106 ------- .../signin/MemberSignInRecordService.java | 50 --- .../signin/MemberSignInRecordServiceImpl.java | 145 --------- .../member/service/tag/MemberTagService.java | 73 ----- .../service/tag/MemberTagServiceImpl.java | 125 -------- .../test/resources/application-unit-test.yaml | 47 --- .../src/test/resources/logback.xml | 4 - .../src/test/resources/sql/clean.sql | 5 - .../src/test/resources/sql/create_tables.sql | 113 ------- fjrcloud-server/pom.xml | 7 - pom.xml | 1 - 205 files changed, 174 insertions(+), 6782 deletions(-) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/auth/AuthConvert.java (72%) create mode 100644 fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/MemberUserController.java rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserBaseVO.java (96%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserPageReqVO.java (89%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserRespVO.java (96%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java (92%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserUpdatePointReqVO.java (90%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/admin/user/vo/MemberUserUpdateReqVO.java (88%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/AppAuthController.http (100%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/AppAuthController.java (94%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthCheckCodeReqVO.java (95%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthLoginReqVO.java (96%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthLoginRespVO.java (94%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthSmsLoginReqVO.java (96%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthSmsSendReqVO.java (91%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthSmsValidateReqVO.java (94%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthSocialLoginReqVO.java (94%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java (93%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java (93%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/AppMemberUserController.http (100%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/AppMemberUserController.java (90%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserInfoRespVO.java (96%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java (95%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java (87%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java (94%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java (93%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/controller/app/user/vo/AppMemberUserUpdateReqVO.java (90%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/dal/dataobject/user/MemberUserDO.java (91%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/dal/dataobject/user/MemberUserTenantRelDO.java (92%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/dal/mysql/user/MemberUserMapper.java (95%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/dal/mysql/user/MemberUserTenantRelMapper.java (93%) create mode 100644 fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/enums/MemberErrorCodeConstants.java rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/framework/web/config/MemberWebConfiguration.java (89%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/auth/MemberAuthService.java (93%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/auth/MemberAuthServiceImpl.java (95%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/user/MemberUserService.java (92%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/user/MemberUserServiceImpl.java (90%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/user/MemberUserTenantRelService.java (89%) rename {fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member => fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community}/service/user/MemberUserTenantRelServiceImpl.java (94%) delete mode 100644 fjrcloud-module-member/pom.xml delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApi.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApiImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/dto/MemberAddressRespDTO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApi.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApiImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/dto/MemberConfigRespDTO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApi.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApiImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/dto/MemberLevelRespDTO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/user/MemberUserCreateMessage.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApi.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApiImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApi.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApiImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/dto/MemberUserRespDTO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/AddressController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/MemberConfigController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/MemberGroupController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberExperienceRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/MemberPointRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInConfigController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/MemberTagController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/MemberUserController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.http delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressBaseVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressCreateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberExperienceRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberLevelController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/AppMemberPointRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInConfigController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInRecordController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/AppSocialUserController.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserUnbindReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaQrcodeReqVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaSubscribeTemplateRespVO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/address/AddressConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/config/MemberConfigConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/group/MemberGroupConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberExperienceRecordConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelRecordConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/point/MemberPointRecordConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInConfigConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInRecordConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/tag/MemberTagConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/user/MemberUserConvert.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/address/MemberAddressDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/config/MemberConfigDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/group/MemberGroupDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberExperienceRecordDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelRecordDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/point/MemberPointRecordDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInConfigDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInRecordDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/tag/MemberTagDO.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/address/MemberAddressMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/config/MemberConfigMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/group/MemberGroupMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberExperienceRecordMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelRecordMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/point/MemberPointRecordMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInConfigMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInRecordMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/tag/MemberTagMapper.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/redis/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/DictTypeConstants.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/ErrorCodeConstants.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/MemberExperienceBizTypeEnum.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/point/MemberPointBizTypeEnum.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/consumer/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/message/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/user/MemberUserProducer.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/package-info.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordServiceImpl.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagService.java delete mode 100644 fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagServiceImpl.java delete mode 100644 fjrcloud-module-member/src/test/resources/application-unit-test.yaml delete mode 100644 fjrcloud-module-member/src/test/resources/logback.xml delete mode 100644 fjrcloud-module-member/src/test/resources/sql/clean.sql delete mode 100644 fjrcloud-module-member/src/test/resources/sql/create_tables.sql diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/auth/AuthConvert.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/auth/AuthConvert.java similarity index 72% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/auth/AuthConvert.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/auth/AuthConvert.java index 63719d8..76272d8 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/auth/AuthConvert.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/auth/AuthConvert.java @@ -1,14 +1,12 @@ -package com.fjrcloud.community.module.member.convert.auth; +package com.fjrcloud.community.module.community.auth; import com.fjrcloud.community.framework.common.biz.system.oauth2.dto.OAuth2AccessTokenRespDTO; -import com.fjrcloud.community.module.member.controller.app.auth.vo.*; -import com.fjrcloud.community.module.member.controller.app.social.vo.AppSocialUserUnbindReqVO; -import com.fjrcloud.community.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO; +import com.fjrcloud.community.module.community.controller.app.auth.vo.*; +import com.fjrcloud.community.module.community.controller.app.user.vo.AppMemberUserResetPasswordReqVO; import com.fjrcloud.community.module.system.api.sms.dto.code.SmsCodeSendReqDTO; import com.fjrcloud.community.module.system.api.sms.dto.code.SmsCodeUseReqDTO; import com.fjrcloud.community.module.system.api.sms.dto.code.SmsCodeValidateReqDTO; import com.fjrcloud.community.module.system.api.social.dto.SocialUserBindReqDTO; -import com.fjrcloud.community.module.system.api.social.dto.SocialUserUnbindReqDTO; import com.fjrcloud.community.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO; import com.fjrcloud.community.module.system.enums.sms.SmsSceneEnum; import org.mapstruct.Mapper; @@ -20,7 +18,6 @@ public interface AuthConvert { AuthConvert INSTANCE = Mappers.getMapper(AuthConvert.class); SocialUserBindReqDTO convert(Long userId, Integer userType, AppAuthSocialLoginReqVO reqVO); - SocialUserUnbindReqDTO convert(Long userId, Integer userType, AppSocialUserUnbindReqVO reqVO); SmsCodeSendReqDTO convert(AppAuthSmsSendReqVO reqVO); SmsCodeUseReqDTO convert(AppMemberUserResetPasswordReqVO reqVO, SmsSceneEnum scene, String usedIp); diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/MemberUserController.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/MemberUserController.java new file mode 100644 index 0000000..3494dec --- /dev/null +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/MemberUserController.java @@ -0,0 +1,68 @@ +package com.fjrcloud.community.module.community.controller.admin.user; + +import cn.hutool.core.collection.CollUtil; +import com.fjrcloud.community.framework.common.pojo.CommonResult; +import com.fjrcloud.community.framework.common.pojo.PageResult; +import com.fjrcloud.community.framework.common.util.object.BeanUtils; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserPageReqVO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserRespVO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.service.user.MemberUserService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 会员用户") +@RestController +@RequestMapping("/member/user") +@Validated +public class MemberUserController { + + @Resource + private MemberUserService memberUserService; + + @PutMapping("/update") + @Operation(summary = "更新会员用户") + @PreAuthorize("@ss.hasPermission('member:user:update')") + public CommonResult updateUser(@Valid @RequestBody MemberUserUpdateReqVO updateReqVO) { + memberUserService.updateUser(updateReqVO); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得会员用户") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('member:user:query')") + public CommonResult getUser(@RequestParam("id") Long id) { + MemberUserDO user = memberUserService.getUser(id); + if (user == null) { + return success(null); + } + MemberUserRespVO userVO = BeanUtils.toBean(user, MemberUserRespVO.class); + return success(userVO); + } + + @GetMapping("/page") + @Operation(summary = "获得会员用户分页") + @PreAuthorize("@ss.hasPermission('member:user:query')") + public CommonResult> getUserPage(@Valid MemberUserPageReqVO pageVO) { + PageResult pageResult = memberUserService.getUserPage(pageVO); + if (CollUtil.isEmpty(pageResult.getList())) { + return success(PageResult.empty()); + } + List respVOList = BeanUtils.toBean(pageResult.getList(), MemberUserRespVO.class); + PageResult result = new PageResult<>(respVOList, pageResult.getTotal()); + return success(result); + } + +} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserBaseVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserBaseVO.java similarity index 96% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserBaseVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserBaseVO.java index 45252cf..0925bf2 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserBaseVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserBaseVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserPageReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserPageReqVO.java similarity index 89% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserPageReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserPageReqVO.java index 576299f..b55c125 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserPageReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserPageReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import com.fjrcloud.community.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserRespVO.java similarity index 96% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserRespVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserRespVO.java index e5d196d..632306a 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserRespVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java similarity index 92% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java index 9931434..c80a2f5 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateLevelReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdatePointReqVO.java similarity index 90% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdatePointReqVO.java index ebaaf70..81b544e 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdatePointReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdatePointReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateReqVO.java similarity index 88% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateReqVO.java index 5872eea..d7e4a7c 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/vo/MemberUserUpdateReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/admin/user/vo/MemberUserUpdateReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.admin.user.vo; +package com.fjrcloud.community.module.community.controller.admin.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/AppAuthController.http b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/AppAuthController.http similarity index 100% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/AppAuthController.http rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/AppAuthController.http diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/AppAuthController.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/AppAuthController.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/AppAuthController.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/AppAuthController.java index 3c0203f..9525db5 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/AppAuthController.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/AppAuthController.java @@ -1,13 +1,13 @@ -package com.fjrcloud.community.module.member.controller.app.auth; +package com.fjrcloud.community.module.community.controller.app.auth; import cn.hutool.core.util.StrUtil; import com.fjrcloud.community.framework.common.enums.UserTypeEnum; import com.fjrcloud.community.framework.common.pojo.CommonResult; import com.fjrcloud.community.framework.security.config.SecurityProperties; import com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils; -import com.fjrcloud.community.module.member.controller.app.auth.vo.*; -import com.fjrcloud.community.module.member.convert.auth.AuthConvert; -import com.fjrcloud.community.module.member.service.auth.MemberAuthService; +import com.fjrcloud.community.module.community.auth.AuthConvert; +import com.fjrcloud.community.module.community.controller.app.auth.vo.*; +import com.fjrcloud.community.module.community.service.auth.MemberAuthService; import com.fjrcloud.community.module.system.api.social.SocialClientApi; import com.fjrcloud.community.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO; import io.swagger.v3.oas.annotations.Operation; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthCheckCodeReqVO.java similarity index 95% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthCheckCodeReqVO.java index 212d320..cbe53e6 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthCheckCodeReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthCheckCodeReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import com.fjrcloud.community.framework.common.validation.InEnum; import com.fjrcloud.community.framework.common.validation.Mobile; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginReqVO.java similarity index 96% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginReqVO.java index bcb91be..70d8f37 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import cn.hutool.core.util.StrUtil; import com.fjrcloud.community.framework.common.validation.InEnum; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginRespVO.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginRespVO.java index cd7f480..c7eff42 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthLoginRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthLoginRespVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsLoginReqVO.java similarity index 96% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsLoginReqVO.java index 3560301..b9a8823 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsLoginReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import cn.hutool.core.util.StrUtil; import com.fjrcloud.community.framework.common.validation.InEnum; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsSendReqVO.java similarity index 91% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsSendReqVO.java index f1f92d3..4151f7e 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsSendReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsSendReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import com.fjrcloud.community.framework.common.validation.InEnum; import com.fjrcloud.community.framework.common.validation.Mobile; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsValidateReqVO.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsValidateReqVO.java index 9980bf5..668feff 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSmsValidateReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSmsValidateReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import com.fjrcloud.community.framework.common.validation.InEnum; import com.fjrcloud.community.framework.common.validation.Mobile; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSocialLoginReqVO.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSocialLoginReqVO.java index 1361a40..c8d4555 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthSocialLoginReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import com.fjrcloud.community.framework.common.validation.InEnum; import com.fjrcloud.community.module.system.enums.social.SocialTypeEnum; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java similarity index 93% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java index e0a00a7..a82b12c 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AppAuthWeixinMiniAppLoginReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java similarity index 93% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java index ed409e8..21e948e 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/auth/vo/AuthWeixinJsapiSignatureRespVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.auth.vo; +package com.fjrcloud.community.module.community.controller.app.auth.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/AppMemberUserController.http b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/AppMemberUserController.http similarity index 100% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/AppMemberUserController.http rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/AppMemberUserController.http diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/AppMemberUserController.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/AppMemberUserController.java similarity index 90% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/AppMemberUserController.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/AppMemberUserController.java index 8c593eb..8578ba2 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/AppMemberUserController.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/AppMemberUserController.java @@ -1,10 +1,10 @@ -package com.fjrcloud.community.module.member.controller.app.user; +package com.fjrcloud.community.module.community.controller.app.user; import com.fjrcloud.community.framework.common.pojo.CommonResult; import com.fjrcloud.community.framework.common.util.object.BeanUtils; -import com.fjrcloud.community.module.member.controller.app.user.vo.*; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.service.user.MemberUserService; +import com.fjrcloud.community.module.community.controller.app.user.vo.*; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.service.user.MemberUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserInfoRespVO.java similarity index 96% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserInfoRespVO.java index 27c800f..652b8d8 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserInfoRespVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java similarity index 95% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java index b433349..3f1ed27 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserResetPasswordReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import com.fjrcloud.community.framework.common.validation.Mobile; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java similarity index 87% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java index b709aef..c52f20a 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileByWeixinReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java index d7c820c..d334dae 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateMobileReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import com.fjrcloud.community.framework.common.validation.Mobile; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java similarity index 93% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java index a69147c..14fb298 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdatePasswordReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateReqVO.java similarity index 90% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateReqVO.java index a62099e..81f8156 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/controller/app/user/vo/AppMemberUserUpdateReqVO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.controller.app.user.vo; +package com.fjrcloud.community.module.community.controller.app.user.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserDO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserDO.java similarity index 91% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserDO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserDO.java index ed5086a..c0f272f 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserDO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserDO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.dal.dataobject.user; +package com.fjrcloud.community.module.community.dal.dataobject.user; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; @@ -10,8 +10,6 @@ import com.fjrcloud.community.framework.ip.core.Area; import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; import com.fjrcloud.community.framework.mybatis.core.type.LongListTypeHandler; import com.fjrcloud.community.framework.tenant.core.aop.TenantIgnore; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; import com.fjrcloud.community.module.system.enums.common.SexEnum; import lombok.*; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -130,7 +128,6 @@ public class MemberUserDO extends BaseDO { /** * 会员级别编号 * - * 关联 {@link MemberLevelDO#getId()} 字段 */ private Long levelId; /** @@ -140,7 +137,6 @@ public class MemberUserDO extends BaseDO { /** * 用户分组编号 * - * 关联 {@link MemberGroupDO#getId()} 字段 */ private Long groupId; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserTenantRelDO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserTenantRelDO.java similarity index 92% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserTenantRelDO.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserTenantRelDO.java index 56b20a4..0c860ae 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/user/MemberUserTenantRelDO.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/user/MemberUserTenantRelDO.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.dal.dataobject.user; +package com.fjrcloud.community.module.community.dal.dataobject.user; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserMapper.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserMapper.java similarity index 95% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserMapper.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserMapper.java index e2ec832..5f7ab34 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserMapper.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserMapper.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.dal.mysql.user; +package com.fjrcloud.community.module.community.dal.mysql.user; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.fjrcloud.community.framework.common.pojo.PageResult; import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserPageReqVO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; import org.apache.ibatis.annotations.Mapper; import java.util.Collection; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserTenantRelMapper.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserTenantRelMapper.java similarity index 93% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserTenantRelMapper.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserTenantRelMapper.java index b93a209..16378e4 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/user/MemberUserTenantRelMapper.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/mysql/user/MemberUserTenantRelMapper.java @@ -1,8 +1,8 @@ -package com.fjrcloud.community.module.member.dal.mysql.user; +package com.fjrcloud.community.module.community.dal.mysql.user; import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserTenantRelDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserTenantRelDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/enums/MemberErrorCodeConstants.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/enums/MemberErrorCodeConstants.java new file mode 100644 index 0000000..1fce335 --- /dev/null +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/enums/MemberErrorCodeConstants.java @@ -0,0 +1,25 @@ +package com.fjrcloud.community.module.community.enums; + +import com.fjrcloud.community.framework.common.exception.ErrorCode; + +/** + * Member 错误码枚举类 + *

+ * member 系统，使用 1-004-000-000 段 + */ +public interface MemberErrorCodeConstants { + + // ========== 用户相关 1-004-001-000 ============ + ErrorCode USER_NOT_EXISTS = new ErrorCode(1_004_001_000, "用户不存在"); + ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1_004_001_001, "手机号未注册用户"); + ErrorCode USER_MOBILE_USED = new ErrorCode(1_004_001_002, "修改手机失败，该手机号({})已经被使用"); + + + // ========== AUTH 模块 1-004-003-000 ========== + ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_004_003_000, "登录失败，账号密码不正确"); + ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_004_003_001, "登录失败，账号被禁用"); + ErrorCode AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_004_003_005, "登录失败，解析不到三方登录信息"); + ErrorCode AUTH_MOBILE_USED = new ErrorCode(1_004_003_007, "手机号已经被使用"); + + +} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/config/MemberWebConfiguration.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/framework/web/config/MemberWebConfiguration.java similarity index 89% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/config/MemberWebConfiguration.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/framework/web/config/MemberWebConfiguration.java index 29f5557..2bfcad9 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/config/MemberWebConfiguration.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/framework/web/config/MemberWebConfiguration.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.framework.web.config; +package com.fjrcloud.community.module.community.framework.web.config; import com.fjrcloud.community.framework.swagger.config.FjrcloudSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java index 4d33568..378b070 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/activity/CommunityActivityServiceImpl.java @@ -14,12 +14,12 @@ import com.fjrcloud.community.module.community.controller.app.activity.vo.AppAct import com.fjrcloud.community.module.community.dal.dataobject.activity.ActivityRegistrationDO; import com.fjrcloud.community.module.community.dal.dataobject.activity.CommunityActivityDO; import com.fjrcloud.community.module.community.dal.dataobject.community.CommunityDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; import com.fjrcloud.community.module.community.dal.mysql.activity.ActivityRegistrationMapper; import com.fjrcloud.community.module.community.dal.mysql.activity.ActivityScopeMapper; import com.fjrcloud.community.module.community.dal.mysql.activity.CommunityActivityMapper; import com.fjrcloud.community.module.community.service.community.CommunityService; -import com.fjrcloud.community.module.member.api.user.MemberUserApi; -import com.fjrcloud.community.module.member.api.user.dto.MemberUserRespDTO; +import com.fjrcloud.community.module.community.service.user.MemberUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -33,7 +33,7 @@ import java.util.stream.Collectors; import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.fjrcloud.community.framework.tenant.core.security.TenantSecurityWebFilter.SYSTEM_TENANT_ID; import static com.fjrcloud.community.module.community.enums.ErrorCodeConstants.*; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.USER_NOT_EXISTS; +import static com.fjrcloud.community.module.community.enums.MemberErrorCodeConstants.USER_NOT_EXISTS; /** * 小区活动 Service 实现类 @@ -57,7 +57,7 @@ public class CommunityActivityServiceImpl implements CommunityActivityService { private CommunityService communityService; @Resource - private MemberUserApi memberUserApi; + private MemberUserService memberUserService; @Override @Transactional(rollbackFor = Exception.class) @@ -221,7 +221,7 @@ public class CommunityActivityServiceImpl implements CommunityActivityService { } // 获取会员信息 - MemberUserRespDTO memberUser = memberUserApi.getUser(memberId); + MemberUserDO memberUser = memberUserService.getUser(memberId); if (memberUser == null) { throw exception(USER_NOT_EXISTS); } diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthService.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthService.java similarity index 93% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthService.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthService.java index 84bbd3b..9c4aafa 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthService.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthService.java @@ -1,6 +1,6 @@ -package com.fjrcloud.community.module.member.service.auth; +package com.fjrcloud.community.module.community.service.auth; -import com.fjrcloud.community.module.member.controller.app.auth.vo.*; +import com.fjrcloud.community.module.community.controller.app.auth.vo.*; import javax.validation.Valid; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthServiceImpl.java similarity index 95% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthServiceImpl.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthServiceImpl.java index 35567d1..50d97ec 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/auth/MemberAuthServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/auth/MemberAuthServiceImpl.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.service.auth; +package com.fjrcloud.community.module.community.service.auth; import cn.hutool.core.lang.Assert; import com.fjrcloud.community.framework.common.biz.system.oauth2.OAuth2TokenCommonApi; @@ -10,12 +10,12 @@ import com.fjrcloud.community.framework.common.enums.UserTypeEnum; import com.fjrcloud.community.framework.common.util.monitor.TracerUtils; import com.fjrcloud.community.framework.common.util.servlet.ServletUtils; import com.fjrcloud.community.framework.tenant.core.context.TenantContextHolder; -import com.fjrcloud.community.module.member.controller.app.auth.vo.*; -import com.fjrcloud.community.module.member.convert.auth.AuthConvert; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserTenantRelDO; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import com.fjrcloud.community.module.member.service.user.MemberUserTenantRelService; +import com.fjrcloud.community.module.community.auth.AuthConvert; +import com.fjrcloud.community.module.community.controller.app.auth.vo.*; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserTenantRelDO; +import com.fjrcloud.community.module.community.service.user.MemberUserService; +import com.fjrcloud.community.module.community.service.user.MemberUserTenantRelService; import com.fjrcloud.community.module.system.api.logger.LoginLogApi; import com.fjrcloud.community.module.system.api.logger.dto.LoginLogCreateReqDTO; import com.fjrcloud.community.module.system.api.sms.SmsCodeApi; @@ -39,7 +39,7 @@ import java.util.Objects; import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.fjrcloud.community.framework.common.util.servlet.ServletUtils.getClientIP; import static com.fjrcloud.community.framework.web.core.util.WebFrameworkUtils.getTerminal; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.*; +import static com.fjrcloud.community.module.community.enums.MemberErrorCodeConstants.*; /** * 会员的认证 Service 实现类 diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/house/HouseServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/house/HouseServiceImpl.java index 55bbc38..99fb7aa 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/house/HouseServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/house/HouseServiceImpl.java @@ -14,10 +14,10 @@ import com.fjrcloud.community.module.community.controller.admin.house.vo.HouseSa import com.fjrcloud.community.module.community.controller.app.house.vo.HouseTreeNodeVO; import com.fjrcloud.community.module.community.dal.dataobject.community.CommunityDO; import com.fjrcloud.community.module.community.dal.dataobject.house.HouseDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; import com.fjrcloud.community.module.community.dal.mysql.community.CommunityMapper; import com.fjrcloud.community.module.community.dal.mysql.house.HouseMapper; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.mysql.user.MemberUserMapper; +import com.fjrcloud.community.module.community.dal.mysql.user.MemberUserMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java index 2a6bca3..9b714d6 100644 --- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java @@ -14,11 +14,11 @@ import com.fjrcloud.community.module.community.controller.admin.memberhouse.vo.M import com.fjrcloud.community.module.community.controller.app.memberhouse.vo.*; import com.fjrcloud.community.module.community.dal.dataobject.community.CommunityDO; import com.fjrcloud.community.module.community.dal.dataobject.memberhouse.MemberHouseDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; import com.fjrcloud.community.module.community.dal.mysql.memberhouse.MemberHouseMapper; import com.fjrcloud.community.module.community.service.community.CommunityService; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import com.fjrcloud.community.module.member.service.user.MemberUserTenantRelService; +import com.fjrcloud.community.module.community.service.user.MemberUserService; +import com.fjrcloud.community.module.community.service.user.MemberUserTenantRelService; import com.fjrcloud.community.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO; import com.fjrcloud.community.module.system.service.oauth2.OAuth2TokenService; import lombok.extern.slf4j.Slf4j; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.fjrcloud.community.module.community.enums.ErrorCodeConstants.*; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.USER_MOBILE_NOT_EXISTS; +import static com.fjrcloud.community.module.community.enums.MemberErrorCodeConstants.USER_MOBILE_NOT_EXISTS; import static com.fjrcloud.community.module.system.enums.oauth2.OAuth2ClientConstants.CLIENT_ID_DEFAULT; /** @@ -215,31 +215,7 @@ public class MemberHouseServiceImpl implements MemberHouseService { return CollUtil.newArrayList(); } - // 2. 按照小区+房屋进行分组，每个房屋只保留最新的一条记录 - return houseList.stream() - .collect(Collectors.groupingBy( - house -> house.getCommunityId() + "_" + house.getBuildingNo() + "_" + house.getUnitNo() + "_" + house.getRoomNo(), - Collectors.maxBy((h1, h2) -> { - // 优先按状态排序：已认证(1) > 待审核(0) > 驳回(2) - int statusCompare = compareStatus(h1.getStatus(), h2.getStatus()); - if (statusCompare != 0) { - return statusCompare; - } - // 状态相同则按ID降序 - return h1.getId().compareTo(h2.getId()); - }) - )) - .values().stream() - .filter(java.util.Optional::isPresent) - .map(java.util.Optional::get) - .map(house -> { - AppMemberHouseRespVO respVO = BeanUtils.toBean(house, AppMemberHouseRespVO.class); - // 查询该房屋的关联人员数量（只统计已认证的） - List relationList = memberHouseMapper.selectListByHouseId(house.getHouseId()); - respVO.setRelationCount(relationList.size()); - return respVO; - }) - .collect(Collectors.toList()); + return BeanUtils.toBean(houseList, AppMemberHouseRespVO.class); } @Override diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserService.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserService.java similarity index 92% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserService.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserService.java index 163ab6d..43a3d56 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserService.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserService.java @@ -1,12 +1,12 @@ -package com.fjrcloud.community.module.member.service.user; +package com.fjrcloud.community.module.community.service.user; import com.fjrcloud.community.framework.common.enums.TerminalEnum; import com.fjrcloud.community.framework.common.pojo.PageResult; import com.fjrcloud.community.framework.common.validation.Mobile; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.fjrcloud.community.module.member.controller.app.user.vo.*; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserPageReqVO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.fjrcloud.community.module.community.controller.app.user.vo.*; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; import javax.validation.Valid; import java.util.Collection; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java similarity index 90% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserServiceImpl.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java index 17fdce8..de29c99 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.fjrcloud.community.module.member.service.user; +package com.fjrcloud.community.module.community.service.user; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; @@ -12,14 +12,12 @@ import com.fjrcloud.community.framework.common.enums.UserTypeEnum; import com.fjrcloud.community.framework.common.pojo.PageResult; import com.fjrcloud.community.framework.common.util.object.BeanUtils; import com.fjrcloud.community.framework.tenant.core.context.TenantContextHolder; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.fjrcloud.community.module.member.controller.app.user.vo.*; -import com.fjrcloud.community.module.member.convert.auth.AuthConvert; -import com.fjrcloud.community.module.member.convert.user.MemberUserConvert; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.mysql.user.MemberUserMapper; -import com.fjrcloud.community.module.member.mq.producer.user.MemberUserProducer; +import com.fjrcloud.community.module.community.auth.AuthConvert; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserPageReqVO; +import com.fjrcloud.community.module.community.controller.admin.user.vo.MemberUserUpdateReqVO; +import com.fjrcloud.community.module.community.controller.app.user.vo.*; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserDO; +import com.fjrcloud.community.module.community.dal.mysql.user.MemberUserMapper; import com.fjrcloud.community.module.system.api.sms.SmsCodeApi; import com.fjrcloud.community.module.system.api.sms.dto.code.SmsCodeUseReqDTO; import com.fjrcloud.community.module.system.api.social.SocialClientApi; @@ -30,8 +28,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationManager; import javax.annotation.Resource; import javax.validation.Valid; @@ -42,7 +38,7 @@ import java.util.List; import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.fjrcloud.community.framework.common.util.servlet.ServletUtils.getClientIP; import static com.fjrcloud.community.framework.tenant.core.security.TenantSecurityWebFilter.SYSTEM_TENANT_ID; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.*; +import static com.fjrcloud.community.module.community.enums.MemberErrorCodeConstants.*; /** * 会员 User Service 实现类 @@ -66,9 +62,6 @@ public class MemberUserServiceImpl implements MemberUserService { @Resource private PasswordEncoder passwordEncoder; - @Resource - private MemberUserProducer memberUserProducer; - @Resource private MemberUserTenantRelService userTenantRelService; @@ -127,18 +120,8 @@ public class MemberUserServiceImpl implements MemberUserService { if (StrUtil.isEmpty(nickname)) { user.setNickname("用户" + RandomUtil.randomNumbers(6)); } - // 插入数据库 memberUserMapper.insert(user); - - // 发送 MQ 消息：用户创建 - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - memberUserProducer.sendUserCreateMessage(user.getId()); - } - }); - return user; } @@ -270,7 +253,7 @@ public class MemberUserServiceImpl implements MemberUserService { validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile()); // 更新用户信息 - MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO); + MemberUserDO updateObj = BeanUtils.toBean(updateReqVO, MemberUserDO.class); memberUserMapper.updateById(updateObj); } diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelService.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelService.java similarity index 89% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelService.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelService.java index aad7cdb..7fb15de 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelService.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelService.java @@ -1,6 +1,6 @@ -package com.fjrcloud.community.module.member.service.user; +package com.fjrcloud.community.module.community.service.user; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserTenantRelDO; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserTenantRelDO; import java.util.List; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelServiceImpl.java similarity index 94% rename from fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelServiceImpl.java rename to fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelServiceImpl.java index 430e236..3cf9b9d 100644 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/user/MemberUserTenantRelServiceImpl.java +++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserTenantRelServiceImpl.java @@ -1,8 +1,8 @@ -package com.fjrcloud.community.module.member.service.user; +package com.fjrcloud.community.module.community.service.user; import cn.hutool.core.collection.CollUtil; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserTenantRelDO; -import com.fjrcloud.community.module.member.dal.mysql.user.MemberUserTenantRelMapper; +import com.fjrcloud.community.module.community.dal.dataobject.user.MemberUserTenantRelDO; +import com.fjrcloud.community.module.community.dal.mysql.user.MemberUserTenantRelMapper; import com.fjrcloud.community.module.system.dal.dataobject.tenant.TenantDO; import com.fjrcloud.community.module.system.dal.mysql.tenant.TenantMapper; import lombok.extern.slf4j.Slf4j; diff --git a/fjrcloud-module-member/pom.xml b/fjrcloud-module-member/pom.xml deleted file mode 100644 index 6fdd246..0000000 --- a/fjrcloud-module-member/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - com.fjrcloud.boot - fjrcloud-community - ${revision} - - 4.0.0 - fjrcloud-module-member - jar - - ${project.artifactId} - - member 模块，我们放会员业务。 - 例如说：会员中心等等 - - - - - com.fjrcloud.boot - fjrcloud-module-system - ${revision} - - - com.fjrcloud.boot - fjrcloud-module-infra - ${revision} - - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-biz-tenant - - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-mybatis - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-redis - - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-mq - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-excel - - - - com.fjrcloud.boot - fjrcloud-spring-boot-starter-biz-ip - - - - - diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApi.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApi.java deleted file mode 100644 index 972d4c8..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApi.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fjrcloud.community.module.member.api.address; - -import com.fjrcloud.community.module.member.api.address.dto.MemberAddressRespDTO; - -/** - * 用户收件地址 API 接口 - * - * @author 芋道源码 - */ -public interface MemberAddressApi { - - /** - * 获得用户收件地址 - * - * @param id 收件地址编号 - * @param userId 用户编号 - * @return 用户收件地址 - */ - MemberAddressRespDTO getAddress(Long id, Long userId); - - /** - * 获得用户默认收件地址 - * - * @param userId 用户编号 - * @return 用户收件地址 - */ - MemberAddressRespDTO getDefaultAddress(Long userId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApiImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApiImpl.java deleted file mode 100644 index 4734a16..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/MemberAddressApiImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fjrcloud.community.module.member.api.address; - -import com.fjrcloud.community.module.member.api.address.dto.MemberAddressRespDTO; -import com.fjrcloud.community.module.member.convert.address.AddressConvert; -import com.fjrcloud.community.module.member.service.address.AddressService; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -/** - * 用户收件地址 API 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MemberAddressApiImpl implements MemberAddressApi { - - @Resource - private AddressService addressService; - - @Override - public MemberAddressRespDTO getAddress(Long id, Long userId) { - return AddressConvert.INSTANCE.convert02(addressService.getAddress(userId, id)); - } - - @Override - public MemberAddressRespDTO getDefaultAddress(Long userId) { - return AddressConvert.INSTANCE.convert02(addressService.getDefaultUserAddress(userId)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/dto/MemberAddressRespDTO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/dto/MemberAddressRespDTO.java deleted file mode 100644 index a348b79..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/address/dto/MemberAddressRespDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.fjrcloud.community.module.member.api.address.dto; - -import lombok.Data; - -/** - * 用户收件地址 Response DTO - * - * @author 芋道源码 - */ -@Data -public class MemberAddressRespDTO { - - /** - * 编号 - */ - private Long id; - /** - * 用户编号 - */ - private Long userId; - /** - * 收件人名称 - */ - private String name; - /** - * 手机号 - */ - private String mobile; - /** - * 地区编号 - */ - private Integer areaId; - /** - * 收件详细地址 - */ - private String detailAddress; - /** - * 是否默认 - */ - private Boolean defaultStatus; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApi.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApi.java deleted file mode 100644 index 7798173..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApi.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fjrcloud.community.module.member.api.config; - -import com.fjrcloud.community.module.member.api.config.dto.MemberConfigRespDTO; - -/** - * 用户配置 API 接口 - * - * @author owen - */ -public interface MemberConfigApi { - - /** - * 获得积分配置 - * - * @return 积分配置 - */ - MemberConfigRespDTO getConfig(); -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApiImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApiImpl.java deleted file mode 100644 index 606832d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/MemberConfigApiImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fjrcloud.community.module.member.api.config; - -import com.fjrcloud.community.module.member.api.config.dto.MemberConfigRespDTO; -import com.fjrcloud.community.module.member.convert.config.MemberConfigConvert; -import com.fjrcloud.community.module.member.service.config.MemberConfigService; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -/** - * 用户配置 API 实现类 - * - * @author owen - */ -@Service -@Validated -public class MemberConfigApiImpl implements MemberConfigApi { - - @Resource - private MemberConfigService memberConfigService; - - @Override - public MemberConfigRespDTO getConfig() { - return MemberConfigConvert.INSTANCE.convert01(memberConfigService.getConfig()); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/dto/MemberConfigRespDTO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/dto/MemberConfigRespDTO.java deleted file mode 100644 index 2478218..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/config/dto/MemberConfigRespDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.fjrcloud.community.module.member.api.config.dto; - -import lombok.Data; - -/** - * 用户信息 Response DTO - * - * @author 芋道源码 - */ -@Data -public class MemberConfigRespDTO { - - /** - * 积分抵扣开关 - */ - private Boolean pointTradeDeductEnable; - /** - * 积分抵扣，单位：分 - *

- * 1 积分抵扣多少分 - */ - private Integer pointTradeDeductUnitPrice; - /** - * 积分抵扣最大值 - */ - private Integer pointTradeDeductMaxPrice; - /** - * 1 元赠送多少分 - */ - private Integer pointTradeGivePoint; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApi.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApi.java deleted file mode 100644 index 51f0aa3..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.fjrcloud.community.module.member.api.level; - -import com.fjrcloud.community.module.member.api.level.dto.MemberLevelRespDTO; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; - -/** - * 会员等级 API 接口 - * - * @author owen - */ -public interface MemberLevelApi { - - /** - * 获得会员等级 - * - * @param id 会员等级编号 - * @return 会员等级 - */ - MemberLevelRespDTO getMemberLevel(Long id); - - /** - * 增加会员经验 - * - * @param userId 会员ID - * @param experience 经验 - * @param bizType 业务类型 {@link MemberExperienceBizTypeEnum} - * @param bizId 业务编号 - */ - void addExperience(Long userId, Integer experience, Integer bizType, String bizId); - - /** - * 扣减会员经验 - * - * @param userId 会员ID - * @param experience 经验 - * @param bizType 业务类型 {@link MemberExperienceBizTypeEnum} - * @param bizId 业务编号 - */ - void reduceExperience(Long userId, Integer experience, Integer bizType, String bizId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApiImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApiImpl.java deleted file mode 100644 index c0d4bbd..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/MemberLevelApiImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.fjrcloud.community.module.member.api.level; - -import com.fjrcloud.community.module.member.api.level.dto.MemberLevelRespDTO; -import com.fjrcloud.community.module.member.convert.level.MemberLevelConvert; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; -import com.fjrcloud.community.module.member.service.level.MemberLevelService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.EXPERIENCE_BIZ_NOT_SUPPORT; - -/** - * 会员等级 API 实现类 - * - * @author owen - */ -@Slf4j -@Service -@Validated -public class MemberLevelApiImpl implements MemberLevelApi { - - @Resource - private MemberLevelService memberLevelService; - - @Override - public MemberLevelRespDTO getMemberLevel(Long id) { - return MemberLevelConvert.INSTANCE.convert02(memberLevelService.getLevel(id)); - } - - @Override - public void addExperience(Long userId, Integer experience, Integer bizType, String bizId) { - MemberExperienceBizTypeEnum bizTypeEnum = MemberExperienceBizTypeEnum.getByType(bizType); - if (bizTypeEnum == null) { - throw exception(EXPERIENCE_BIZ_NOT_SUPPORT); - } - memberLevelService.addExperience(userId, experience, bizTypeEnum, bizId); - } - - @Override - public void reduceExperience(Long userId, Integer experience, Integer bizType, String bizId) { - addExperience(userId, -experience, bizType, bizId); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/dto/MemberLevelRespDTO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/dto/MemberLevelRespDTO.java deleted file mode 100644 index 3f3bcbf..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/level/dto/MemberLevelRespDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.fjrcloud.community.module.member.api.level.dto; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import lombok.Data; - -/** - * 会员等级 Resp DTO - * - * @author 芋道源码 - */ -@Data -public class MemberLevelRespDTO { - - /** - * 编号 - */ - private Long id; - /** - * 等级名称 - */ - private String name; - /** - * 等级 - */ - private Integer level; - /** - * 升级经验 - */ - private Integer experience; - /** - * 享受折扣 - */ - private Integer discountPercent; - /** - * 状态 - * - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/package-info.java deleted file mode 100644 index 9d504f5..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package com.fjrcloud.community.module.member.api.message; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/user/MemberUserCreateMessage.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/user/MemberUserCreateMessage.java deleted file mode 100644 index a1754c6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/message/user/MemberUserCreateMessage.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fjrcloud.community.module.member.api.message.user; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 会员用户创建消息 - * - * @author owen - */ -@Data -public class MemberUserCreateMessage { - - /** - * 用户编号 - */ - @NotNull(message = "用户编号不能为空") - private Long userId; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/package-info.java deleted file mode 100644 index b902324..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * member API 包，定义并实现提供给其它模块的 API - */ -package com.fjrcloud.community.module.member.api; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApi.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApi.java deleted file mode 100644 index 8de5273..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApi.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fjrcloud.community.module.member.api.point; - -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; - -import javax.validation.constraints.Min; - -/** - * 用户积分的 API 接口 - * - * @author owen - */ -public interface MemberPointApi { - - /** - * 增加用户积分 - * - * @param userId 用户编号 - * @param point 积分 - * @param bizType 业务类型 {@link MemberPointBizTypeEnum} - * @param bizId 业务编号 - */ - void addPoint(Long userId, @Min(value = 1L, message = "积分必须是正数") Integer point, - Integer bizType, String bizId); - - /** - * 减少用户积分 - * - * @param userId 用户编号 - * @param point 积分 - * @param bizType 业务类型 {@link MemberPointBizTypeEnum} - * @param bizId 业务编号 - */ - void reducePoint(Long userId, @Min(value = 1L, message = "积分必须是正数") Integer point, - Integer bizType, String bizId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApiImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApiImpl.java deleted file mode 100644 index 0a0e692..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/point/MemberPointApiImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.fjrcloud.community.module.member.api.point; - -import cn.hutool.core.lang.Assert; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; -import com.fjrcloud.community.module.member.service.point.MemberPointRecordService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.POINT_RECORD_BIZ_NOT_SUPPORT; - -/** - * 用户积分的 API 实现类 - * - * @author owen - */ -@Slf4j -@Service -@Validated -public class MemberPointApiImpl implements MemberPointApi { - - @Resource - private MemberPointRecordService memberPointRecordService; - - @Override - public void addPoint(Long userId, Integer point, Integer bizType, String bizId) { - Assert.isTrue(point > 0); - MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType); - if (bizTypeEnum == null) { - log.error("[addPoint][userId({}) point({}) bizType({}) bizId({}) {}]", userId, point, bizType, bizId, - POINT_RECORD_BIZ_NOT_SUPPORT); - return; - } - memberPointRecordService.createPointRecord(userId, point, bizTypeEnum, bizId); - } - - @Override - public void reducePoint(Long userId, Integer point, Integer bizType, String bizId) { - Assert.isTrue(point > 0); - MemberPointBizTypeEnum bizTypeEnum = MemberPointBizTypeEnum.getByType(bizType); - if (bizTypeEnum == null) { - throw exception(POINT_RECORD_BIZ_NOT_SUPPORT); - } - memberPointRecordService.createPointRecord(userId, -point, bizTypeEnum, bizId); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApi.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApi.java deleted file mode 100644 index a6bfcfd..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApi.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.fjrcloud.community.module.member.api.user; - -import com.fjrcloud.community.module.member.api.user.dto.MemberUserRespDTO; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertMap; - -/** - * 会员用户的 API 接口 - * - * @author 芋道源码 - */ -public interface MemberUserApi { - - /** - * 获得会员用户信息 - * - * @param id 用户编号 - * @return 用户信息 - */ - MemberUserRespDTO getUser(Long id); - - /** - * 获得会员用户信息们 - * - * @param ids 用户编号的数组 - * @return 用户信息们 - */ - List getUserList(Collection ids); - - /** - * 获得会员用户 Map - * - * @param ids 用户编号的数组 - * @return 会员用户 Map - */ - default Map getUserMap(Collection ids) { - List list = getUserList(ids); - return convertMap(list, MemberUserRespDTO::getId); - } - - /** - * 基于用户昵称，模糊匹配用户列表 - * - * @param nickname 用户昵称，模糊匹配 - * @return 用户信息的列表 - */ - List getUserListByNickname(String nickname); - - /** - * 基于手机号，精准匹配用户 - * - * @param mobile 手机号 - * @return 用户信息 - */ - MemberUserRespDTO getUserByMobile(String mobile); - - /** - * 校验用户是否存在 - * - * @param id 用户编号 - */ - void validateUser(Long id); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApiImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApiImpl.java deleted file mode 100644 index d241155..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/MemberUserApiImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.fjrcloud.community.module.member.api.user; - -import com.fjrcloud.community.module.member.api.user.dto.MemberUserRespDTO; -import com.fjrcloud.community.module.member.convert.user.MemberUserConvert; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.USER_MOBILE_NOT_EXISTS; - -/** - * 会员用户的 API 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MemberUserApiImpl implements MemberUserApi { - - @Resource - private MemberUserService userService; - - @Override - public MemberUserRespDTO getUser(Long id) { - MemberUserDO user = userService.getUser(id); - return MemberUserConvert.INSTANCE.convert2(user); - } - - @Override - public List getUserList(Collection ids) { - return MemberUserConvert.INSTANCE.convertList2(userService.getUserList(ids)); - } - - @Override - public List getUserListByNickname(String nickname) { - return MemberUserConvert.INSTANCE.convertList2(userService.getUserListByNickname(nickname)); - } - - @Override - public MemberUserRespDTO getUserByMobile(String mobile) { - return MemberUserConvert.INSTANCE.convert2(userService.getUserByMobile(mobile)); - } - - @Override - public void validateUser(Long id) { - MemberUserDO user = userService.getUser(id); - if (user == null) { - throw exception(USER_MOBILE_NOT_EXISTS); - } - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/dto/MemberUserRespDTO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/dto/MemberUserRespDTO.java deleted file mode 100644 index dbb841f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/api/user/dto/MemberUserRespDTO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.fjrcloud.community.module.member.api.user.dto; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 用户信息 Response DTO - * - * @author 芋道源码 - */ -@Data -public class MemberUserRespDTO { - - /** - * 用户ID - */ - private Long id; - /** - * 用户昵称 - */ - private String nickname; - /** - * 帐号状态 - * - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - /** - * 用户头像 - */ - private String avatar; - /** - * 手机 - */ - private String mobile; - /** - * 创建时间（注册时间） - */ - private LocalDateTime createTime; - - // ========== 其它信息 ========== - - /** - * 会员级别编号 - */ - private Long levelId; - - /** - * 积分 - */ - private Integer point; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/AddressController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/AddressController.java deleted file mode 100644 index 52adf81..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/AddressController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.address; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.admin.address.vo.AddressRespVO; -import com.fjrcloud.community.module.member.convert.address.AddressConvert; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; -import com.fjrcloud.community.module.member.service.address.AddressService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 用户收件地址") -@RestController -@RequestMapping("/member/address") -@Validated -public class AddressController { - - @Resource - private AddressService addressService; - - @GetMapping("/list") - @Operation(summary = "获得用户收件地址列表") - @Parameter(name = "userId", description = "用户编号", required = true) - @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult> getAddressList(@RequestParam("userId") Long userId) { - List list = addressService.getAddressList(userId); - return success(AddressConvert.INSTANCE.convertList2(list)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/package-info.java deleted file mode 100644 index eddaa67..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.address; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressBaseVO.java deleted file mode 100644 index 68435dd..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressBaseVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.address.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class AddressBaseVO { - - @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") - @NotNull(message = "收件人名称不能为空") - private String name; - - @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "手机号不能为空") - private String mobile; - - @Schema(description = "地区编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "15716") - @NotNull(message = "地区编码不能为空") - private Long areaId; - - @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "收件详细地址不能为空") - private String detailAddress; - - @Schema(description = "是否默认", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "是否默认不能为空") - private Boolean defaultStatus; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressRespVO.java deleted file mode 100644 index d8956e2..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/address/vo/AddressRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.address.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 用户收件地址 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AddressRespVO extends AddressBaseVO { - - @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/MemberConfigController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/MemberConfigController.java deleted file mode 100644 index 007748f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/MemberConfigController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.config; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigRespVO; -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigSaveReqVO; -import com.fjrcloud.community.module.member.convert.config.MemberConfigConvert; -import com.fjrcloud.community.module.member.dal.dataobject.config.MemberConfigDO; -import com.fjrcloud.community.module.member.service.config.MemberConfigService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 会员设置") -@RestController -@RequestMapping("/member/config") -@Validated -public class MemberConfigController { - - @Resource - private MemberConfigService memberConfigService; - - @PutMapping("/save") - @Operation(summary = "保存会员配置") - @PreAuthorize("@ss.hasPermission('member:config:save')") - public CommonResult saveConfig(@Valid @RequestBody MemberConfigSaveReqVO saveReqVO) { - memberConfigService.saveConfig(saveReqVO); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得会员配置") - @PreAuthorize("@ss.hasPermission('member:config:query')") - public CommonResult getConfig() { - MemberConfigDO config = memberConfigService.getConfig(); - return success(MemberConfigConvert.INSTANCE.convert(config)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigBaseVO.java deleted file mode 100644 index 30c3d24..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigBaseVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.config.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 会员配置 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberConfigBaseVO { - - @Schema(description = "积分抵扣开关", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - @NotNull(message = "积分抵扣开发不能为空") - private Boolean pointTradeDeductEnable; - - @Schema(description = "积分抵扣，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "13506") - @NotNull(message = "积分抵扣不能为空") - private Integer pointTradeDeductUnitPrice; - - @Schema(description = "积分抵扣最大值", requiredMode = Schema.RequiredMode.REQUIRED, example = "32428") - @NotNull(message = "积分抵扣最大值不能为空") - private Integer pointTradeDeductMaxPrice; - - @Schema(description = "1 元赠送多少分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - @NotNull(message = "1 元赠送积分不能为空") - private Integer pointTradeGivePoint; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigRespVO.java deleted file mode 100644 index feefa96..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigRespVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.config.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员配置 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberConfigRespVO extends MemberConfigBaseVO { - - @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java deleted file mode 100644 index c8bf18b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/config/vo/MemberConfigSaveReqVO.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.config.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员配置保存 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberConfigSaveReqVO extends MemberConfigBaseVO { -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/MemberGroupController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/MemberGroupController.java deleted file mode 100644 index ffde471..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/MemberGroupController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.group.vo.*; -import com.fjrcloud.community.module.member.convert.group.MemberGroupConvert; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import com.fjrcloud.community.module.member.service.group.MemberGroupService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - - -@Tag(name = "管理后台 - 用户分组") -@RestController -@RequestMapping("/member/group") -@Validated -public class MemberGroupController { - - @Resource - private MemberGroupService groupService; - - @PostMapping("/create") - @Operation(summary = "创建用户分组") - @PreAuthorize("@ss.hasPermission('member:group:create')") - public CommonResult createGroup(@Valid @RequestBody MemberGroupCreateReqVO createReqVO) { - return success(groupService.createGroup(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新用户分组") - @PreAuthorize("@ss.hasPermission('member:group:update')") - public CommonResult updateGroup(@Valid @RequestBody MemberGroupUpdateReqVO updateReqVO) { - groupService.updateGroup(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除用户分组") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('member:group:delete')") - public CommonResult deleteGroup(@RequestParam("id") Long id) { - groupService.deleteGroup(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得用户分组") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:group:query')") - public CommonResult getGroup(@RequestParam("id") Long id) { - MemberGroupDO group = groupService.getGroup(id); - return success(MemberGroupConvert.INSTANCE.convert(group)); - } - - @GetMapping("/list-all-simple") - @Operation(summary = "获取会员分组精简信息列表", description = "只包含被开启的会员分组，主要用于前端的下拉选项") - public CommonResult> getSimpleGroupList() { - // 获用户列表，只要开启状态的 - List list = groupService.getEnableGroupList(); - return success(MemberGroupConvert.INSTANCE.convertSimpleList(list)); - } - - @GetMapping("/page") - @Operation(summary = "获得用户分组分页") - @PreAuthorize("@ss.hasPermission('member:group:query')") - public CommonResult> getGroupPage(@Valid MemberGroupPageReqVO pageVO) { - PageResult pageResult = groupService.getGroupPage(pageVO); - return success(MemberGroupConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupBaseVO.java deleted file mode 100644 index 8fa36f6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupBaseVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.validation.InEnum; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 用户分组 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberGroupBaseVO { - - @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "购物达人") - @NotNull(message = "名称不能为空") - private String name; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") - private String remark; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "状态不能为空") - @InEnum(CommonStatusEnum.class) - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java deleted file mode 100644 index 477da71..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 用户分组创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberGroupCreateReqVO extends MemberGroupBaseVO { - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java deleted file mode 100644 index 94c14e9..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 用户分组分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberGroupPageReqVO extends PageParam { - - @Schema(description = "名称", example = "购物达人") - private String name; - - @Schema(description = "状态", example = "1") - private Integer status; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupRespVO.java deleted file mode 100644 index 1e43427..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 用户分组 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberGroupRespVO extends MemberGroupBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java deleted file mode 100644 index 0834451..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupSimpleRespVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 用户分组 Response VO") -@Data -@ToString(callSuper = true) -public class MemberGroupSimpleRespVO { - - @Schema(description = "编号", example = "6103") - private Long id; - - @Schema(description = "等级名称", example = "芋艿") - private String name; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java deleted file mode 100644 index 9ff7acd..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/group/vo/MemberGroupUpdateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.group.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 用户分组更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberGroupUpdateReqVO extends MemberGroupBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20357") - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberExperienceRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberExperienceRecordController.java deleted file mode 100644 index e95449f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberExperienceRecordController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO; -import com.fjrcloud.community.module.member.convert.level.MemberExperienceRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import com.fjrcloud.community.module.member.service.level.MemberExperienceRecordService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 会员经验记录") -@RestController -@RequestMapping("/member/experience-record") -@Validated -public class MemberExperienceRecordController { - - @Resource - private MemberExperienceRecordService experienceLogService; - - @GetMapping("/get") - @Operation(summary = "获得会员经验记录") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:experience-record:query')") - public CommonResult getExperienceRecord(@RequestParam("id") Long id) { - MemberExperienceRecordDO experienceLog = experienceLogService.getExperienceRecord(id); - return success(MemberExperienceRecordConvert.INSTANCE.convert(experienceLog)); - } - - @GetMapping("/page") - @Operation(summary = "获得会员经验记录分页") - @PreAuthorize("@ss.hasPermission('member:experience-record:query')") - public CommonResult> getExperienceRecordPage( - @Valid MemberExperienceRecordPageReqVO pageVO) { - PageResult pageResult = experienceLogService.getExperienceRecordPage(pageVO); - return success(MemberExperienceRecordConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelController.java deleted file mode 100644 index 58c9477..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelController.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.*; -import com.fjrcloud.community.module.member.convert.level.MemberLevelConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.service.level.MemberLevelService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 会员等级") -@RestController -@RequestMapping("/member/level") -@Validated -public class MemberLevelController { - - @Resource - private MemberLevelService levelService; - - @PostMapping("/create") - @Operation(summary = "创建会员等级") - @PreAuthorize("@ss.hasPermission('member:level:create')") - public CommonResult createLevel(@Valid @RequestBody MemberLevelCreateReqVO createReqVO) { - return success(levelService.createLevel(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新会员等级") - @PreAuthorize("@ss.hasPermission('member:level:update')") - public CommonResult updateLevel(@Valid @RequestBody MemberLevelUpdateReqVO updateReqVO) { - levelService.updateLevel(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除会员等级") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('member:level:delete')") - public CommonResult deleteLevel(@RequestParam("id") Long id) { - levelService.deleteLevel(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得会员等级") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:level:query')") - public CommonResult getLevel(@RequestParam("id") Long id) { - MemberLevelDO level = levelService.getLevel(id); - return success(MemberLevelConvert.INSTANCE.convert(level)); - } - - @GetMapping("/list-all-simple") - @Operation(summary = "获取会员等级精简信息列表", description = "只包含被开启的会员等级，主要用于前端的下拉选项") - public CommonResult> getSimpleLevelList() { - // 获用户列表，只要开启状态的 - List list = levelService.getEnableLevelList(); - // 排序后，返回给前端 - return success(MemberLevelConvert.INSTANCE.convertSimpleList(list)); - } - - @GetMapping("/list") - @Operation(summary = "获得会员等级列表") - @PreAuthorize("@ss.hasPermission('member:level:query')") - public CommonResult> getLevelList(@Valid MemberLevelListReqVO listReqVO) { - List result = levelService.getLevelList(listReqVO); - return success(MemberLevelConvert.INSTANCE.convertList(result)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelRecordController.java deleted file mode 100644 index ca601b7..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/MemberLevelRecordController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO; -import com.fjrcloud.community.module.member.convert.level.MemberLevelRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; -import com.fjrcloud.community.module.member.service.level.MemberLevelRecordService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 会员等级记录") -@RestController -@RequestMapping("/member/level-record") -@Validated -public class MemberLevelRecordController { - - @Resource - private MemberLevelRecordService levelLogService; - - @GetMapping("/get") - @Operation(summary = "获得会员等级记录") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:level-record:query')") - public CommonResult getLevelRecord(@RequestParam("id") Long id) { - MemberLevelRecordDO levelLog = levelLogService.getLevelRecord(id); - return success(MemberLevelRecordConvert.INSTANCE.convert(levelLog)); - } - - @GetMapping("/page") - @Operation(summary = "获得会员等级记录分页") - @PreAuthorize("@ss.hasPermission('member:level-record:query')") - public CommonResult> getLevelRecordPage( - @Valid MemberLevelRecordPageReqVO pageVO) { - PageResult pageResult = levelLogService.getLevelRecordPage(pageVO); - return success(MemberLevelRecordConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java deleted file mode 100644 index 8e01284..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordBaseVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.experience; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 会员经验记录 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberExperienceRecordBaseVO { - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "3638") - @NotNull(message = "用户编号不能为空") - private Long userId; - - @Schema(description = "业务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12164") - @NotNull(message = "业务编号不能为空") - private String bizId; - - @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "业务类型不能为空") - private Integer bizType; - - @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验") - @NotNull(message = "标题不能为空") - private String title; - - @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - @NotNull(message = "经验不能为空") - private Integer experience; - - @Schema(description = "变更后的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") - @NotNull(message = "变更后的经验不能为空") - private Integer totalExperience; - - @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验") - @NotNull(message = "描述不能为空") - private String description; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java deleted file mode 100644 index 2d1d9b2..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordPageReqVO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.experience; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 会员经验记录分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberExperienceRecordPageReqVO extends PageParam { - - @Schema(description = "用户编号", example = "3638") - private Long userId; - - @Schema(description = "业务编号", example = "12164") - private String bizId; - - @Schema(description = "业务类型", example = "1") - private Integer bizType; - - @Schema(description = "标题", example = "增加经验") - private String title; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java deleted file mode 100644 index 5b7ec1f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/experience/MemberExperienceRecordRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.experience; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 会员经验记录 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberExperienceRecordRespVO extends MemberExperienceRecordBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java deleted file mode 100644 index 6ec3316..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.validation.InEnum; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.hibernate.validator.constraints.Range; -import org.hibernate.validator.constraints.URL; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; - -/** - * 会员等级 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberLevelBaseVO { - - @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotBlank(message = "等级名称不能为空") - private String name; - - @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - @NotNull(message = "升级经验不能为空") - @Positive(message = "升级经验必须大于 0") - private Integer experience; - - @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "等级不能为空") - @Positive(message = "等级必须大于 0") - private Integer level; - - @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98") - @NotNull(message = "享受折扣不能为空") - @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100") - private Integer discountPercent; - - @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") - @URL(message = "等级图标必须是 URL 格式") - private String icon; - - @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg") - @URL(message = "等级背景图必须是 URL 格式") - private String backgroundUrl; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "状态不能为空") - @InEnum(CommonStatusEnum.class) - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java deleted file mode 100644 index 389809b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员等级创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberLevelCreateReqVO extends MemberLevelBaseVO { - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java deleted file mode 100644 index 85b18cb..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelListReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员等级列表筛选 Request VO") -@Data -@ToString(callSuper = true) -public class MemberLevelListReqVO { - - @Schema(description = "等级名称", example = "芋艿") - private String name; - - @Schema(description = "状态", example = "1") - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java deleted file mode 100644 index 0c093f7..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 会员等级 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberLevelRespVO extends MemberLevelBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java deleted file mode 100644 index 261eff1..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员等级 Response VO") -@Data -@ToString(callSuper = true) -public class MemberLevelSimpleRespVO { - - @Schema(description = "编号", example = "6103") - private Long id; - - @Schema(description = "等级名称", example = "芋艿") - private String name; - - @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") - private String icon; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java deleted file mode 100644 index e3b00be..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 会员等级更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberLevelUpdateReqVO extends MemberLevelBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6103") - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java deleted file mode 100644 index ac630e0..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordBaseVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.record; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 会员等级记录 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberLevelRecordBaseVO { - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25923") - @NotNull(message = "用户编号不能为空") - private Long userId; - - @Schema(description = "等级编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "25985") - @NotNull(message = "等级编号不能为空") - private Long levelId; - - @Schema(description = "会员等级", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "会员等级不能为空") - private Integer level; - - @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") - @NotNull(message = "享受折扣不能为空") - private Integer discountPercent; - - @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") - @NotNull(message = "升级经验不能为空") - private Integer experience; - - @Schema(description = "会员此时的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "13319") - @NotNull(message = "会员此时的经验不能为空") - private Integer userExperience; - - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "推广需要") - @NotNull(message = "备注不能为空") - private String remark; - - @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "升级为金牌会员") - @NotNull(message = "描述不能为空") - private String description; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java deleted file mode 100644 index 03a13a2..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordPageReqVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.record; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 会员等级记录分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberLevelRecordPageReqVO extends PageParam { - - @Schema(description = "用户编号", example = "25923") - private Long userId; - - @Schema(description = "等级编号", example = "25985") - private Long levelId; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java deleted file mode 100644 index 6e97cb5..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/level/vo/record/MemberLevelRecordRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.level.vo.record; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 会员等级记录 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberLevelRecordRespVO extends MemberLevelRecordBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8741") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/MemberPointRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/MemberPointRecordController.java deleted file mode 100644 index 4ad3c48..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/MemberPointRecordController.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.point; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO; -import com.fjrcloud.community.module.member.convert.point.MemberPointRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.service.point.MemberPointRecordService; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertSet; - -@Tag(name = "管理后台 - 签到记录") -@RestController -@RequestMapping("/member/point/record") -@Validated -public class MemberPointRecordController { - - @Resource - private MemberPointRecordService pointRecordService; - - @Resource - private MemberUserService memberUserService; - - @GetMapping("/page") - @Operation(summary = "获得用户积分记录分页") - @PreAuthorize("@ss.hasPermission('point:record:query')") - public CommonResult> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) { - // 执行分页查询 - PageResult pageResult = pointRecordService.getPointRecordPage(pageVO); - if (CollectionUtils.isEmpty(pageResult.getList())) { - return success(PageResult.empty(pageResult.getTotal())); - } - - // 拼接结果返回 - List users = memberUserService.getUserList( - convertSet(pageResult.getList(), MemberPointRecordDO::getUserId)); - return success(MemberPointRecordConvert.INSTANCE.convertPage(pageResult, users)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java deleted file mode 100644 index cd20983..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.point.vo.recrod; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 用户积分记录分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberPointRecordPageReqVO extends PageParam { - - @Schema(description = "用户昵称", example = "张三") - private String nickname; - - @Schema(description = "用户编号", example = "123") - private Long userId; - - @Schema(description = "业务类型", example = "1") - private Integer bizType; - - @Schema(description = "积分标题", example = "呵呵") - private String title; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java deleted file mode 100644 index d2411d9..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.point.vo.recrod; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 用户积分记录 Response VO") -@Data -public class MemberPointRecordRespVO { - - @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457") - private Long id; - - @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long userId; - - @Schema(description = "昵称", example = "张三") - private String nickname; - - @Schema(description = "业务编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "22706") - private String bizId; - - @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer bizType; - - @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") - private String title; - - @Schema(description = "积分描述", example = "你猜") - private String description; - - @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - private Integer point; - - @Schema(description = "变动后的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "200") - private Integer totalPoint; - - @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInConfigController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInConfigController.java deleted file mode 100644 index 4032455..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInConfigController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInConfigConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import com.fjrcloud.community.module.member.service.signin.MemberSignInConfigService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -// TODO 芋艿：url -@Tag(name = "管理后台 - 签到规则") -@RestController -@RequestMapping("/member/sign-in/config") -@Validated -public class MemberSignInConfigController { - - @Resource - private MemberSignInConfigService signInConfigService; - - @PostMapping("/create") - @Operation(summary = "创建签到规则") - @PreAuthorize("@ss.hasPermission('point:sign-in-config:create')") - public CommonResult createSignInConfig(@Valid @RequestBody MemberSignInConfigCreateReqVO createReqVO) { - return success(signInConfigService.createSignInConfig(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新签到规则") - @PreAuthorize("@ss.hasPermission('point:sign-in-config:update')") - public CommonResult updateSignInConfig(@Valid @RequestBody MemberSignInConfigUpdateReqVO updateReqVO) { - signInConfigService.updateSignInConfig(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除签到规则") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('point:sign-in-config:delete')") - public CommonResult deleteSignInConfig(@RequestParam("id") Long id) { - signInConfigService.deleteSignInConfig(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得签到规则") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')") - public CommonResult getSignInConfig(@RequestParam("id") Long id) { - MemberSignInConfigDO signInConfig = signInConfigService.getSignInConfig(id); - return success(MemberSignInConfigConvert.INSTANCE.convert(signInConfig)); - } - - @GetMapping("/list") - @Operation(summary = "获得签到规则列表") - @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')") - public CommonResult> getSignInConfigList() { - List list = signInConfigService.getSignInConfigList(); - return success(MemberSignInConfigConvert.INSTANCE.convertList(list)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInRecordController.java deleted file mode 100644 index 2d094bd..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/MemberSignInRecordController.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.service.signin.MemberSignInRecordService; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertSet; - -@Tag(name = "管理后台 - 签到记录") -@RestController -@RequestMapping("/member/sign-in/record") -@Validated -public class MemberSignInRecordController { - - @Resource - private MemberSignInRecordService signInRecordService; - - @Resource - private MemberUserService memberUserService; - - @GetMapping("/page") - @Operation(summary = "获得签到记录分页") - @PreAuthorize("@ss.hasPermission('point:sign-in-record:query')") - public CommonResult> getSignInRecordPage(@Valid MemberSignInRecordPageReqVO pageVO) { - // 执行分页查询 - PageResult pageResult = signInRecordService.getSignInRecordPage(pageVO); - if (CollectionUtils.isEmpty(pageResult.getList())) { - return success(PageResult.empty(pageResult.getTotal())); - } - - // 拼接结果返回 - List users = memberUserService.getUserList( - convertSet(pageResult.getList(), MemberSignInRecordDO::getUserId)); - return success(MemberSignInRecordConvert.INSTANCE.convertPage(pageResult, users)); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java deleted file mode 100644 index 24f754c..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.config; - -import cn.hutool.core.util.ObjUtil; -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.validation.InEnum; -import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.PositiveOrZero; - -/** - * 签到规则 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberSignInConfigBaseVO { - - @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7") - @NotNull(message = "签到天数不能为空") - private Integer day; - - @Schema(description = "奖励积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - @NotNull(message = "奖励积分不能为空") - @PositiveOrZero(message = "奖励积分不能小于 0") - private Integer point; - - @Schema(description = "奖励经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - @NotNull(message = "奖励经验不能为空") - @PositiveOrZero(message = "奖励经验不能小于 0") - private Integer experience; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "状态不能为空") - @InEnum(CommonStatusEnum.class) - private Integer status; - - @AssertTrue(message = "签到奖励积分和经验不能同时为空") - @JsonIgnore - public boolean isConfigAward() { - return ObjUtil.notEqual(point, 0) || ObjUtil.notEqual(experience, 0); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java deleted file mode 100644 index 8885dab..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.config; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "管理后台 - 签到规则创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberSignInConfigCreateReqVO extends MemberSignInConfigBaseVO { - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java deleted file mode 100644 index 7347807..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.config; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 签到规则 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberSignInConfigRespVO extends MemberSignInConfigBaseVO { - - @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20937") - private Integer id; - - @Schema(description = "创建时间") - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java deleted file mode 100644 index ccf5aef..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.config; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import javax.validation.constraints.*; - -@Schema(description = "管理后台 - 签到规则更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberSignInConfigUpdateReqVO extends MemberSignInConfigBaseVO { - - @Schema(description = "规则自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13653") - @NotNull(message = "规则自增主键不能为空") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java deleted file mode 100644 index b73f4e2..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.record; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 签到记录分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberSignInRecordPageReqVO extends PageParam { - - @Schema(description = "签到用户", example = "土豆") - private String nickname; - - @Schema(description = "第几天签到", example = "10") - private Integer day; - - @Schema(description = "用户编号", example = "123") - private Long userId; - - @Schema(description = "签到时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java deleted file mode 100644 index e3461f3..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.signin.vo.record; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 签到记录 Response VO") -@Data -public class MemberSignInRecordRespVO { - - @Schema(description = "签到自增 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11903") - private Long id; - - @Schema(description = "签到用户", requiredMode = Schema.RequiredMode.REQUIRED, example = "6507") - private Long userId; - - @Schema(description = "昵称", example = "张三") - private String nickname; - - @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer day; - - @Schema(description = "签到的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - private Integer point; - - @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/MemberTagController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/MemberTagController.java deleted file mode 100644 index baaeb36..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/MemberTagController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagRespVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; -import com.fjrcloud.community.module.member.convert.tag.MemberTagConvert; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import com.fjrcloud.community.module.member.service.tag.MemberTagService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 会员标签") -@RestController -@RequestMapping("/member/tag") -@Validated -public class MemberTagController { - - @Resource - private MemberTagService tagService; - - @PostMapping("/create") - @Operation(summary = "创建会员标签") - @PreAuthorize("@ss.hasPermission('member:tag:create')") - public CommonResult createTag(@Valid @RequestBody MemberTagCreateReqVO createReqVO) { - return success(tagService.createTag(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新会员标签") - @PreAuthorize("@ss.hasPermission('member:tag:update')") - public CommonResult updateTag(@Valid @RequestBody MemberTagUpdateReqVO updateReqVO) { - tagService.updateTag(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除会员标签") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('member:tag:delete')") - public CommonResult deleteTag(@RequestParam("id") Long id) { - tagService.deleteTag(id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得会员标签") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:tag:query')") - public CommonResult getMemberTag(@RequestParam("id") Long id) { - MemberTagDO tag = tagService.getTag(id); - return success(MemberTagConvert.INSTANCE.convert(tag)); - } - - @GetMapping("/list-all-simple") - @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项") - public CommonResult> getSimpleTagList() { - // 获用户列表，只要开启状态的 - List list = tagService.getTagList(); - // 排序后，返回给前端 - return success(MemberTagConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/list") - @Operation(summary = "获得会员标签列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('member:tag:query')") - public CommonResult> getMemberTagList(@RequestParam("ids") Collection ids) { - List list = tagService.getTagList(ids); - return success(MemberTagConvert.INSTANCE.convertList(list)); - } - - @GetMapping("/page") - @Operation(summary = "获得会员标签分页") - @PreAuthorize("@ss.hasPermission('member:tag:query')") - public CommonResult> getTagPage(@Valid MemberTagPageReqVO pageVO) { - PageResult pageResult = tagService.getTagPage(pageVO); - return success(MemberTagConvert.INSTANCE.convertPage(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagBaseVO.java deleted file mode 100644 index ee5ea37..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagBaseVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -/** - * 会员标签 Base VO，提供给添加、修改、详细的子 VO 使用 - * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 - */ -@Data -public class MemberTagBaseVO { - - @Schema(description = "标签名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") - @NotNull(message = "标签名称不能为空") - private String name; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java deleted file mode 100644 index 584360c..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "管理后台 - 会员标签创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberTagCreateReqVO extends MemberTagBaseVO { - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java deleted file mode 100644 index d1aeda0..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagPageReqVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag.vo; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 会员标签分页 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberTagPageReqVO extends PageParam { - - @Schema(description = "标签名称", example = "李四") - private String name; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagRespVO.java deleted file mode 100644 index b68e8a0..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagRespVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 会员标签 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberTagRespVO extends MemberTagBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907") - private Long id; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java deleted file mode 100644 index 068024d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/tag/vo/MemberTagUpdateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.tag.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "管理后台 - 会员标签更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class MemberTagUpdateReqVO extends MemberTagBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "907") - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/MemberUserController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/MemberUserController.java deleted file mode 100644 index c006a32..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/admin/user/MemberUserController.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.fjrcloud.community.module.member.controller.admin.user; - -import cn.hutool.core.collection.CollUtil; -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.user.vo.*; -import com.fjrcloud.community.module.member.convert.user.MemberUserConvert; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; -import com.fjrcloud.community.module.member.service.group.MemberGroupService; -import com.fjrcloud.community.module.member.service.level.MemberLevelService; -import com.fjrcloud.community.module.member.service.point.MemberPointRecordService; -import com.fjrcloud.community.module.member.service.tag.MemberTagService; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertSet; -import static com.fjrcloud.community.framework.web.core.util.WebFrameworkUtils.getLoginUserId; - -@Tag(name = "管理后台 - 会员用户") -@RestController -@RequestMapping("/member/user") -@Validated -public class MemberUserController { - - @Resource - private MemberUserService memberUserService; - @Resource - private MemberTagService memberTagService; - @Resource - private MemberLevelService memberLevelService; - @Resource - private MemberGroupService memberGroupService; - @Resource - private MemberPointRecordService memberPointRecordService; - - @PutMapping("/update") - @Operation(summary = "更新会员用户") - @PreAuthorize("@ss.hasPermission('member:user:update')") - public CommonResult updateUser(@Valid @RequestBody MemberUserUpdateReqVO updateReqVO) { - memberUserService.updateUser(updateReqVO); - return success(true); - } - - @PutMapping("/update-level") - @Operation(summary = "更新会员用户等级") - @PreAuthorize("@ss.hasPermission('member:user:update-level')") - public CommonResult updateUserLevel(@Valid @RequestBody MemberUserUpdateLevelReqVO updateReqVO) { - memberLevelService.updateUserLevel(updateReqVO); - return success(true); - } - - @PutMapping("/update-point") - @Operation(summary = "更新会员用户积分") - @PreAuthorize("@ss.hasPermission('member:user:update-point')") - public CommonResult updateUserPoint(@Valid @RequestBody MemberUserUpdatePointReqVO updateReqVO) { - memberPointRecordService.createPointRecord(updateReqVO.getId(), updateReqVO.getPoint(), - MemberPointBizTypeEnum.ADMIN, String.valueOf(getLoginUserId())); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得会员用户") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult getUser(@RequestParam("id") Long id) { - MemberUserDO user = memberUserService.getUser(id); - if (user == null) { - return success(null); - } - MemberUserRespVO userVO = MemberUserConvert.INSTANCE.convert03(user); - if (user.getLevelId() != null) { - MemberLevelDO level = memberLevelService.getLevel(userVO.getId()); - if (level != null) { - userVO.setLevelName(level.getName()); - } - } - return success(userVO); - } - - @GetMapping("/page") - @Operation(summary = "获得会员用户分页") - @PreAuthorize("@ss.hasPermission('member:user:query')") - public CommonResult> getUserPage(@Valid MemberUserPageReqVO pageVO) { - PageResult pageResult = memberUserService.getUserPage(pageVO); - if (CollUtil.isEmpty(pageResult.getList())) { - return success(PageResult.empty()); - } - - // 处理用户标签返显 - Set tagIds = pageResult.getList().stream() - .map(MemberUserDO::getTagIds) - .filter(Objects::nonNull) - .flatMap(Collection::stream) - .collect(Collectors.toSet()); - List tags = memberTagService.getTagList(tagIds); - // 处理用户级别返显 - List levels = memberLevelService.getLevelList( - convertSet(pageResult.getList(), MemberUserDO::getLevelId)); - // 处理用户分组返显 - List groups = memberGroupService.getGroupList( - convertSet(pageResult.getList(), MemberUserDO::getGroupId)); - return success(MemberUserConvert.INSTANCE.convertPage(pageResult, tags, levels, groups)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.http b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.http deleted file mode 100644 index a0582e6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.http +++ /dev/null @@ -1,54 +0,0 @@ -### 请求 /create 接口 => 成功 -POST {{appApi}}//member/address/create -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -{ - "name": "yunai", - "mobile": "15601691300", - "areaId": "610632", - "postCode": "200000", - "detailAddress": "芋道源码 233 号 666 室", - "defaulted": true -} - -### 请求 /update 接口 => 成功 -PUT {{appApi}}//member/address/update -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -{ - "id": "1", - "name": "yunai888", - "mobile": "15601691300", - "areaId": "610632", - "postCode": "200000", - "detailAddress": "芋道源码 233 号 666 室", - "defaulted": false -} - -### 请求 /delete 接口 => 成功 -DELETE {{appApi}}//member/address/delete?id=2 -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /get 接口 => 成功 -GET {{appApi}}//member/address/get?id=1 -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /get-default 接口 => 成功 -GET {{appApi}}//member/address/get-default -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} - -### 请求 /list 接口 => 成功 -GET {{appApi}}//member/address/list -Content-Type: application/json -tenant-id: {{appTenantId}} -Authorization: Bearer {{appToken}} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.java deleted file mode 100644 index 7f70b4e..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/AppAddressController.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.address; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressRespVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.fjrcloud.community.module.member.convert.address.AddressConvert; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; -import com.fjrcloud.community.module.member.service.address.AddressService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; - -@Tag(name = "用户 APP - 用户收件地址") -@RestController -@RequestMapping("/member/address") -@Validated -public class AppAddressController { - - @Resource - private AddressService addressService; - - @PostMapping("/create") - @Operation(summary = "创建用户收件地址") - public CommonResult createAddress(@Valid @RequestBody AppAddressCreateReqVO createReqVO) { - return success(addressService.createAddress(getLoginUserId(), createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新用户收件地址") - public CommonResult updateAddress(@Valid @RequestBody AppAddressUpdateReqVO updateReqVO) { - addressService.updateAddress(getLoginUserId(), updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除用户收件地址") - @Parameter(name = "id", description = "编号", required = true) - public CommonResult deleteAddress(@RequestParam("id") Long id) { - addressService.deleteAddress(getLoginUserId(), id); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得用户收件地址") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - public CommonResult getAddress(@RequestParam("id") Long id) { - MemberAddressDO address = addressService.getAddress(getLoginUserId(), id); - return success(AddressConvert.INSTANCE.convert(address)); - } - - @GetMapping("/get-default") - @Operation(summary = "获得默认的用户收件地址") - public CommonResult getDefaultUserAddress() { - MemberAddressDO address = addressService.getDefaultUserAddress(getLoginUserId()); - return success(AddressConvert.INSTANCE.convert(address)); - } - - @GetMapping("/list") - @Operation(summary = "获得用户收件地址列表") - public CommonResult> getAddressList() { - List list = addressService.getAddressList(getLoginUserId()); - return success(AddressConvert.INSTANCE.convertList(list)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressBaseVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressBaseVO.java deleted file mode 100644 index ea51b26..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressBaseVO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.address.vo; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotNull; - -// TODO 芋艿：example 缺失 -/** -* 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用 -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 -*/ -@Data -public class AppAddressBaseVO { - - @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "收件人名称不能为空") - private String name; - - @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "手机号不能为空") - private String mobile; - - @Schema(description = "地区编号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "地区编号不能为空") - private Long areaId; - - @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "收件详细地址不能为空") - private String detailAddress; - - @Schema(description = "是否默认地址", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否默认地址不能为空") - private Boolean defaultStatus; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressCreateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressCreateReqVO.java deleted file mode 100644 index 5713c19..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressCreateReqVO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.address.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "用户 APP - 用户收件地址创建 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressCreateReqVO extends AppAddressBaseVO { - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressRespVO.java deleted file mode 100644 index 55d3984..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressRespVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.address.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -@Schema(description = "用户 APP - 用户收件地址 Response VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressRespVO extends AppAddressBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - private Long id; - - @Schema(description = "地区名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "上海上海市普陀区") - private String areaName; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java deleted file mode 100644 index f9a84e9..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.address.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import javax.validation.constraints.NotNull; - -@Schema(description = "用户 APP - 用户收件地址更新 Request VO") -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class AppAddressUpdateReqVO extends AppAddressBaseVO { - - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - @NotNull(message = "编号不能为空") - private Long id; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberExperienceRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberExperienceRecordController.java deleted file mode 100644 index fbaed4a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberExperienceRecordController.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.level; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO; -import com.fjrcloud.community.module.member.convert.level.MemberExperienceRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import com.fjrcloud.community.module.member.service.level.MemberExperienceRecordService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; - -@Tag(name = "用户 App - 会员经验记录") -@RestController -@RequestMapping("/member/experience-record") -@Validated -public class AppMemberExperienceRecordController { - - @Resource - private MemberExperienceRecordService experienceLogService; - - @GetMapping("/page") - @Operation(summary = "获得会员经验记录分页") - public CommonResult> getExperienceRecordPage( - @Valid PageParam pageParam) { - PageResult pageResult = experienceLogService.getExperienceRecordPage( - getLoginUserId(), pageParam); - return success(MemberExperienceRecordConvert.INSTANCE.convertPage02(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberLevelController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberLevelController.java deleted file mode 100644 index 601ee52..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/AppMemberLevelController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.level; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.app.level.vo.level.AppMemberLevelRespVO; -import com.fjrcloud.community.module.member.convert.level.MemberLevelConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.service.level.MemberLevelService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "用户 App - 会员等级") -@RestController -@RequestMapping("/member/level") -@Validated -public class AppMemberLevelController { - - @Resource - private MemberLevelService levelService; - - @GetMapping("/list") - @Operation(summary = "获得会员等级列表") - @PermitAll - public CommonResult> getLevelList() { - List result = levelService.getEnableLevelList(); - return success(MemberLevelConvert.INSTANCE.convertList02(result)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java deleted file mode 100644 index ec16f0f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/experience/AppMemberExperienceRecordRespVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.level.vo.experience; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "用户 App - 会员经验记录 Response VO") -@Data -public class AppMemberExperienceRecordRespVO { - - @Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "增加经验") - private String title; - - @Schema(description = "经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - private Integer experience; - - @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验") - private String description; - - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java deleted file mode 100644 index e40fb76..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/level/vo/level/AppMemberLevelRespVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.level.vo.level; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "用户 App - 会员等级 Response VO") -@Data -public class AppMemberLevelRespVO { - - @Schema(description = "等级名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - private String name; - - @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer level; - - @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - private Integer experience; - - @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98") - private Integer discountPercent; - - @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg") - private String icon; - - @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg") - private String backgroundUrl; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/AppMemberPointRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/AppMemberPointRecordController.java deleted file mode 100644 index b8d2825..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/AppMemberPointRecordController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.point; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.common.util.object.BeanUtils; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import com.fjrcloud.community.module.member.service.point.MemberPointRecordService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.validation.Valid; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; - -@Tag(name = "用户 App - 签到记录") -@RestController -@RequestMapping("/member/point/record") -@Validated -public class AppMemberPointRecordController { - - @Resource - private MemberPointRecordService pointRecordService; - - @GetMapping("/page") - @Operation(summary = "获得用户积分记录分页") - public CommonResult> getPointRecordPage( - @Valid AppMemberPointRecordPageReqVO pageReqVO) { - PageResult pageResult = pointRecordService.getPointRecordPage(getLoginUserId(), pageReqVO); - return success(BeanUtils.toBean(pageResult, AppMemberPointRecordRespVO.class)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java deleted file mode 100644 index fd80a68..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordPageReqVO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.point.vo; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.fjrcloud.community.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "用户 App - 用户积分记录分页 Request VO") -@Data -public class AppMemberPointRecordPageReqVO extends PageParam { - - @Schema(description = "是否增加积分", example = "true") - private Boolean addStatus; // true - 增加；false - 减少；null - 不筛选 - - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - @Schema(description = "创建时间") - private LocalDateTime[] createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java deleted file mode 100644 index 77eecfe..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.point.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "用户 App - 用户积分记录 Response VO") -@Data -public class AppMemberPointRecordRespVO { - - @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457") - private Long id; - - @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") - private String title; - - @Schema(description = "积分描述", example = "你猜") - private String description; - - @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") - private Integer point; - - @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInConfigController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInConfigController.java deleted file mode 100644 index 891e383..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInConfigController.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.signin; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInConfigConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import com.fjrcloud.community.module.member.service.signin.MemberSignInConfigService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; - -@Tag(name = "用户 App - 签到规则") -@RestController -@RequestMapping("/member/sign-in/config") -@Validated -public class AppMemberSignInConfigController { - - @Resource - private MemberSignInConfigService signInConfigService; - - @GetMapping("/list") - @Operation(summary = "获得签到规则列表") - @PermitAll - public CommonResult> getSignInConfigList() { - List pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus()); - return success(MemberSignInConfigConvert.INSTANCE.convertList02(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInRecordController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInRecordController.java deleted file mode 100644 index de8be4b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/AppMemberSignInRecordController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.signin; - -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO; -import com.fjrcloud.community.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; -import com.fjrcloud.community.module.member.service.signin.MemberSignInRecordService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; - -@Tag(name = "用户 App - 签到记录") -@RestController -@RequestMapping("/member/sign-in/record") -@Validated -public class AppMemberSignInRecordController { - - @Resource - private MemberSignInRecordService signInRecordService; - - @GetMapping("/get-summary") - @Operation(summary = "获得个人签到统计") - public CommonResult getSignInRecordSummary() { - return success(signInRecordService.getSignInRecordSummary(getLoginUserId())); - } - - @PostMapping("/create") - @Operation(summary = "签到") - public CommonResult createSignInRecord() { - MemberSignInRecordDO recordDO = signInRecordService.createSignRecord(getLoginUserId()); - return success(MemberSignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO)); - } - - @GetMapping("/page") - @Operation(summary = "获得签到记录分页") - public CommonResult> getSignRecordPage(PageParam pageParam) { - PageResult pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam); - return success(MemberSignInRecordConvert.INSTANCE.convertPage02(pageResult)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java deleted file mode 100644 index 94ab88a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.signin.vo.config; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "用户 App - 签到规则 Response VO") -@Data -public class AppMemberSignInConfigRespVO { - - @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7") - private Integer day; - - @Schema(description = "奖励积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - private Integer point; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java deleted file mode 100644 index c8c236e..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.signin.vo.record; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "用户 App - 签到记录 Response VO") -@Data -public class AppMemberSignInRecordRespVO { - - @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer day; - - @Schema(description = "签到的分数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - private Integer point; - - @Schema(description = "签到的经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - private Integer experience; - - @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED) - private LocalDateTime createTime; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java deleted file mode 100644 index b06f18b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.signin.vo.record; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "用户 App - 个人签到统计 Response VO") -@Data -public class AppMemberSignInRecordSummaryRespVO { - - @Schema(description = "总签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - private Integer totalDay; - - @Schema(description = "连续签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "3") - private Integer continuousDay; - - @Schema(description = "今天是否已签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean todaySignIn; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/AppSocialUserController.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/AppSocialUserController.java deleted file mode 100644 index 33bf65b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/AppSocialUserController.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social; - -import cn.hutool.core.codec.Base64; -import com.fjrcloud.community.framework.common.enums.UserTypeEnum; -import com.fjrcloud.community.framework.common.pojo.CommonResult; -import com.fjrcloud.community.framework.common.util.object.BeanUtils; -import com.fjrcloud.community.module.member.controller.app.social.vo.*; -import com.fjrcloud.community.module.system.api.social.SocialClientApi; -import com.fjrcloud.community.module.system.api.social.SocialUserApi; -import com.fjrcloud.community.module.system.api.social.dto.*; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.annotation.security.PermitAll; -import javax.validation.Valid; -import java.util.List; - -import static com.fjrcloud.community.framework.common.pojo.CommonResult.success; -import static com.fjrcloud.community.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; - -@Tag(name = "用户 App - 社交用户") -@RestController -@RequestMapping("/member/social-user") -@Validated -public class AppSocialUserController { - - @Resource - private SocialUserApi socialUserApi; - @Resource - private SocialClientApi socialClientApi; - - @PostMapping("/bind") - @Operation(summary = "社交绑定，使用 code 授权码") - @PermitAll - public CommonResult socialBind(@RequestBody @Valid AppSocialUserBindReqVO reqVO) { - SocialUserBindReqDTO reqDTO = new SocialUserBindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(), - reqVO.getType(), reqVO.getCode(), reqVO.getState()); - String openid = socialUserApi.bindSocialUser(reqDTO); - return success(openid); - } - - @DeleteMapping("/unbind") - @Operation(summary = "取消社交绑定") - public CommonResult socialUnbind(@RequestBody AppSocialUserUnbindReqVO reqVO) { - SocialUserUnbindReqDTO reqDTO = new SocialUserUnbindReqDTO(getLoginUserId(), UserTypeEnum.MEMBER.getValue(), - reqVO.getType(), reqVO.getOpenid()); - socialUserApi.unbindSocialUser(reqDTO); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得社交用户") - @Parameter(name = "type", description = "社交平台的类型，参见 SocialTypeEnum 枚举值", required = true, example = "10") - public CommonResult getSocialUser(@RequestParam("type") Integer type) { - SocialUserRespDTO socialUser = socialUserApi.getSocialUserByUserId(UserTypeEnum.MEMBER.getValue(), getLoginUserId(), type); - return success(BeanUtils.toBean(socialUser, AppSocialUserRespVO.class)); - } - - @PostMapping("/wxa-qrcode") - @Operation(summary = "获得微信小程序码(base64 image)") - @PermitAll - public CommonResult getWxaQrcode(@RequestBody @Valid AppSocialWxaQrcodeReqVO reqVO) { - byte[] wxQrcode = socialClientApi.getWxaQrcode(BeanUtils.toBean(reqVO, SocialWxQrcodeReqDTO.class)); - return success(Base64.encode(wxQrcode)); - } - - @GetMapping("/get-subscribe-template-list") - @Operation(summary = "获得微信小程订阅模板列表") - @PermitAll - public CommonResult> getSubscribeTemplateList() { - List template = socialClientApi.getWxaSubscribeTemplateList(UserTypeEnum.MEMBER.getValue()); - return success(BeanUtils.toBean(template, AppSocialWxaSubscribeTemplateRespVO.class)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java deleted file mode 100644 index 141f66f..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social.vo; - -import com.fjrcloud.community.framework.common.validation.InEnum; -import com.fjrcloud.community.module.system.enums.social.SocialTypeEnum; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Schema(description = "用户 APP - 社交绑定 Request VO，使用 code 授权码") -@Data -public class AppSocialUserBindReqVO { - - @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - @InEnum(SocialTypeEnum.class) - @NotNull(message = "社交平台的类型不能为空") - private Integer type; - - @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") - @NotEmpty(message = "授权码不能为空") - private String code; - - @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62") - @NotEmpty(message = "state 不能为空") - private String state; - -} \ No newline at end of file diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserRespVO.java deleted file mode 100644 index b05d16a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserRespVO.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "用户 APP - 社交用户 Response VO") -@Data -public class AppSocialUserRespVO { - - @Schema(description = "社交用户的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPRmJ0wvBptiPIlGEZiPewGwiEiE") - private String openid; - - @Schema(description = "社交用户的昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码") - private String nickname; - - @Schema(description = "社交用户的头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/1.png") - private String avatar; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserUnbindReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserUnbindReqVO.java deleted file mode 100644 index a228ff6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialUserUnbindReqVO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social.vo; - -import com.fjrcloud.community.framework.common.validation.InEnum; -import com.fjrcloud.community.module.system.enums.social.SocialTypeEnum; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Schema(description = "用户 APP - 取消社交绑定 Request VO") -@Data -public class AppSocialUserUnbindReqVO { - - @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") - @InEnum(SocialTypeEnum.class) - @NotNull(message = "社交平台的类型不能为空") - private Integer type; - - @Schema(description = "社交用户的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPRmJ0wvBptiPIlGEZiPewGwiEiE") - @NotEmpty(message = "社交用户的 openid 不能为空") - private String openid; - -} \ No newline at end of file diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaQrcodeReqVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaQrcodeReqVO.java deleted file mode 100644 index 3937756..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaQrcodeReqVO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; - - -@Schema(description = "用户 APP - 获得获取小程序码 Request VO") -@Data -public class AppSocialWxaQrcodeReqVO { - - /** - * 页面路径不能携带参数（参数请放在scene字段里） - */ - @Schema(description = "场景值", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") - private String scene; - - /** - * 默认是主页，页面 page，例如 pages/index/index，根路径前不要填加 /，不能携带参数（参数请放在scene字段里）， - * 如果不填写这个字段，默认跳主页面。scancode_time为系统保留参数，不允许配置 - */ - @Schema(description = "页面路径", requiredMode = Schema.RequiredMode.REQUIRED, example = "pages/goods/index") - @NotEmpty(message = "页面路径不能为空") - private String path; - - @Schema(description = "二维码宽度", requiredMode = Schema.RequiredMode.REQUIRED, example = "430") - private Integer width; - - @Schema(description = "是/否自动配置线条颜色", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean autoColor; - - @Schema(description = "是/否检查 page 是否存在", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean checkPath; - - @Schema(description = "是/否需要透明底色", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean hyaline; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaSubscribeTemplateRespVO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaSubscribeTemplateRespVO.java deleted file mode 100644 index 86f1fa6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/app/social/vo/AppSocialWxaSubscribeTemplateRespVO.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.fjrcloud.community.module.member.controller.app.social.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -@Schema(description = "用户 APP - 获得小程序订阅模版 Response VO") -@Data -public class AppSocialWxaSubscribeTemplateRespVO { - - @Schema(description = "模版编号", requiredMode = Schema.RequiredMode.REQUIRED, - example = "9Aw5ZV1j9xdWTFEkqCpZ7mIBbSC34khK55OtzUPl0rU") - private String id; - - @Schema(description = "模版标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "订单支付通知") - private String title; - - @Schema(description = "模版内容", requiredMode = Schema.RequiredMode.REQUIRED, - example = "{ {result.DATA} }\\n\\n领奖金额:{ {withdrawMoney.DATA} }\\n领奖时间: { {withdrawTime.DATA} }") - private String content; - - @Schema(description = "模板内容示例", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单时间:2016年8月8日") - private String example; - - @Schema(description = "模版类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - private Integer type; // 2 为一次性订阅，3 为长期订阅 - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/package-info.java deleted file mode 100644 index bd75d7e..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/controller/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 RESTful API 给前端： - * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目 - * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分 - */ -package com.fjrcloud.community.module.member.controller; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/address/AddressConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/address/AddressConvert.java deleted file mode 100644 index 67ed5b1..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/address/AddressConvert.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fjrcloud.community.module.member.convert.address; - -import com.fjrcloud.community.framework.ip.core.utils.AreaUtils; -import com.fjrcloud.community.module.member.api.address.dto.MemberAddressRespDTO; -import com.fjrcloud.community.module.member.controller.admin.address.vo.AddressRespVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressRespVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.Named; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 用户收件地址 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface AddressConvert { - - AddressConvert INSTANCE = Mappers.getMapper(AddressConvert.class); - - MemberAddressDO convert(AppAddressCreateReqVO bean); - - MemberAddressDO convert(AppAddressUpdateReqVO bean); - - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") - AppAddressRespVO convert(MemberAddressDO bean); - - List convertList(List list); - - MemberAddressRespDTO convert02(MemberAddressDO bean); - - @Named("convertAreaIdToAreaName") - default String convertAreaIdToAreaName(Integer areaId) { - return AreaUtils.format(areaId); - } - - List convertList2(List list); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/config/MemberConfigConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/config/MemberConfigConvert.java deleted file mode 100644 index d16f3ce..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/config/MemberConfigConvert.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.fjrcloud.community.module.member.convert.config; - -import com.fjrcloud.community.module.member.api.config.dto.MemberConfigRespDTO; -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigRespVO; -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigSaveReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.config.MemberConfigDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -/** - * 会员配置 Convert - * - * @author QingX - */ -@Mapper -public interface MemberConfigConvert { - - MemberConfigConvert INSTANCE = Mappers.getMapper(MemberConfigConvert.class); - - MemberConfigRespVO convert(MemberConfigDO bean); - - MemberConfigDO convert(MemberConfigSaveReqVO bean); - - MemberConfigRespDTO convert01(MemberConfigDO config); -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/group/MemberGroupConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/group/MemberGroupConvert.java deleted file mode 100644 index 9a32d78..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/group/MemberGroupConvert.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fjrcloud.community.module.member.convert.group; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupRespVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupSimpleRespVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 用户分组 Convert - * - * @author owen - */ -@Mapper -public interface MemberGroupConvert { - - MemberGroupConvert INSTANCE = Mappers.getMapper(MemberGroupConvert.class); - - MemberGroupDO convert(MemberGroupCreateReqVO bean); - - MemberGroupDO convert(MemberGroupUpdateReqVO bean); - - MemberGroupRespVO convert(MemberGroupDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertSimpleList(List list); -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberExperienceRecordConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberExperienceRecordConvert.java deleted file mode 100644 index b82dd5a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberExperienceRecordConvert.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.fjrcloud.community.module.member.convert.level; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordRespVO; -import com.fjrcloud.community.module.member.controller.app.level.vo.experience.AppMemberExperienceRecordRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员经验记录 Convert - * - * @author owen - */ -@Mapper -public interface MemberExperienceRecordConvert { - - MemberExperienceRecordConvert INSTANCE = Mappers.getMapper(MemberExperienceRecordConvert.class); - - MemberExperienceRecordRespVO convert(MemberExperienceRecordDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - MemberExperienceRecordDO convert(Long userId, Integer experience, Integer totalExperience, - String bizId, Integer bizType, - String title, String description); - - PageResult convertPage02(PageResult page); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelConvert.java deleted file mode 100644 index aa563a3..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelConvert.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fjrcloud.community.module.member.convert.level; - -import com.fjrcloud.community.module.member.api.level.dto.MemberLevelRespDTO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelRespVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; -import com.fjrcloud.community.module.member.controller.app.level.vo.level.AppMemberLevelRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员等级 Convert - * - * @author owen - */ -@Mapper -public interface MemberLevelConvert { - - MemberLevelConvert INSTANCE = Mappers.getMapper(MemberLevelConvert.class); - - MemberLevelDO convert(MemberLevelCreateReqVO bean); - - MemberLevelDO convert(MemberLevelUpdateReqVO bean); - - MemberLevelRespVO convert(MemberLevelDO bean); - - List convertList(List list); - - List convertSimpleList(List list); - - List convertList02(List list); - - MemberLevelRespDTO convert02(MemberLevelDO bean); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelRecordConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelRecordConvert.java deleted file mode 100644 index 3873eef..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/level/MemberLevelRecordConvert.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fjrcloud.community.module.member.convert.level; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员等级记录 Convert - * - * @author owen - */ -@Mapper -public interface MemberLevelRecordConvert { - - MemberLevelRecordConvert INSTANCE = Mappers.getMapper(MemberLevelRecordConvert.class); - - MemberLevelRecordRespVO convert(MemberLevelRecordDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - default MemberLevelRecordDO copyTo(MemberLevelDO from, MemberLevelRecordDO to) { - if (from != null) { - to.setLevelId(from.getId()); - to.setLevel(from.getLevel()); - to.setDiscountPercent(from.getDiscountPercent()); - to.setExperience(from.getExperience()); - } - return to; - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/package-info.java deleted file mode 100644 index 93c90cc..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 提供 POJO 类的实体转换 - * - * 目前使用 MapStruct 框架 - */ -package com.fjrcloud.community.module.member.convert; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/point/MemberPointRecordConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/point/MemberPointRecordConvert.java deleted file mode 100644 index 94a2b2d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/point/MemberPointRecordConvert.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fjrcloud.community.module.member.convert.point; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.common.util.collection.MapUtils; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; -import java.util.Map; - -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertMap; - -/** - * 用户积分记录 Convert - * - * @author QingX - */ -@Mapper -public interface MemberPointRecordConvert { - - MemberPointRecordConvert INSTANCE = Mappers.getMapper(MemberPointRecordConvert.class); - - default PageResult convertPage(PageResult pageResult, List users) { - PageResult voPageResult = convertPage(pageResult); - // user 拼接 - Map userMap = convertMap(users, MemberUserDO::getId); - voPageResult.getList().forEach(record -> MapUtils.findAndThen(userMap, record.getUserId(), - memberUserRespDTO -> record.setNickname(memberUserRespDTO.getNickname()))); - return voPageResult; - } - PageResult convertPage(PageResult pageResult); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInConfigConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInConfigConvert.java deleted file mode 100644 index 6dddba0..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInConfigConvert.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fjrcloud.community.module.member.convert.signin; - -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO; -import com.fjrcloud.community.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 签到规则 Convert - * - * @author QingX - */ -@Mapper -public interface MemberSignInConfigConvert { - - MemberSignInConfigConvert INSTANCE = Mappers.getMapper(MemberSignInConfigConvert.class); - - MemberSignInConfigDO convert(MemberSignInConfigCreateReqVO bean); - - MemberSignInConfigDO convert(MemberSignInConfigUpdateReqVO bean); - - MemberSignInConfigRespVO convert(MemberSignInConfigDO bean); - - List convertList(List list); - - List convertList02(List list); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInRecordConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInRecordConvert.java deleted file mode 100644 index 42165ce..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/signin/MemberSignInRecordConvert.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.fjrcloud.community.module.member.convert.signin; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.common.util.collection.MapUtils; -import com.fjrcloud.community.framework.common.util.date.DateUtils; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO; -import com.fjrcloud.community.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.Comparator; -import java.util.List; -import java.util.Map; - -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertMap; - -/** - * 签到记录 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface MemberSignInRecordConvert { - - MemberSignInRecordConvert INSTANCE = Mappers.getMapper(MemberSignInRecordConvert.class); - - default PageResult convertPage(PageResult pageResult, List users) { - PageResult voPageResult = convertPage(pageResult); - // user 拼接 - Map userMap = convertMap(users, MemberUserDO::getId); - voPageResult.getList().forEach(record -> MapUtils.findAndThen(userMap, record.getUserId(), - memberUserRespDTO -> record.setNickname(memberUserRespDTO.getNickname()))); - return voPageResult; - } - - PageResult convertPage(PageResult pageResult); - - PageResult convertPage02(PageResult pageResult); - - AppMemberSignInRecordRespVO coverRecordToAppRecordVo(MemberSignInRecordDO memberSignInRecordDO); - - default MemberSignInRecordDO convert(Long userId, MemberSignInRecordDO lastRecord, List configs) { - // 1. 计算是第几天签到 - configs.sort(Comparator.comparing(MemberSignInConfigDO::getDay)); - MemberSignInConfigDO lastConfig = CollUtil.getLast(configs); // 最大签到天数配置 - // 1.2. 计算今天是第几天签到 (只有连续签到才加否则重置为 1) - int day = 1; - if (lastRecord != null && DateUtils.isYesterday(lastRecord.getCreateTime())) { - day = lastRecord.getDay() + 1; - } - // 1.3 判断是否超出了最大签到配置 - if (day > lastConfig.getDay()) { - day = 1; // 超过最大配置的天数，重置到第一天。(也就是说开启下一轮签到) - } - - // 2.1 初始化签到信息 - MemberSignInRecordDO record = new MemberSignInRecordDO().setUserId(userId) - .setDay(day).setPoint(0).setExperience(0); - // 2.2 获取签到对应的积分 - MemberSignInConfigDO config = CollUtil.findOne(configs, item -> ObjUtil.equal(item.getDay(), record.getDay())); - if (config == null) { - return record; - } - record.setPoint(config.getPoint()); - record.setExperience(config.getExperience()); - return record; - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/tag/MemberTagConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/tag/MemberTagConvert.java deleted file mode 100644 index f738c02..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/tag/MemberTagConvert.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fjrcloud.community.module.member.convert.tag; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagRespVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 会员标签 Convert - * - * @author 芋道源码 - */ -@Mapper -public interface MemberTagConvert { - - MemberTagConvert INSTANCE = Mappers.getMapper(MemberTagConvert.class); - - MemberTagDO convert(MemberTagCreateReqVO bean); - - MemberTagDO convert(MemberTagUpdateReqVO bean); - - MemberTagRespVO convert(MemberTagDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/user/MemberUserConvert.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/user/MemberUserConvert.java deleted file mode 100644 index ea144f5..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/user/MemberUserConvert.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.fjrcloud.community.module.member.convert.user; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.api.user.dto.MemberUserRespDTO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserRespVO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; -import com.fjrcloud.community.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; -import com.fjrcloud.community.module.member.convert.address.AddressConvert; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import org.mapstruct.Mapper; -import org.mapstruct.Mapping; -import org.mapstruct.factory.Mappers; - -import java.util.List; -import java.util.Map; - -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertList; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertMap; - -@Mapper(uses = {AddressConvert.class}) -public interface MemberUserConvert { - - MemberUserConvert INSTANCE = Mappers.getMapper(MemberUserConvert.class); - - AppMemberUserInfoRespVO convert(MemberUserDO bean); - - MemberUserRespDTO convert2(MemberUserDO bean); - - List convertList2(List list); - - MemberUserDO convert(MemberUserUpdateReqVO bean); - - PageResult convertPage(PageResult page); - - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") - MemberUserRespVO convert03(MemberUserDO bean); - - default PageResult convertPage(PageResult pageResult, - List tags, - List levels, - List groups) { - PageResult result = convertPage(pageResult); - // 处理关联数据 - Map tagMap = convertMap(tags, MemberTagDO::getId, MemberTagDO::getName); - Map levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName); - Map groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName); - // 填充关联数据 - result.getList().forEach(user -> { - user.setTagNames(convertList(user.getTagIds(), tagMap::get)); - user.setLevelName(levelMap.get(user.getLevelId())); - user.setGroupName(groupMap.get(user.getGroupId())); - }); - return result; - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md deleted file mode 100644 index 8153487..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/address/MemberAddressDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/address/MemberAddressDO.java deleted file mode 100644 index b206497..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/address/MemberAddressDO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.address; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 用户收件地址 DO - * - * @author 芋道源码 - */ -@TableName("member_address") -@KeySequence("member_address_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberAddressDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 用户编号 - */ - private Long userId; - /** - * 收件人名称 - */ - private String name; - /** - * 手机号 - */ - private String mobile; - /** - * 地区编号 - */ - private Long areaId; - /** - * 收件详细地址 - */ - private String detailAddress; - /** - * 是否默认 - * - * true - 默认收件地址 - */ - private Boolean defaultStatus; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/config/MemberConfigDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/config/MemberConfigDO.java deleted file mode 100644 index ffd215d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/config/MemberConfigDO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.config; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 会员配置 DO - * - * @author QingX - */ -@TableName(value = "member_config", autoResultMap = true) -@KeySequence("member_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberConfigDO extends BaseDO { - - /** - * 自增主键 - */ - @TableId - private Long id; - /** - * 积分抵扣开关 - */ - private Boolean pointTradeDeductEnable; - /** - * 积分抵扣，单位：分 - * - * 1 积分抵扣多少分 - */ - private Integer pointTradeDeductUnitPrice; - /** - * 积分抵扣最大值 - */ - private Integer pointTradeDeductMaxPrice; - /** - * 1 元赠送多少分 - */ - private Integer pointTradeGivePoint; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/group/MemberGroupDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/group/MemberGroupDO.java deleted file mode 100644 index 1d7ac15..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/group/MemberGroupDO.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.group; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 用户分组 DO - * - * @author owen - */ -@TableName("member_group") -@KeySequence("member_group_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberGroupDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 名称 - */ - private String name; - /** - * 备注 - */ - private String remark; - /** - * 状态 - *

- * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberExperienceRecordDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberExperienceRecordDO.java deleted file mode 100644 index 77a8266..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberExperienceRecordDO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.level; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 会员经验记录 DO - * - * @author owen - */ -@TableName("member_experience_record") -@KeySequence("member_experience_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberExperienceRecordDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 用户编号 - * - * 关联 {@link MemberUserDO#getId()} 字段 - */ - private Long userId; - /** - * 业务类型 - *

- * 枚举 {@link MemberExperienceBizTypeEnum} - */ - private Integer bizType; - /** - * 业务编号 - */ - private String bizId; - /** - * 标题 - */ - private String title; - /** - * 描述 - */ - private String description; - /** - * 经验 - */ - private Integer experience; - /** - * 变更后的经验 - */ - private Integer totalExperience; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelDO.java deleted file mode 100644 index 20d0e7e..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelDO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.level; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 会员等级 DO - * - * 配置每个等级需要的积分 - * - * @author owen - */ -@TableName("member_level") -@KeySequence("member_level_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberLevelDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 等级名称 - */ - private String name; - /** - * 等级 - */ - private Integer level; - /** - * 升级经验 - */ - private Integer experience; - /** - * 享受折扣 - */ - private Integer discountPercent; - - /** - * 等级图标 - */ - private String icon; - /** - * 等级背景图 - */ - private String backgroundUrl; - /** - * 状态 - *

- * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelRecordDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelRecordDO.java deleted file mode 100644 index 8396fac..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/level/MemberLevelRecordDO.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.level; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 会员等级记录 DO - * - * 用户每次等级发生变更时，记录一条日志 - * - * @author owen - */ -@TableName("member_level_record") -@KeySequence("member_level_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberLevelRecordDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 用户编号 - * - * 关联 {@link MemberUserDO#getId()} 字段 - */ - private Long userId; - /** - * 等级编号 - * - * 关联 {@link MemberLevelDO#getId()} 字段 - */ - private Long levelId; - /** - * 会员等级 - * - * 冗余 {@link MemberLevelDO#getLevel()} 字段 - */ - private Integer level; - /** - * 享受折扣 - */ - private Integer discountPercent; - /** - * 升级经验 - */ - private Integer experience; - /** - * 会员此时的经验 - */ - private Integer userExperience; - /** - * 备注 - */ - private String remark; - /** - * 描述 - */ - private String description; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/point/MemberPointRecordDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/point/MemberPointRecordDO.java deleted file mode 100644 index 39a3b97..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/point/MemberPointRecordDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.point; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 用户积分记录 DO - * - * @author QingX - */ -@TableName("member_point_record") -@KeySequence("member_point_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberPointRecordDO extends BaseDO { - - /** - * 自增主键 - */ - @TableId - private Long id; - /** - * 用户编号 - * - * 对应 MemberUserDO 的 id 属性 - */ - private Long userId; - - /** - * 业务编码 - */ - private String bizId; - /** - * 业务类型 - * - * 枚举 {@link MemberPointBizTypeEnum} - */ - private Integer bizType; - - /** - * 积分标题 - */ - private String title; - /** - * 积分描述 - */ - private String description; - - /** - * 变动积分 - * - * 1、正数表示获得积分 - * 2、负数表示消耗积分 - */ - private Integer point; - /** - * 变动后的积分 - */ - private Integer totalPoint; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInConfigDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInConfigDO.java deleted file mode 100644 index 4d991e2..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInConfigDO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.signin; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 签到规则 DO - * - * @author QingX - */ -@TableName("member_sign_in_config") -@KeySequence("member_sign_in_config_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberSignInConfigDO extends BaseDO { - - /** - * 规则自增主键 - */ - @TableId - private Long id; - /** - * 签到第 x 天 - */ - private Integer day; - /** - * 奖励积分 - */ - private Integer point; - /** - * 奖励经验 - */ - private Integer experience; - - /** - * 状态 - * - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInRecordDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInRecordDO.java deleted file mode 100644 index e9928c3..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/signin/MemberSignInRecordDO.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.signin; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 签到记录 DO - * - * @author 芋道源码 - */ -@TableName("member_sign_in_record") -@KeySequence("member_sign_in_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberSignInRecordDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 签到用户 - */ - private Long userId; - /** - * 第几天签到 - */ - private Integer day; - /** - * 签到的积分 - */ - private Integer point; - /** - * 签到的经验 - */ - private Integer experience; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/tag/MemberTagDO.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/tag/MemberTagDO.java deleted file mode 100644 index a5d223a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/dataobject/tag/MemberTagDO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.fjrcloud.community.module.member.dal.dataobject.tag; - -import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.*; - -/** - * 会员标签 DO - * - * @author 芋道源码 - */ -@TableName("member_tag") -@KeySequence("member_tag_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MemberTagDO extends BaseDO { - - /** - * 编号 - */ - @TableId - private Long id; - /** - * 标签名称 - */ - private String name; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/address/MemberAddressMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/address/MemberAddressMapper.java deleted file mode 100644 index bc14d51..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/address/MemberAddressMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.address; - -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface MemberAddressMapper extends BaseMapperX { - - default MemberAddressDO selectByIdAndUserId(Long id, Long userId) { - return selectOne(MemberAddressDO::getId, id, MemberAddressDO::getUserId, userId); - } - - default List selectListByUserIdAndDefaulted(Long userId, Boolean defaulted) { - return selectList(new LambdaQueryWrapperX().eq(MemberAddressDO::getUserId, userId) - .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/config/MemberConfigMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/config/MemberConfigMapper.java deleted file mode 100644 index 8acae72..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/config/MemberConfigMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.config; - -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.module.member.dal.dataobject.config.MemberConfigDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 积分设置 Mapper - * - * @author QingX - */ -@Mapper -public interface MemberConfigMapper extends BaseMapperX { -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/group/MemberGroupMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/group/MemberGroupMapper.java deleted file mode 100644 index 66c4168..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/group/MemberGroupMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.group; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 用户分组 Mapper - * - * @author owen - */ -@Mapper -public interface MemberGroupMapper extends BaseMapperX { - - default PageResult selectPage(MemberGroupPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MemberGroupDO::getName, reqVO.getName()) - .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus()) - .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberGroupDO::getId)); - } - - default List selectListByStatus(Integer status) { - return selectList(MemberGroupDO::getStatus, status); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberExperienceRecordMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberExperienceRecordMapper.java deleted file mode 100644 index 6cfbdad..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberExperienceRecordMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.level; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 会员经验记录 Mapper - * - * @author owen - */ -@Mapper -public interface MemberExperienceRecordMapper extends BaseMapperX { - - default PageResult selectPage(MemberExperienceRecordPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MemberExperienceRecordDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberExperienceRecordDO::getBizId, reqVO.getBizId()) - .eqIfPresent(MemberExperienceRecordDO::getBizType, reqVO.getBizType()) - .eqIfPresent(MemberExperienceRecordDO::getTitle, reqVO.getTitle()) - .betweenIfPresent(MemberExperienceRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberExperienceRecordDO::getId)); - } - - default PageResult selectPage(Long userId, PageParam pageParam) { - return selectPage(pageParam, new LambdaQueryWrapper() - .eq(MemberExperienceRecordDO::getUserId, userId) - .orderByDesc(MemberExperienceRecordDO::getId)); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelMapper.java deleted file mode 100644 index 7f8a65b..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelMapper.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.level; - -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 会员等级 Mapper - * - * @author owen - */ -@Mapper -public interface MemberLevelMapper extends BaseMapperX { - - default List selectList(MemberLevelListReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(MemberLevelDO::getName, reqVO.getName()) - .eqIfPresent(MemberLevelDO::getStatus, reqVO.getStatus()) - .orderByAsc(MemberLevelDO::getLevel)); - } - - - default List selectListByStatus(Integer status) { - return selectList(new LambdaQueryWrapperX() - .eq(MemberLevelDO::getStatus, status) - .orderByAsc(MemberLevelDO::getLevel)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelRecordMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelRecordMapper.java deleted file mode 100644 index f51b939..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/level/MemberLevelRecordMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.level; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 会员等级记录 Mapper - * - * @author owen - */ -@Mapper -public interface MemberLevelRecordMapper extends BaseMapperX { - - default PageResult selectPage(MemberLevelRecordPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MemberLevelRecordDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberLevelRecordDO::getLevelId, reqVO.getLevelId()) - .betweenIfPresent(MemberLevelRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberLevelRecordDO::getId)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/point/MemberPointRecordMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/point/MemberPointRecordMapper.java deleted file mode 100644 index e81bfb3..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/point/MemberPointRecordMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.point; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.Set; - -/** - * 用户积分记录 Mapper - * - * @author QingX - */ -@Mapper -public interface MemberPointRecordMapper extends BaseMapperX { - - default PageResult selectPage(MemberPointRecordPageReqVO reqVO, Set userIds) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .inIfPresent(MemberPointRecordDO::getUserId, userIds) - .eqIfPresent(MemberPointRecordDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType()) - .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle()) - .orderByDesc(MemberPointRecordDO::getId)); - } - - default PageResult selectPage(Long userId, AppMemberPointRecordPageReqVO pageReqVO) { - return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eq(MemberPointRecordDO::getUserId, userId) - .betweenIfPresent(MemberPointRecordDO::getCreateTime, pageReqVO.getCreateTime()) - .gt(Boolean.TRUE.equals(pageReqVO.getAddStatus()), - MemberPointRecordDO::getPoint, 0) - .lt(Boolean.FALSE.equals(pageReqVO.getAddStatus()), - MemberPointRecordDO::getPoint, 0) - .orderByDesc(MemberPointRecordDO::getId)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInConfigMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInConfigMapper.java deleted file mode 100644 index ed54acf..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInConfigMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.signin; - -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 签到规则 Mapper - * - * @author QingX - */ -@Mapper -public interface MemberSignInConfigMapper extends BaseMapperX { - - default MemberSignInConfigDO selectByDay(Integer day) { - return selectOne(MemberSignInConfigDO::getDay, day); - } - - default List selectListByStatus(Integer status) { - return selectList(MemberSignInConfigDO::getStatus, status); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInRecordMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInRecordMapper.java deleted file mode 100644 index 76c60c1..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/signin/MemberSignInRecordMapper.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.signin; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Set; - -/** - * 签到记录 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface MemberSignInRecordMapper extends BaseMapperX { - - default PageResult selectPage(MemberSignInRecordPageReqVO reqVO, Set userIds) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .inIfPresent(MemberSignInRecordDO::getUserId, userIds) - .eqIfPresent(MemberSignInRecordDO::getUserId, reqVO.getUserId()) - .eqIfPresent(MemberSignInRecordDO::getDay, reqVO.getDay()) - .betweenIfPresent(MemberSignInRecordDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberSignInRecordDO::getId)); - } - - default PageResult selectPage(Long userId, PageParam pageParam) { - return selectPage(pageParam, new LambdaQueryWrapperX() - .eq(MemberSignInRecordDO::getUserId, userId) - .orderByDesc(MemberSignInRecordDO::getId)); - } - - /** - * 获取用户最近的签到记录信息，根据签到时间倒序 - * - * @param userId 用户编号 - * @return 签到记录列表 - */ - default MemberSignInRecordDO selectLastRecordByUserId(Long userId) { - return selectOne(new QueryWrapper() - .eq("user_id", userId) - .orderByDesc("create_time") - .last("limit 1")); - } - - default Long selectCountByUserId(Long userId) { - return selectCount(MemberSignInRecordDO::getUserId, userId); - } - - /** - * 获取用户的签到记录列表信息 - * - * @param userId 用户编号 - * @return 签到记录信息 - */ - default List selectListByUserId(Long userId) { - return selectList(MemberSignInRecordDO::getUserId, userId); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/tag/MemberTagMapper.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/tag/MemberTagMapper.java deleted file mode 100644 index 8adcd6d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/mysql/tag/MemberTagMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.fjrcloud.community.module.member.dal.mysql.tag; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.mybatis.core.mapper.BaseMapperX; -import com.fjrcloud.community.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 会员标签 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface MemberTagMapper extends BaseMapperX { - - default PageResult selectPage(MemberTagPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MemberTagDO::getName, reqVO.getName()) - .betweenIfPresent(MemberTagDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MemberTagDO::getId)); - } - - default MemberTagDO selelctByName(String name) { - return selectOne(MemberTagDO::getName, name); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/package-info.java deleted file mode 100644 index d01424d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * DAL = Data Access Layer 数据访问层 - * 1. data object：数据对象 - * 2. redis：Redis 的 CRUD 操作 - * 3. mysql：MySQL 的 CRUD 操作 - * - * 其中，MySQL 的表以 member_ 作为前缀 - */ -package com.fjrcloud.community.module.member.dal; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/redis/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/redis/package-info.java deleted file mode 100644 index 36f4698..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/dal/redis/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 占位，后续有类后，可以删除，避免 package 无法提交到 Git 上 - */ -package com.fjrcloud.community.module.member.dal.redis; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/DictTypeConstants.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/DictTypeConstants.java deleted file mode 100644 index 870bff1..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/DictTypeConstants.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fjrcloud.community.module.member.enums; - -/** - * Member 字典类型的枚举类 - * - * @author owen - */ -public interface DictTypeConstants { - - /** - * 会员经验记录 - 业务类型 - */ - String MEMBER_EXPERIENCE_BIZ_TYPE = "member_experience_biz_type"; - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/ErrorCodeConstants.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/ErrorCodeConstants.java deleted file mode 100644 index 1557081..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/ErrorCodeConstants.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.fjrcloud.community.module.member.enums; - -import com.fjrcloud.community.framework.common.exception.ErrorCode; - -/** - * Member 错误码枚举类 - *

- * member 系统，使用 1-004-000-000 段 - */ -public interface ErrorCodeConstants { - - // ========== 用户相关 1-004-001-000 ============ - ErrorCode USER_NOT_EXISTS = new ErrorCode(1_004_001_000, "用户不存在"); - ErrorCode USER_MOBILE_NOT_EXISTS = new ErrorCode(1_004_001_001, "手机号未注册用户"); - ErrorCode USER_MOBILE_USED = new ErrorCode(1_004_001_002, "修改手机失败，该手机号({})已经被使用"); - ErrorCode USER_POINT_NOT_ENOUGH = new ErrorCode(1_004_001_003, "用户积分余额不足"); - - // ========== AUTH 模块 1-004-003-000 ========== - ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_004_003_000, "登录失败，账号密码不正确"); - ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1_004_003_001, "登录失败，账号被禁用"); - ErrorCode AUTH_SOCIAL_USER_NOT_FOUND = new ErrorCode(1_004_003_005, "登录失败，解析不到三方登录信息"); - ErrorCode AUTH_MOBILE_USED = new ErrorCode(1_004_003_007, "手机号已经被使用"); - - // ========== 用户收件地址 1-004-004-000 ========== - ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1_004_004_000, "用户收件地址不存在"); - - //========== 用户标签 1-004-006-000 ========== - ErrorCode TAG_NOT_EXISTS = new ErrorCode(1_004_006_000, "用户标签不存在"); - ErrorCode TAG_NAME_EXISTS = new ErrorCode(1_004_006_001, "用户标签已经存在"); - ErrorCode TAG_HAS_USER = new ErrorCode(1_004_006_002, "用户标签下存在用户，无法删除"); - - //========== 积分配置 1-004-007-000 ========== - - //========== 积分记录 1-004-008-000 ========== - ErrorCode POINT_RECORD_BIZ_NOT_SUPPORT = new ErrorCode(1_004_008_000, "用户积分记录业务类型不支持"); - - //========== 签到配置 1-004-009-000 ========== - ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1_004_009_000, "签到天数规则不存在"); - ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1_004_009_001, "签到天数规则已存在"); - - //========== 签到配置 1-004-010-000 ========== - ErrorCode SIGN_IN_RECORD_TODAY_EXISTS = new ErrorCode(1_004_010_000, "今日已签到，请勿重复签到"); - - //========== 用户等级 1-004-011-000 ========== - ErrorCode LEVEL_NOT_EXISTS = new ErrorCode(1_004_011_000, "用户等级不存在"); - ErrorCode LEVEL_NAME_EXISTS = new ErrorCode(1_004_011_001, "用户等级名称[{}]已被使用"); - ErrorCode LEVEL_VALUE_EXISTS = new ErrorCode(1_004_011_002, "用户等级值[{}]已被[{}]使用"); - ErrorCode LEVEL_EXPERIENCE_MIN = new ErrorCode(1_004_011_003, "升级经验必须大于上一个等级[{}]设置的升级经验[{}]"); - ErrorCode LEVEL_EXPERIENCE_MAX = new ErrorCode(1_004_011_004, "升级经验必须小于下一个等级[{}]设置的升级经验[{}]"); - ErrorCode LEVEL_HAS_USER = new ErrorCode(1_004_011_005, "用户等级下存在用户，无法删除"); - - ErrorCode EXPERIENCE_BIZ_NOT_SUPPORT = new ErrorCode(1_004_011_201, "用户经验业务类型不支持"); - - //========== 用户分组 1-004-012-000 ========== - ErrorCode GROUP_NOT_EXISTS = new ErrorCode(1_004_012_000, "用户分组不存在"); - ErrorCode GROUP_HAS_USER = new ErrorCode(1_004_012_001, "用户分组下存在用户，无法删除"); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/MemberExperienceBizTypeEnum.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/MemberExperienceBizTypeEnum.java deleted file mode 100644 index b406744..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/MemberExperienceBizTypeEnum.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.fjrcloud.community.module.member.enums; - -import cn.hutool.core.util.EnumUtil; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Objects; - -/** - * 会员经验 - 业务类型 - * - * @author owen - */ -@Getter -@AllArgsConstructor -public enum MemberExperienceBizTypeEnum { - - /** - * 管理员调整、邀请新用户、下单、退单、签到、抽奖 - */ - ADMIN(0, "管理员调整", "管理员调整获得 {} 经验", true), - INVITE_REGISTER(1, "邀新奖励", "邀请好友获得 {} 经验", true), - SIGN_IN(4, "签到奖励", "签到获得 {} 经验", true), - LOTTERY(5, "抽奖奖励", "抽奖获得 {} 经验", true), - ORDER_GIVE(11, "下单奖励", "下单获得 {} 经验", true), - ORDER_GIVE_CANCEL(12, "下单奖励（整单取消）", "取消订单获得 {} 经验", false), // ORDER_GIVE 的取消 - ORDER_GIVE_CANCEL_ITEM(13, "下单奖励（单个退款）", "退款订单获得 {} 经验", false), // ORDER_GIVE 的取消 - ; - - /** - * 业务类型 - */ - private final int type; - /** - * 标题 - */ - private final String title; - /** - * 描述 - */ - private final String description; - /** - * 是否为扣减积分 - */ - private final boolean add; - - public static MemberExperienceBizTypeEnum getByType(Integer type) { - return EnumUtil.getBy(MemberExperienceBizTypeEnum.class, - e -> Objects.equals(type, e.getType())); - } -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/point/MemberPointBizTypeEnum.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/point/MemberPointBizTypeEnum.java deleted file mode 100644 index eca0aaf..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/enums/point/MemberPointBizTypeEnum.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.fjrcloud.community.module.member.enums.point; - -import cn.hutool.core.util.EnumUtil; -import com.fjrcloud.community.framework.common.core.ArrayValuable; -import lombok.AllArgsConstructor; -import lombok.Getter; - -import java.util.Objects; - -/** - * 会员积分的业务类型枚举 - * - * @author 芋道源码 - */ -@AllArgsConstructor -@Getter -public enum MemberPointBizTypeEnum implements ArrayValuable { - - SIGN(1, "签到", "签到获得 {} 积分", true), - ADMIN(2, "管理员修改", "管理员修改 {} 积分", true), - - ORDER_USE(11, "订单积分抵扣", "下单使用 {} 积分", false), // 下单时，扣减积分 - ORDER_USE_CANCEL(12, "订单积分抵扣（整单取消）", "订单取消，退还 {} 积分", true), // ORDER_USE 的取消 - ORDER_USE_CANCEL_ITEM(13, "订单积分抵扣（单个退款）", "订单退款，退还 {} 积分", true), // ORDER_USE 的取消 - - ORDER_GIVE(21, "订单积分奖励", "下单获得 {} 积分", true), // 支付订单时，赠送积分 - ORDER_GIVE_CANCEL(22, "订单积分奖励（整单取消）", "订单取消，退还 {} 积分", false), // ORDER_GIVE 的取消 - ORDER_GIVE_CANCEL_ITEM(23, "订单积分奖励（单个退款）", "订单退款，扣除赠送的 {} 积分", false) // ORDER_GIVE 的取消 - ; - - /** - * 类型 - */ - private final Integer type; - /** - * 名字 - */ - private final String name; - /** - * 描述 - */ - private final String description; - /** - * 是否为扣减积分 - */ - private final boolean add; - - @Override - public Integer[] array() { - return new Integer[0]; - } - - public static MemberPointBizTypeEnum getByType(Integer type) { - return EnumUtil.getBy(MemberPointBizTypeEnum.class, - e -> Objects.equals(type, e.getType())); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/package-info.java deleted file mode 100644 index b47c611..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * 属于 member 模块的 framework 封装 - * - * @author 芋道源码 - */ -package com.fjrcloud.community.module.member.framework; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/package-info.java deleted file mode 100644 index 627d920..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * member 模块的 web 配置 - */ -package com.fjrcloud.community.module.member.framework.web; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/consumer/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/consumer/package-info.java deleted file mode 100644 index 78bc617..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/consumer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消费者 - */ -package com.fjrcloud.community.module.member.mq.consumer; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/message/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/message/package-info.java deleted file mode 100644 index 7ec6d29..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/message/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的消息 - */ -package com.fjrcloud.community.module.member.mq.message; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/package-info.java deleted file mode 100644 index b351a7a..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * 消息队列的生产者 - */ -package com.fjrcloud.community.module.member.mq.producer; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/user/MemberUserProducer.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/user/MemberUserProducer.java deleted file mode 100644 index 183cb29..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/mq/producer/user/MemberUserProducer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.fjrcloud.community.module.member.mq.producer.user; - -import com.fjrcloud.community.module.member.api.message.user.MemberUserCreateMessage; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; - -/** - * 会员用户 Producer - * - * @author owen - */ -@Slf4j -@Component -public class MemberUserProducer { - - @Resource - private ApplicationContext applicationContext; - - /** - * 发送 {@link MemberUserCreateMessage} 消息 - * - * @param userId 用户编号 - */ - public void sendUserCreateMessage(Long userId) { - applicationContext.publishEvent(new MemberUserCreateMessage().setUserId(userId)); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/package-info.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/package-info.java deleted file mode 100644 index c4a9a68..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * member 模块，我们放会员业务。 - * 例如说：会员中心等等 - * - * 1. Controller URL：以 /member/ 开头，避免和其它 Module 冲突 - * 2. DataObject 表名：以 member_ 开头，方便在数据库中区分 - */ -package com.fjrcloud.community.module.member; diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressService.java deleted file mode 100644 index cbd23c7..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.fjrcloud.community.module.member.service.address; - -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; - -import javax.validation.Valid; -import java.util.List; - -/** - * 用户收件地址 Service 接口 - * - * @author 芋道源码 - */ -public interface AddressService { - - /** - * 创建用户收件地址 - * - * - * @param userId 用户编号 - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createAddress(Long userId, @Valid AppAddressCreateReqVO createReqVO); - - /** - * 更新用户收件地址 - * - * @param userId 用户编号 - * @param updateReqVO 更新信息 - */ - void updateAddress(Long userId, @Valid AppAddressUpdateReqVO updateReqVO); - - /** - * 删除用户收件地址 - * - * @param userId 用户编号 - * @param id 编号 - */ - void deleteAddress(Long userId, Long id); - - /** - * 获得用户收件地址 - * - * @param id 编号 - * @return 用户收件地址 - */ - MemberAddressDO getAddress(Long userId, Long id); - - /** - * 获得用户收件地址列表 - * - * @param userId 用户编号 - * @return 用户收件地址列表 - */ - List getAddressList(Long userId); - - /** - * 获得用户默认的收件地址 - * - * @param userId 用户编号 - * @return 用户收件地址 - */ - MemberAddressDO getDefaultUserAddress(Long userId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressServiceImpl.java deleted file mode 100644 index 35258a7..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/address/AddressServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.fjrcloud.community.module.member.service.address; - -import cn.hutool.core.collection.CollUtil; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressCreateReqVO; -import com.fjrcloud.community.module.member.controller.app.address.vo.AppAddressUpdateReqVO; -import com.fjrcloud.community.module.member.convert.address.AddressConvert; -import com.fjrcloud.community.module.member.dal.dataobject.address.MemberAddressDO; -import com.fjrcloud.community.module.member.dal.mysql.address.MemberAddressMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS; - -/** - * 用户收件地址 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class AddressServiceImpl implements AddressService { - - @Resource - private MemberAddressMapper memberAddressMapper; - - @Override - @Transactional(rollbackFor = Exception.class) - public Long createAddress(Long userId, AppAddressCreateReqVO createReqVO) { - // 如果添加的是默认收件地址，则将原默认地址修改为非默认 - if (Boolean.TRUE.equals(createReqVO.getDefaultStatus())) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - addresses.forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false))); - } - - // 插入 - MemberAddressDO address = AddressConvert.INSTANCE.convert(createReqVO); - address.setUserId(userId); - memberAddressMapper.insert(address); - // 返回 - return address.getId(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateAddress(Long userId, AppAddressUpdateReqVO updateReqVO) { - // 校验存在,校验是否能够操作 - validAddressExists(userId, updateReqVO.getId()); - - // 如果修改的是默认收件地址，则将原默认地址修改为非默认 - if (Boolean.TRUE.equals(updateReqVO.getDefaultStatus())) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - addresses.stream().filter(u -> !u.getId().equals(updateReqVO.getId())) // 排除自己 - .forEach(address -> memberAddressMapper.updateById(new MemberAddressDO().setId(address.getId()).setDefaultStatus(false))); - } - - // 更新 - MemberAddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO); - memberAddressMapper.updateById(updateObj); - } - - @Override - public void deleteAddress(Long userId, Long id) { - // 校验存在,校验是否能够操作 - validAddressExists(userId, id); - // 删除 - memberAddressMapper.deleteById(id); - } - - private void validAddressExists(Long userId, Long id) { - MemberAddressDO addressDO = getAddress(userId, id); - if (addressDO == null) { - throw exception(ADDRESS_NOT_EXISTS); - } - } - - @Override - public MemberAddressDO getAddress(Long userId, Long id) { - return memberAddressMapper.selectByIdAndUserId(id, userId); - } - - @Override - public List getAddressList(Long userId) { - return memberAddressMapper.selectListByUserIdAndDefaulted(userId, null); - } - - @Override - public MemberAddressDO getDefaultUserAddress(Long userId) { - List addresses = memberAddressMapper.selectListByUserIdAndDefaulted(userId, true); - return CollUtil.getFirst(addresses); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigService.java deleted file mode 100644 index f5abbdb..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fjrcloud.community.module.member.service.config; - -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigSaveReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.config.MemberConfigDO; - -import javax.validation.Valid; - -/** - * 会员配置 Service 接口 - * - * @author QingX - */ -public interface MemberConfigService { - - /** - * 保存会员配置 - * - * @param saveReqVO 更新信息 - */ - void saveConfig(@Valid MemberConfigSaveReqVO saveReqVO); - - /** - * 获得会员配置 - * - * @return 积分配置 - */ - MemberConfigDO getConfig(); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigServiceImpl.java deleted file mode 100644 index 46109b8..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/config/MemberConfigServiceImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.fjrcloud.community.module.member.service.config; - -import com.fjrcloud.community.framework.common.util.collection.CollectionUtils; -import com.fjrcloud.community.module.member.controller.admin.config.vo.MemberConfigSaveReqVO; -import com.fjrcloud.community.module.member.convert.config.MemberConfigConvert; -import com.fjrcloud.community.module.member.dal.dataobject.config.MemberConfigDO; -import com.fjrcloud.community.module.member.dal.mysql.config.MemberConfigMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; - -/** - * 会员配置 Service 实现类 - * - * @author QingX - */ -@Service -@Validated -public class MemberConfigServiceImpl implements MemberConfigService { - - @Resource - private MemberConfigMapper memberConfigMapper; - - @Override - public void saveConfig(MemberConfigSaveReqVO saveReqVO) { - // 存在，则进行更新 - MemberConfigDO dbConfig = getConfig(); - if (dbConfig != null) { - memberConfigMapper.updateById(MemberConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId())); - return; - } - // 不存在，则进行插入 - memberConfigMapper.insert(MemberConfigConvert.INSTANCE.convert(saveReqVO)); - } - - @Override - public MemberConfigDO getConfig() { - List list = memberConfigMapper.selectList(); - return CollectionUtils.getFirst(list); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupService.java deleted file mode 100644 index 8aa2503..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.fjrcloud.community.module.member.service.group; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -/** - * 用户分组 Service 接口 - * - * @author owen - */ -public interface MemberGroupService { - - /** - * 创建用户分组 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createGroup(@Valid MemberGroupCreateReqVO createReqVO); - - /** - * 更新用户分组 - * - * @param updateReqVO 更新信息 - */ - void updateGroup(@Valid MemberGroupUpdateReqVO updateReqVO); - - /** - * 删除用户分组 - * - * @param id 编号 - */ - void deleteGroup(Long id); - - /** - * 获得用户分组 - * - * @param id 编号 - * @return 用户分组 - */ - MemberGroupDO getGroup(Long id); - - /** - * 获得用户分组列表 - * - * @param ids 编号 - * @return 用户分组列表 - */ - List getGroupList(Collection ids); - - /** - * 获得用户分组分页 - * - * @param pageReqVO 分页查询 - * @return 用户分组分页 - */ - PageResult getGroupPage(MemberGroupPageReqVO pageReqVO); - - /** - * 获得指定状态的用户分组列表 - * - * @param status 状态 - * @return 用户分组列表 - */ - List getGroupListByStatus(Integer status); - - /** - * 获得开启状态的用户分组列表 - * - * @return 用户分组列表 - */ - default List getEnableGroupList() { - return getGroupListByStatus(CommonStatusEnum.ENABLE.getStatus()); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupServiceImpl.java deleted file mode 100644 index a547b57..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/group/MemberGroupServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.fjrcloud.community.module.member.service.group; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.group.vo.MemberGroupUpdateReqVO; -import com.fjrcloud.community.module.member.convert.group.MemberGroupConvert; -import com.fjrcloud.community.module.member.dal.dataobject.group.MemberGroupDO; -import com.fjrcloud.community.module.member.dal.mysql.group.MemberGroupMapper; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.GROUP_HAS_USER; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.GROUP_NOT_EXISTS; - -/** - * 用户分组 Service 实现类 - * - * @author owen - */ -@Service -@Validated -public class MemberGroupServiceImpl implements MemberGroupService { - - @Resource - private MemberGroupMapper memberGroupMapper; - - @Resource - private MemberUserService memberUserService; - - @Override - public Long createGroup(MemberGroupCreateReqVO createReqVO) { - // 插入 - MemberGroupDO group = MemberGroupConvert.INSTANCE.convert(createReqVO); - memberGroupMapper.insert(group); - // 返回 - return group.getId(); - } - - @Override - public void updateGroup(MemberGroupUpdateReqVO updateReqVO) { - // 校验存在 - validateGroupExists(updateReqVO.getId()); - // 更新 - MemberGroupDO updateObj = MemberGroupConvert.INSTANCE.convert(updateReqVO); - memberGroupMapper.updateById(updateObj); - } - - @Override - public void deleteGroup(Long id) { - // 校验存在 - validateGroupExists(id); - // 校验分组下是否有用户 - validateGroupHasUser(id); - // 删除 - memberGroupMapper.deleteById(id); - } - - void validateGroupExists(Long id) { - if (memberGroupMapper.selectById(id) == null) { - throw exception(GROUP_NOT_EXISTS); - } - } - - void validateGroupHasUser(Long id) { - Long count = memberUserService.getUserCountByGroupId(id); - if (count > 0) { - throw exception(GROUP_HAS_USER); - } - } - - @Override - public MemberGroupDO getGroup(Long id) { - return memberGroupMapper.selectById(id); - } - - @Override - public List getGroupList(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return ListUtil.empty(); - } - return memberGroupMapper.selectByIds(ids); - } - - @Override - public PageResult getGroupPage(MemberGroupPageReqVO pageReqVO) { - return memberGroupMapper.selectPage(pageReqVO); - } - - @Override - public List getGroupListByStatus(Integer status) { - return memberGroupMapper.selectListByStatus(status); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordService.java deleted file mode 100644 index 058f33d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; - -/** - * 会员经验记录 Service 接口 - * - * @author owen - */ -public interface MemberExperienceRecordService { - - /** - * 获得会员经验记录 - * - * @param id 编号 - * @return 会员经验记录 - */ - MemberExperienceRecordDO getExperienceRecord(Long id); - - /** - * 【管理员】获得会员经验记录分页 - * - * @param pageReqVO 分页查询 - * @return 会员经验记录分页 - */ - PageResult getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO); - - /** - * 【会员】获得会员经验记录分页 - * - * @param userId 用户编号 - * @param pageParam 分页查询 - * @return 会员经验记录分页 - */ - PageResult getExperienceRecordPage(Long userId, PageParam pageParam); - - /** - * 根据业务类型, 创建 经验变动记录 - * - * @param userId 会员编号 - * @param experience 变动经验值 - * @param totalExperience 会员当前的经验 - * @param bizType 业务类型 - * @param bizId 业务ID - */ - void createExperienceRecord(Long userId, Integer experience, Integer totalExperience, - MemberExperienceBizTypeEnum bizType, String bizId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordServiceImpl.java deleted file mode 100644 index 4151673..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberExperienceRecordServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import cn.hutool.core.util.StrUtil; -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.experience.MemberExperienceRecordPageReqVO; -import com.fjrcloud.community.module.member.convert.level.MemberExperienceRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberExperienceRecordDO; -import com.fjrcloud.community.module.member.dal.mysql.level.MemberExperienceRecordMapper; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -/** - * 会员经验记录 Service 实现类 - * - * @author owen - */ -@Service -@Validated -public class MemberExperienceRecordServiceImpl implements MemberExperienceRecordService { - - @Resource - private MemberExperienceRecordMapper experienceLogMapper; - - @Override - public MemberExperienceRecordDO getExperienceRecord(Long id) { - return experienceLogMapper.selectById(id); - } - - @Override - public PageResult getExperienceRecordPage(MemberExperienceRecordPageReqVO pageReqVO) { - return experienceLogMapper.selectPage(pageReqVO); - } - - @Override - public PageResult getExperienceRecordPage(Long userId, PageParam pageParam) { - return experienceLogMapper.selectPage(userId, pageParam); - } - - @Override - public void createExperienceRecord(Long userId, Integer experience, Integer totalExperience, - MemberExperienceBizTypeEnum bizType, String bizId) { - String description = StrUtil.format(bizType.getDescription(), experience); - MemberExperienceRecordDO record = MemberExperienceRecordConvert.INSTANCE.convert( - userId, experience, totalExperience, - bizId, bizType.getType(), bizType.getTitle(), description); - experienceLogMapper.insert(record); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordService.java deleted file mode 100644 index 7cb99c6..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; - -/** - * 会员等级记录 Service 接口 - * - * @author owen - */ -public interface MemberLevelRecordService { - - /** - * 获得会员等级记录 - * - * @param id 编号 - * @return 会员等级记录 - */ - MemberLevelRecordDO getLevelRecord(Long id); - - /** - * 获得会员等级记录分页 - * - * @param pageReqVO 分页查询 - * @return 会员等级记录分页 - */ - PageResult getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO); - - /** - * 创建会员等级记录 - * - * @param levelRecord 会员等级记录 - */ - void createLevelRecord(MemberLevelRecordDO levelRecord); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordServiceImpl.java deleted file mode 100644 index 09ebead..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelRecordServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.level.vo.record.MemberLevelRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; -import com.fjrcloud.community.module.member.dal.mysql.level.MemberLevelRecordMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; - -/** - * 会员等级记录 Service 实现类 - * - * @author owen - */ -@Service -@Validated -public class MemberLevelRecordServiceImpl implements MemberLevelRecordService { - - @Resource - private MemberLevelRecordMapper levelLogMapper; - - @Override - public MemberLevelRecordDO getLevelRecord(Long id) { - return levelLogMapper.selectById(id); - } - - @Override - public PageResult getLevelRecordPage(MemberLevelRecordPageReqVO pageReqVO) { - return levelLogMapper.selectPage(pageReqVO); - } - - @Override - public void createLevelRecord(MemberLevelRecordDO levelRecord) { - levelLogMapper.insert(levelRecord); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelService.java deleted file mode 100644 index c4fb105..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelService.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -/** - * 会员等级 Service 接口 - * - * @author owen - */ -public interface MemberLevelService { - - /** - * 创建会员等级 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createLevel(@Valid MemberLevelCreateReqVO createReqVO); - - /** - * 更新会员等级 - * - * @param updateReqVO 更新信息 - */ - void updateLevel(@Valid MemberLevelUpdateReqVO updateReqVO); - - /** - * 删除会员等级 - * - * @param id 编号 - */ - void deleteLevel(Long id); - - /** - * 获得会员等级 - * - * @param id 编号 - * @return 会员等级 - */ - MemberLevelDO getLevel(Long id); - - /** - * 获得会员等级列表 - * - * @param ids 编号 - * @return 会员等级列表 - */ - List getLevelList(Collection ids); - - /** - * 获得会员等级列表 - * - * @param listReqVO 查询参数 - * @return 会员等级列表 - */ - List getLevelList(MemberLevelListReqVO listReqVO); - - /** - * 获得指定状态的会员等级列表 - * - * @param status 状态 - * @return 会员等级列表 - */ - List getLevelListByStatus(Integer status); - - /** - * 获得开启状态的会员等级列表 - * - * @return 会员等级列表 - */ - default List getEnableLevelList() { - return getLevelListByStatus(CommonStatusEnum.ENABLE.getStatus()); - } - - /** - * 修改会员的等级 - * - * @param updateReqVO 修改参数 - */ - void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO); - - /** - * 增加会员经验 - * - * @param userId 会员ID - * @param experience 经验 - * @param bizType 业务类型 - * @param bizId 业务编号 - */ - void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelServiceImpl.java deleted file mode 100644 index 3bb4916..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/level/MemberLevelServiceImpl.java +++ /dev/null @@ -1,299 +0,0 @@ -package com.fjrcloud.community.module.member.service.level; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.ObjUtil; -import cn.hutool.core.util.ObjectUtil; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelListReqVO; -import com.fjrcloud.community.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO; -import com.fjrcloud.community.module.member.controller.admin.user.vo.MemberUserUpdateLevelReqVO; -import com.fjrcloud.community.module.member.convert.level.MemberLevelConvert; -import com.fjrcloud.community.module.member.convert.level.MemberLevelRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelDO; -import com.fjrcloud.community.module.member.dal.dataobject.level.MemberLevelRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.mysql.level.MemberLevelMapper; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import com.google.common.annotations.VisibleForTesting; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.*; - -/** - * 会员等级 Service 实现类 - * - * @author owen - */ -@Slf4j -@Service -@Validated -public class MemberLevelServiceImpl implements MemberLevelService { - - @Resource - private MemberLevelMapper memberLevelMapper; - - @Resource - private MemberLevelRecordService memberLevelRecordService; - @Resource - private MemberExperienceRecordService memberExperienceRecordService; - @Resource - private MemberUserService memberUserService; - - @Override - public Long createLevel(MemberLevelCreateReqVO createReqVO) { - // 校验配置是否有效 - validateConfigValid(null, createReqVO.getName(), createReqVO.getLevel(), createReqVO.getExperience()); - - // 插入 - MemberLevelDO level = MemberLevelConvert.INSTANCE.convert(createReqVO); - memberLevelMapper.insert(level); - // 返回 - return level.getId(); - } - - @Override - public void updateLevel(MemberLevelUpdateReqVO updateReqVO) { - // 校验存在 - validateLevelExists(updateReqVO.getId()); - // 校验配置是否有效 - validateConfigValid(updateReqVO.getId(), updateReqVO.getName(), updateReqVO.getLevel(), updateReqVO.getExperience()); - - // 更新 - MemberLevelDO updateObj = MemberLevelConvert.INSTANCE.convert(updateReqVO); - memberLevelMapper.updateById(updateObj); - } - - @Override - public void deleteLevel(Long id) { - // 校验存在 - validateLevelExists(id); - // 校验分组下是否有用户 - validateLevelHasUser(id); - // 删除 - memberLevelMapper.deleteById(id); - } - - @VisibleForTesting - MemberLevelDO validateLevelExists(Long id) { - MemberLevelDO levelDO = memberLevelMapper.selectById(id); - if (levelDO == null) { - throw exception(LEVEL_NOT_EXISTS); - } - return levelDO; - } - - @VisibleForTesting - void validateNameUnique(List list, Long id, String name) { - for (MemberLevelDO levelDO : list) { - if (ObjUtil.notEqual(levelDO.getName(), name)) { - continue; - } - if (id == null || !id.equals(levelDO.getId())) { - throw exception(LEVEL_NAME_EXISTS, levelDO.getName()); - } - } - } - - @VisibleForTesting - void validateLevelUnique(List list, Long id, Integer level) { - for (MemberLevelDO levelDO : list) { - if (ObjUtil.notEqual(levelDO.getLevel(), level)) { - continue; - } - - if (id == null || !id.equals(levelDO.getId())) { - throw exception(LEVEL_VALUE_EXISTS, levelDO.getLevel(), levelDO.getName()); - } - } - } - - @VisibleForTesting - void validateExperienceOutRange(List list, Long id, Integer level, Integer experience) { - for (MemberLevelDO levelDO : list) { - if (levelDO.getId().equals(id)) { - continue; - } - - if (levelDO.getLevel() < level) { - // 经验大于前一个等级 - if (experience <= levelDO.getExperience()) { - throw exception(LEVEL_EXPERIENCE_MIN, levelDO.getName(), levelDO.getExperience()); - } - } else if (levelDO.getLevel() > level) { - //小于下一个级别 - if (experience >= levelDO.getExperience()) { - throw exception(LEVEL_EXPERIENCE_MAX, levelDO.getName(), levelDO.getExperience()); - } - } - } - } - - @VisibleForTesting - void validateConfigValid(Long id, String name, Integer level, Integer experience) { - List list = memberLevelMapper.selectList(); - // 校验名称唯一 - validateNameUnique(list, id, name); - // 校验等级唯一 - validateLevelUnique(list, id, level); - // 校验升级所需经验是否有效: 大于前一个等级，小于下一个级别 - validateExperienceOutRange(list, id, level, experience); - } - - @VisibleForTesting - void validateLevelHasUser(Long id) { - Long count = memberUserService.getUserCountByLevelId(id); - if (count > 0) { - throw exception(LEVEL_HAS_USER); - } - } - - @Override - public MemberLevelDO getLevel(Long id) { - return id != null && id > 0 ? memberLevelMapper.selectById(id) : null; - } - - @Override - public List getLevelList(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return Collections.emptyList(); - } - return memberLevelMapper.selectByIds(ids); - } - - @Override - public List getLevelList(MemberLevelListReqVO listReqVO) { - return memberLevelMapper.selectList(listReqVO); - } - - @Override - public List getLevelListByStatus(Integer status) { - return memberLevelMapper.selectListByStatus(status); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO) { - MemberUserDO user = memberUserService.getUser(updateReqVO.getId()); - if (user == null) { - throw exception(USER_NOT_EXISTS); - } - // 等级未发生变化 - if (ObjUtil.equal(user.getLevelId(), updateReqVO.getLevelId())) { - return; - } - - // 1. 记录等级变动 - MemberLevelRecordDO levelRecord = new MemberLevelRecordDO() - .setUserId(user.getId()).setRemark(updateReqVO.getReason()); - MemberLevelDO memberLevel = null; - if (updateReqVO.getLevelId() == null) { - // 取消用户等级时，需要扣减经验 - levelRecord.setExperience(-user.getExperience()); - levelRecord.setUserExperience(0); - levelRecord.setDescription("管理员取消了等级"); - } else { - // 复制等级配置 - memberLevel = validateLevelExists(updateReqVO.getLevelId()); - MemberLevelRecordConvert.INSTANCE.copyTo(memberLevel, levelRecord); - // 变动经验值 = 等级的升级经验 - 会员当前的经验；正数为增加经验，负数为扣减经验 - levelRecord.setExperience(memberLevel.getExperience() - user.getExperience()); - levelRecord.setUserExperience(memberLevel.getExperience()); // 会员当前的经验 = 等级的升级经验 - levelRecord.setDescription("管理员调整为：" + memberLevel.getName()); - } - memberLevelRecordService.createLevelRecord(levelRecord); - - // 2. 记录会员经验变动 - memberExperienceRecordService.createExperienceRecord(user.getId(), - levelRecord.getExperience(), levelRecord.getUserExperience(), - MemberExperienceBizTypeEnum.ADMIN, String.valueOf(MemberExperienceBizTypeEnum.ADMIN.getType())); - - // 3. 更新会员表上的等级编号、经验值 - memberUserService.updateUserLevel(user.getId(), updateReqVO.getLevelId(), - levelRecord.getUserExperience()); - - // 4. 给会员发送等级变动消息 - notifyMemberLevelChange(user.getId(), memberLevel); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void addExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) { - if (experience == 0) { - return; - } - if (!bizType.isAdd() && experience > 0) { - experience = -experience; - } - - // 1. 创建经验记录 - MemberUserDO user = memberUserService.getUser(userId); - Integer userExperience = ObjUtil.defaultIfNull(user.getExperience(), 0); - userExperience = NumberUtil.max(userExperience + experience, 0); // 防止扣出负数 - MemberLevelRecordDO levelRecord = new MemberLevelRecordDO().setUserId(user.getId()) - .setExperience(experience).setUserExperience(userExperience).setLevelId(user.getLevelId()); - memberExperienceRecordService.createExperienceRecord(userId, experience, userExperience, - bizType, bizId); - - // 2.1 保存等级变更记录 - MemberLevelDO newLevel = calculateNewLevel(user, userExperience); - if (newLevel != null) { - MemberLevelRecordConvert.INSTANCE.copyTo(newLevel, levelRecord); - memberLevelRecordService.createLevelRecord(levelRecord); - - // 2.2 给会员发送等级变动消息 - notifyMemberLevelChange(userId, newLevel); - } - - // 3. 更新会员表上的等级编号、经验值 - memberUserService.updateUserLevel(user.getId(), Optional.ofNullable(levelRecord.getLevelId()).orElse(user.getLevelId()), userExperience); - } - - /** - * 计算会员等级 - * - * @param user 会员 - * @param userExperience 会员当前的经验值 - * @return 会员新的等级，null表示无变化 - */ - private MemberLevelDO calculateNewLevel(MemberUserDO user, int userExperience) { - List list = getEnableLevelList(); - if (CollUtil.isEmpty(list)) { - log.warn("计算会员等级失败：会员等级配置不存在"); - return null; - } - - MemberLevelDO matchLevel = list.stream() - .filter(level -> userExperience >= level.getExperience()) - .max(Comparator.nullsFirst(Comparator.comparing(MemberLevelDO::getLevel))) - .orElse(null); - if (matchLevel == null) { - log.warn("计算会员等级失败：未找到会员{}经验{}对应的等级配置", user.getId(), userExperience); - return null; - } - - // 等级没有变化 - if (ObjectUtil.equal(matchLevel.getId(), user.getLevelId())) { - return null; - } - - return matchLevel; - } - - private void notifyMemberLevelChange(Long userId, MemberLevelDO level) { - //todo: 给会员发消息 - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordService.java deleted file mode 100644 index 29e460d..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.fjrcloud.community.module.member.service.point; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; - -/** - * 用户积分记录 Service 接口 - * - * @author QingX - */ -public interface MemberPointRecordService { - - /** - * 【管理员】获得积分记录分页 - * - * @param pageReqVO 分页查询 - * @return 签到记录分页 - */ - PageResult getPointRecordPage(MemberPointRecordPageReqVO pageReqVO); - - /** - * 【会员】获得积分记录分页 - * - * @param userId 用户编号 - * @param pageReqVO 分页查询 - * @return 签到记录分页 - */ - PageResult getPointRecordPage(Long userId, AppMemberPointRecordPageReqVO pageReqVO); - - /** - * 创建用户积分记录 - * - * @param userId 用户ID - * @param point 变动积分 - * @param bizType 业务类型 - * @param bizId 业务编号 - */ - void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId); -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordServiceImpl.java deleted file mode 100644 index 01651c0..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/point/MemberPointRecordServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.fjrcloud.community.module.member.service.point; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.point.vo.AppMemberPointRecordPageReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.point.MemberPointRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.mysql.point.MemberPointRecordMapper; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Set; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertSet; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.USER_POINT_NOT_ENOUGH; - - -/** - * 积分记录 Service 实现类 - * - * @author QingX - */ -@Slf4j -@Service -@Validated -public class MemberPointRecordServiceImpl implements MemberPointRecordService { - - @Resource - private MemberPointRecordMapper memberPointRecordMapper; - - @Resource - private MemberUserService memberUserService; - - @Override - public PageResult getPointRecordPage(MemberPointRecordPageReqVO pageReqVO) { - // 根据用户昵称查询出用户 ids - Set userIds = null; - if (StringUtils.isNotBlank(pageReqVO.getNickname())) { - List users = memberUserService.getUserListByNickname(pageReqVO.getNickname()); - // 如果查询用户结果为空直接返回无需继续查询 - if (CollectionUtils.isEmpty(users)) { - return PageResult.empty(); - } - userIds = convertSet(users, MemberUserDO::getId); - } - // 执行查询 - return memberPointRecordMapper.selectPage(pageReqVO, userIds); - } - - @Override - public PageResult getPointRecordPage(Long userId, AppMemberPointRecordPageReqVO pageReqVO) { - return memberPointRecordMapper.selectPage(userId, pageReqVO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId) { - if (point == 0) { - return; - } - // 1. 校验用户积分余额 - MemberUserDO user = memberUserService.getUser(userId); - Integer userPoint = ObjectUtil.defaultIfNull(user.getPoint(), 0); - int totalPoint = userPoint + point; // 用户变动后的积分 - if (totalPoint < 0) { - log.error("[createPointRecord][userId({}) point({}) bizType({}) bizId({}) {}]", userId, point, bizType, bizId, - USER_POINT_NOT_ENOUGH); - return; - } - - // 2. 更新用户积分 - boolean success = memberUserService.updateUserPoint(userId, point); - if (!success) { - throw exception(USER_POINT_NOT_ENOUGH); - } - - // 3. 增加积分记录 - MemberPointRecordDO record = new MemberPointRecordDO() - .setUserId(userId).setBizId(bizId).setBizType(bizType.getType()) - .setTitle(bizType.getName()).setDescription(StrUtil.format(bizType.getDescription(), point)) - .setPoint(point).setTotalPoint(totalPoint); - memberPointRecordMapper.insert(record); - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigService.java deleted file mode 100644 index aa2cbb1..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fjrcloud.community.module.member.service.signin; - -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; - -import javax.validation.Valid; -import java.util.List; - -/** - * 签到规则 Service 接口 - * - * @author QingX - */ -public interface MemberSignInConfigService { - - /** - * 创建签到规则 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createSignInConfig(@Valid MemberSignInConfigCreateReqVO createReqVO); - - /** - * 更新签到规则 - * - * @param updateReqVO 更新信息 - */ - void updateSignInConfig(@Valid MemberSignInConfigUpdateReqVO updateReqVO); - - /** - * 删除签到规则 - * - * @param id 编号 - */ - void deleteSignInConfig(Long id); - - /** - * 获得签到规则 - * - * @param id 编号 - * @return 签到规则 - */ - MemberSignInConfigDO getSignInConfig(Long id); - - /** - * 获得签到规则列表 - * - * @return 签到规则分页 - */ - List getSignInConfigList(); - - /** - * 获得签到规则列表 - * - * @param status 状态 - * @return 签到规则分页 - */ - List getSignInConfigList(Integer status); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigServiceImpl.java deleted file mode 100644 index 1d800de..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInConfigServiceImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.fjrcloud.community.module.member.service.signin; - -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInConfigConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import com.fjrcloud.community.module.member.dal.mysql.signin.MemberSignInConfigMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Comparator; -import java.util.List; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.SIGN_IN_CONFIG_EXISTS; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.SIGN_IN_CONFIG_NOT_EXISTS; - -/** - * 签到规则 Service 实现类 - * - * @author QingX - */ -@Service -@Validated -public class MemberSignInConfigServiceImpl implements MemberSignInConfigService { - - @Resource - private MemberSignInConfigMapper memberSignInConfigMapper; - - @Override - public Long createSignInConfig(MemberSignInConfigCreateReqVO createReqVO) { - // 判断是否重复插入签到天数 - validateSignInConfigDayDuplicate(createReqVO.getDay(), null); - - // 插入 - MemberSignInConfigDO signInConfig = MemberSignInConfigConvert.INSTANCE.convert(createReqVO); - memberSignInConfigMapper.insert(signInConfig); - // 返回 - return signInConfig.getId(); - } - - @Override - public void updateSignInConfig(MemberSignInConfigUpdateReqVO updateReqVO) { - // 校验存在 - validateSignInConfigExists(updateReqVO.getId()); - // 判断是否重复插入签到天数 - validateSignInConfigDayDuplicate(updateReqVO.getDay(), updateReqVO.getId()); - - // 判断更新 - MemberSignInConfigDO updateObj = MemberSignInConfigConvert.INSTANCE.convert(updateReqVO); - memberSignInConfigMapper.updateById(updateObj); - } - - @Override - public void deleteSignInConfig(Long id) { - // 校验存在 - validateSignInConfigExists(id); - // 删除 - memberSignInConfigMapper.deleteById(id); - } - - private void validateSignInConfigExists(Long id) { - if (memberSignInConfigMapper.selectById(id) == null) { - throw exception(SIGN_IN_CONFIG_NOT_EXISTS); - } - } - - /** - * 校验 day 是否重复 - * - * @param day 天 - * @param id 编号，只有更新的时候会传递 - */ - private void validateSignInConfigDayDuplicate(Integer day, Long id) { - MemberSignInConfigDO config = memberSignInConfigMapper.selectByDay(day); - // 1. 新增时，config 非空，则说明重复 - if (id == null && config != null) { - throw exception(SIGN_IN_CONFIG_EXISTS); - } - // 2. 更新时，如果 config 非空，且 id 不相等，则说明重复 - if (id != null && config != null && !config.getId().equals(id)) { - throw exception(SIGN_IN_CONFIG_EXISTS); - } - } - - @Override - public MemberSignInConfigDO getSignInConfig(Long id) { - return memberSignInConfigMapper.selectById(id); - } - - @Override - public List getSignInConfigList() { - List list = memberSignInConfigMapper.selectList(); - list.sort(Comparator.comparing(MemberSignInConfigDO::getDay)); - return list; - } - - @Override - public List getSignInConfigList(Integer status) { - List list = memberSignInConfigMapper.selectListByStatus(status); - list.sort(Comparator.comparing(MemberSignInConfigDO::getDay)); - return list; - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordService.java deleted file mode 100644 index badb200..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordService.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.fjrcloud.community.module.member.service.signin; - -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; - -/** - * 签到记录 Service 接口 - * - * @author 芋道源码 - */ -public interface MemberSignInRecordService { - - /** - * 【管理员】获得签到记录分页 - * - * @param pageReqVO 分页查询 - * @return 签到记录分页 - */ - PageResult getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO); - - /** - * 【会员】获得签到记录分页 - * - * @param userId 用户编号 - * @param pageParam 分页查询 - * @return 签到记录分页 - */ - PageResult getSignRecordPage(Long userId, PageParam pageParam); - - /** - * 创建签到记录 - * - * @param userId 用户编号 - * @return 签到记录 - */ - MemberSignInRecordDO createSignRecord(Long userId); - - /** - * 根据用户编号，获得个人签到统计信息 - * - * @param userId 用户编号 - * @return 个人签到统计信息 - */ - AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId); - - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordServiceImpl.java deleted file mode 100644 index 18967c8..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/signin/MemberSignInRecordServiceImpl.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.fjrcloud.community.module.member.service.signin; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjUtil; -import com.fjrcloud.community.framework.common.enums.CommonStatusEnum; -import com.fjrcloud.community.framework.common.pojo.PageParam; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.framework.common.util.date.DateUtils; -import com.fjrcloud.community.framework.common.util.object.ObjectUtils; -import com.fjrcloud.community.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO; -import com.fjrcloud.community.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO; -import com.fjrcloud.community.module.member.convert.signin.MemberSignInRecordConvert; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInConfigDO; -import com.fjrcloud.community.module.member.dal.dataobject.signin.MemberSignInRecordDO; -import com.fjrcloud.community.module.member.dal.dataobject.user.MemberUserDO; -import com.fjrcloud.community.module.member.dal.mysql.signin.MemberSignInRecordMapper; -import com.fjrcloud.community.module.member.enums.MemberExperienceBizTypeEnum; -import com.fjrcloud.community.module.member.enums.point.MemberPointBizTypeEnum; -import com.fjrcloud.community.module.member.service.level.MemberLevelService; -import com.fjrcloud.community.module.member.service.point.MemberPointRecordService; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Set; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.framework.common.util.collection.CollectionUtils.convertSet; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.SIGN_IN_RECORD_TODAY_EXISTS; - -/** - * 签到记录 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MemberSignInRecordServiceImpl implements MemberSignInRecordService { - - @Resource - private MemberSignInRecordMapper signInRecordMapper; - @Resource - private MemberSignInConfigService signInConfigService; - @Resource - private MemberPointRecordService pointRecordService; - @Resource - private MemberLevelService memberLevelService; - - @Resource - private MemberUserService memberUserService; - - @Override - public AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId) { - // 1. 初始化默认返回信息 - AppMemberSignInRecordSummaryRespVO summary = new AppMemberSignInRecordSummaryRespVO(); - summary.setTotalDay(0); - summary.setContinuousDay(0); - summary.setTodaySignIn(false); - - // 2. 获取用户签到的记录数 - Long signCount = signInRecordMapper.selectCountByUserId(userId); - if (ObjUtil.equal(signCount, 0L)) { - return summary; - } - summary.setTotalDay(signCount.intValue()); // 设置总签到天数 - - // 3. 校验当天是否有签到 - MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserId(userId); - if (lastRecord == null) { - return summary; - } - summary.setTodaySignIn(DateUtils.isToday(lastRecord.getCreateTime())); - - // 4.1 检查今天是否未签到且记录不是昨天创建的，如果是则直接返回 - if (!summary.getTodaySignIn() && !DateUtils.isYesterday(lastRecord.getCreateTime())) { - return summary; - } - - // 4.2 要么是今天签到了，要么是昨天的记录，设置连续签到天数 - summary.setContinuousDay(lastRecord.getDay()); - return summary; - } - - @Override - public PageResult getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) { - // 根据用户昵称查询出用户ids - Set userIds = null; - if (StringUtils.isNotBlank(pageReqVO.getNickname())) { - List users = memberUserService.getUserListByNickname(pageReqVO.getNickname()); - // 如果查询用户结果为空直接返回无需继续查询 - if (CollUtil.isEmpty(users)) { - return PageResult.empty(); - } - userIds = convertSet(users, MemberUserDO::getId); - } - // 分页查询 - return signInRecordMapper.selectPage(pageReqVO, userIds); - } - - @Override - public PageResult getSignRecordPage(Long userId, PageParam pageParam) { - return signInRecordMapper.selectPage(userId, pageParam); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public MemberSignInRecordDO createSignRecord(Long userId) { - // 1. 获取当前用户最近的签到 - MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserId(userId); - // 1.1. 判断是否重复签到 - validateSigned(lastRecord); - - // 2.1. 获取所有的签到规则 - List signInConfigs = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus()); - // 2.2. 组合数据 - MemberSignInRecordDO record = MemberSignInRecordConvert.INSTANCE.convert(userId, lastRecord, signInConfigs); - - // 3. 插入签到记录 - signInRecordMapper.insert(record); - - // 4. 增加积分 - if (!ObjectUtils.equalsAny(record.getPoint(), null, 0)) { - pointRecordService.createPointRecord(userId, record.getPoint(), MemberPointBizTypeEnum.SIGN, String.valueOf(record.getId())); - } - // 5. 增加经验 - if (!ObjectUtils.equalsAny(record.getExperience(), null, 0)) { - memberLevelService.addExperience(userId, record.getExperience(), MemberExperienceBizTypeEnum.SIGN_IN, String.valueOf(record.getId())); - } - return record; - } - - private void validateSigned(MemberSignInRecordDO signInRecordDO) { - if (signInRecordDO == null) { - return; - } - if (DateUtils.isToday(signInRecordDO.getCreateTime())) { - throw exception(SIGN_IN_RECORD_TODAY_EXISTS); - } - } - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagService.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagService.java deleted file mode 100644 index dcf2c87..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagService.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.fjrcloud.community.module.member.service.tag; - -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; - -import javax.validation.Valid; -import java.util.Collection; -import java.util.List; - -/** - * 会员标签 Service 接口 - * - * @author 芋道源码 - */ -public interface MemberTagService { - - /** - * 创建会员标签 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - Long createTag(@Valid MemberTagCreateReqVO createReqVO); - - /** - * 更新会员标签 - * - * @param updateReqVO 更新信息 - */ - void updateTag(@Valid MemberTagUpdateReqVO updateReqVO); - - /** - * 删除会员标签 - * - * @param id 编号 - */ - void deleteTag(Long id); - - /** - * 获得会员标签 - * - * @param id 编号 - * @return 会员标签 - */ - MemberTagDO getTag(Long id); - - /** - * 获得会员标签列表 - * - * @param ids 编号 - * @return 会员标签列表 - */ - List getTagList(Collection ids); - - /** - * 获得会员标签分页 - * - * @param pageReqVO 分页查询 - * @return 会员标签分页 - */ - PageResult getTagPage(MemberTagPageReqVO pageReqVO); - - /** - * 获取标签列表 - * - * @return 标签列表 - */ - List getTagList(); - -} diff --git a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagServiceImpl.java b/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagServiceImpl.java deleted file mode 100644 index cb3976c..0000000 --- a/fjrcloud-module-member/src/main/java/com/fjrcloud/community/module/member/service/tag/MemberTagServiceImpl.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.fjrcloud.community.module.member.service.tag; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.util.StrUtil; -import com.fjrcloud.community.framework.common.pojo.PageResult; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagCreateReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagPageReqVO; -import com.fjrcloud.community.module.member.controller.admin.tag.vo.MemberTagUpdateReqVO; -import com.fjrcloud.community.module.member.convert.tag.MemberTagConvert; -import com.fjrcloud.community.module.member.dal.dataobject.tag.MemberTagDO; -import com.fjrcloud.community.module.member.dal.mysql.tag.MemberTagMapper; -import com.fjrcloud.community.module.member.service.user.MemberUserService; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.fjrcloud.community.module.member.enums.ErrorCodeConstants.*; - -/** - * 会员标签 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class MemberTagServiceImpl implements MemberTagService { - - @Resource - private MemberTagMapper memberTagMapper; - - @Resource - private MemberUserService memberUserService; - - @Override - public Long createTag(MemberTagCreateReqVO createReqVO) { - // 校验名称唯一 - validateTagNameUnique(null, createReqVO.getName()); - // 插入 - MemberTagDO tag = MemberTagConvert.INSTANCE.convert(createReqVO); - memberTagMapper.insert(tag); - // 返回 - return tag.getId(); - } - - @Override - public void updateTag(MemberTagUpdateReqVO updateReqVO) { - // 校验存在 - validateTagExists(updateReqVO.getId()); - // 校验名称唯一 - validateTagNameUnique(updateReqVO.getId(), updateReqVO.getName()); - // 更新 - MemberTagDO updateObj = MemberTagConvert.INSTANCE.convert(updateReqVO); - memberTagMapper.updateById(updateObj); - } - - @Override - public void deleteTag(Long id) { - // 校验存在 - validateTagExists(id); - // 校验标签下是否有用户 - validateTagHasUser(id); - // 删除 - memberTagMapper.deleteById(id); - } - - private void validateTagExists(Long id) { - if (memberTagMapper.selectById(id) == null) { - throw exception(TAG_NOT_EXISTS); - } - } - - private void validateTagNameUnique(Long id, String name) { - if (StrUtil.isBlank(name)) { - return; - } - MemberTagDO tag = memberTagMapper.selelctByName(name); - if (tag == null) { - return; - } - - // 如果 id 为空，说明不用比较是否为相同 id 的标签 - if (id == null) { - throw exception(TAG_NAME_EXISTS); - } - if (!tag.getId().equals(id)) { - throw exception(TAG_NAME_EXISTS); - } - } - - void validateTagHasUser(Long id) { - Long count = memberUserService.getUserCountByTagId(id); - if (count > 0) { - throw exception(TAG_HAS_USER); - } - } - - @Override - public MemberTagDO getTag(Long id) { - return memberTagMapper.selectById(id); - } - - @Override - public List getTagList(Collection ids) { - if (CollUtil.isEmpty(ids)) { - return ListUtil.empty(); - } - return memberTagMapper.selectByIds(ids); - } - - @Override - public PageResult getTagPage(MemberTagPageReqVO pageReqVO) { - return memberTagMapper.selectPage(pageReqVO); - } - - @Override - public List getTagList() { - return memberTagMapper.selectList(); - } - -} diff --git a/fjrcloud-module-member/src/test/resources/application-unit-test.yaml b/fjrcloud-module-member/src/test/resources/application-unit-test.yaml deleted file mode 100644 index 4d6abea..0000000 --- a/fjrcloud-module-member/src/test/resources/application-unit-test.yaml +++ /dev/null @@ -1,47 +0,0 @@ -spring: - main: - lazy-initialization: true # 开启懒加载，加快速度 - banner-mode: off # 单元测试，禁用 Banner - ---- #################### 数据库相关配置 #################### - -spring: - # 数据源配置项 - datasource: - name: ruoyi-vue-pro - url: jdbc:h2:mem:testdb;MODE=MYSQL;DATABASE_TO_UPPER=false;NON_KEYWORDS=value; # MODE 使用 MySQL 模式；DATABASE_TO_UPPER 配置表和字段使用小写 - driver-class-name: org.h2.Driver - username: sa - password: - druid: - async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度 - initial-size: 1 # 单元测试，配置为 1，提升启动速度 - sql: - init: - schema-locations: classpath:/sql/create_tables.sql - - # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - redis: - host: 127.0.0.1 # 地址 - port: 16379 # 端口（单元测试，使用 16379 端口） - database: 0 # 数据库索引 - -mybatis: - lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 - ---- #################### 定时任务相关配置 #################### - ---- #################### 配置中心相关配置 #################### - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项（单元测试，禁用 Lock4j） - ---- #################### 监控相关配置 #################### - ---- #################### 芋道相关配置 #################### - -# 芋道配置项，设置当前项目所有自定义的配置 -yudao: - info: - base-package: com.fjrcloud.community.module diff --git a/fjrcloud-module-member/src/test/resources/logback.xml b/fjrcloud-module-member/src/test/resources/logback.xml deleted file mode 100644 index daf756b..0000000 --- a/fjrcloud-module-member/src/test/resources/logback.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/fjrcloud-module-member/src/test/resources/sql/clean.sql b/fjrcloud-module-member/src/test/resources/sql/clean.sql deleted file mode 100644 index f972e04..0000000 --- a/fjrcloud-module-member/src/test/resources/sql/clean.sql +++ /dev/null @@ -1,5 +0,0 @@ -DELETE FROM "member_user"; -DELETE FROM "member_address"; -DELETE FROM "member_tag"; -DELETE FROM "member_level"; -DELETE FROM "member_group"; \ No newline at end of file diff --git a/fjrcloud-module-member/src/test/resources/sql/create_tables.sql b/fjrcloud-module-member/src/test/resources/sql/create_tables.sql deleted file mode 100644 index 378999d..0000000 --- a/fjrcloud-module-member/src/test/resources/sql/create_tables.sql +++ /dev/null @@ -1,113 +0,0 @@ -CREATE TABLE IF NOT EXISTS `member_user` -( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - `nickname` varchar(30) NOT NULL DEFAULT '' COMMENT '用户昵称', - `name` varchar(30) NULL COMMENT '真实名字', - sex tinyint null comment '性别', - birthday datetime null comment '出生日期', - area_id int null comment '所在地', - mark varchar(255) null comment '用户备注', - point int default 0 null comment '积分', - `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '头像', - `status` tinyint NOT NULL COMMENT '状态', - `mobile` varchar(11) NOT NULL COMMENT '手机号', - `password` varchar(100) NOT NULL DEFAULT '' COMMENT '密码', - `register_ip` varchar(32) NOT NULL COMMENT '注册 IP', - `login_ip` varchar(50) NULL DEFAULT '' COMMENT '最后登录IP', - `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间', - `tag_ids` varchar(255) NULL DEFAULT NULL COMMENT '用户标签编号列表,以逗号分隔', - `level_id` bigint NULL DEFAULT NULL COMMENT '等级编号', - `experience` bigint NULL DEFAULT NULL COMMENT '经验', - `group_id` bigint NULL DEFAULT NULL COMMENT '用户分组编号', - `creator` varchar(64) NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT 0 COMMENT '是否删除', - `tenant_id` bigint not null default 0, - PRIMARY KEY (`id`) - ) COMMENT '会员表'; -CREATE TABLE IF NOT EXISTS `member_address` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `user_id` bigint(20) NOT NULL, - `name` varchar(10) NOT NULL, - `mobile` varchar(20) NOT NULL, - `area_id` bigint(20) NOT NULL, - `detail_address` varchar(250) NOT NULL, - `default_status` bit NOT NULL, - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `creator` varchar(64) DEFAULT '', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` bit NOT NULL DEFAULT FALSE, - `updater` varchar(64) DEFAULT '', - PRIMARY KEY (`id`) - ) COMMENT '用户收件地址'; - -CREATE TABLE IF NOT EXISTS `member_tag` -( - `id` bigint NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL, - `creator` varchar(50) DEFAULT '', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updater` varchar(50) DEFAULT '', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` bit NOT NULL DEFAULT FALSE, - `tenant_id` bigint NOT NULL default 0, - PRIMARY KEY (`id`) - ) COMMENT '会员标签'; - -CREATE TABLE IF NOT EXISTS `member_level` -( - `id` bigint NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL, - `experience` int NOT NULL, - `level` int NOT NULL, - `discount_percent` int NOT NULL, - `icon` varchar(50) NOT NULL, - `background_url` varchar(50) NOT NULL, - `creator` varchar(50) DEFAULT '', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updater` varchar(50) DEFAULT '', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` bit NOT NULL DEFAULT FALSE, - `tenant_id` bigint not null default 0, - `status` tinyint NOT NULL DEFAULT 0, - PRIMARY KEY (`id`) - ) COMMENT '会员等级'; - -CREATE TABLE IF NOT EXISTS `member_group` -( - `id` bigint NOT NULL AUTO_INCREMENT, - `name` varchar(50) NOT NULL, - `remark` varchar(50) NOT NULL, - `status` tinyint NOT NULL DEFAULT 0, - `creator` varchar(50) DEFAULT '', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updater` varchar (50) DEFAULT '', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` bit NOT NULL DEFAULT FALSE, - `tenant_id` bigint not null default 0, - PRIMARY KEY (`id`) - ) COMMENT '用户分组'; -CREATE TABLE IF NOT EXISTS `member_brokerage_record` -( - `id` int NOT NULL AUTO_INCREMENT, - `user_id` bigint NOT NULL, - `biz_id` varchar(50) NOT NULL, - `biz_type` varchar(50) NOT NULL, - `title` varchar(50) NOT NULL, - `price` int NOT NULL, - `total_price` int NOT NULL, - `description` varchar(50) NOT NULL, - `status` varchar(50) NOT NULL, - `frozen_days` int NOT NULL, - `unfreeze_time` varchar(50), - `creator` varchar(50) DEFAULT '', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `updater` varchar(50) DEFAULT '', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `deleted` bit NOT NULL DEFAULT FALSE, - `tenant_id` bigint not null default 0, - PRIMARY KEY (`id`) - ) COMMENT '佣金记录'; -s \ No newline at end of file diff --git a/fjrcloud-server/pom.xml b/fjrcloud-server/pom.xml index d8ca32d..212caa6 100644 --- a/fjrcloud-server/pom.xml +++ b/fjrcloud-server/pom.xml @@ -31,13 +31,6 @@ ${revision} - - - com.fjrcloud.boot - fjrcloud-module-member - ${revision} - - diff --git a/pom.xml b/pom.xml index d87927a..87dcf97 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ fjrcloud-module-system fjrcloud-module-infra - fjrcloud-module-member fjrcloud-module-community