From 437a8ae4bcca79e8886662a40c11f499fea1a25e Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 20 四月 2023 18:43:37 +0800
Subject: [PATCH] 小程序首页
---
hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppHomeController.java | 165 ++
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelNurseMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponServiceImpl.java | 2
hrt-modules/hrt-system/src/main/resources/mapper/system/sys/QuickEntryMapper.xml | 12
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelTagMapper.java | 2
hrt-modules/hrt-system/src/main/resources/mapper/system/shop/ShopCertificateMapper.xml | 7
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/CustomeConfig.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelUserMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchiveFields.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppNearbyShopVo.java | 32
hrt-auth/src/main/java/com/hrt/auth/service/SysLoginService.java | 37
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/UserCouponService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ShoppingCartService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysTagMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderService.java | 2
hrt-modules/hrt-system/src/main/resources/mapper/system/sys/BannerMapper.xml | 13
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AdvertMapper.java | 22
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/BannerMapper.java | 11
hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/HttpStatus.java | 91 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsFileService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopService.java | 9
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTaskServiceImpl.java | 2
hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginVo.java | 28
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTask.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppUserAuthorizeDto.java | 23
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveFieldsMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Pop.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelUserMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleActivityGoodsVo.java | 55
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponTotalService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/UserCoupon.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderGoodsService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ConsumerGoodsService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopCertificate.java | 74 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/PopMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/PopServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopFile.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAgreementVo.java | 21
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysTagService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/CodeEnum.java | 52
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelTag.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTransferRecord.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopGoods.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ConsumerGoods.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskRecordService.java | 2
hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/factory/RemoteUserFallbackFactory.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppMiniLoginDto.java | 19
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTaskRecord.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopMarketing.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberNurseService.java | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsMapper.java | 40
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelTagService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseGetDto.java | 19
hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppConfigController.java | 55
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppAgreementDto.java | 20
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveFieldsService.java | 3
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTransferRecordServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopFileService.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelUser.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppShopGoodsPageDto.java | 30
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysClassificationMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ShoppingCartMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/QuickEntryMapper.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/UserCouponMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Agreement.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopFileMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppGoodsInfoVo.java | 53
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/OrderGoods.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserServiceRecordServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberService.java | 42
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/Shop.java | 13
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelGoodsMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppSearchGoodsPageDto.java | 22
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsServiceImpl.java | 93 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CustomeConfigServiceImpl.java | 3
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/TaskFileMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleGoodsVo.java | 43
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelUserServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveFieldsServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelTagServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchive.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTaskService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/BannerServiceImpl.java | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskRecordMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskRecordServiceImpl.java | 2
hrt-modules/hrt-system/pom.xml | 20
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberNurseServiceImpl.java | 21
hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginDto.java | 19
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopServiceImpl.java | 58 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Advert.java | 82 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelGoods.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AdvertService.java | 23
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsService.java | 49
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/Goods.java | 20
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/config/AppConfig.java | 35
hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AgreementMapper.xml | 3
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysTag.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelTagMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserPostMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/TaskFileService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppQuickEntryVo.java | 36
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/TaskFileServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMarketingMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppBannerVo.java | 38
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponTotal.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberNurse.java | 54
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ConsumerGoodsServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberServiceImpl.java | 186 +++
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShoppingCartServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/UserServiceRecordService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ConsumerGoodsMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponTotalMapper.java | 2
hrt-common/hrt-common-security/src/main/java/com/hrt/common/security/service/TokenService.java | 31
hrt-api/hrt-api-system/pom.xml | 7
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AgreementServiceImpl.java | 26
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopCertificateService.java | 25
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponTotalServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserCouponServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelNurseServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/BannerService.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/CustomeConfigMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTaskMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsTotal.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppMiniLoginVo.java | 28
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelGoodsServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/Order.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelTag.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/sys/SysUserController.java | 21
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsTotalMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/SecurityConstant.java | 33
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/UserServiceRecord.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelUser.java | 10
hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberMapper.xml | 9
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysClassificationService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsFile.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberNurseMapper.java | 16
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelNurseService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AgreementService.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTask.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderGoodsServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/PopService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelUserService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopMarketingService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/TaskFile.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopCertificateServiceImpl.java | 39
hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AdvertMapper.xml | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Banner.java | 14
hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/RemoteUserService.java | 11
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/QuickEntry.java | 12
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsFileMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTransferRecordService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AgreementMapper.java | 10
hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberNurseMapper.xml | 7
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/QuickEntryService.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/QuickEntryServiceImpl.java | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppNearbyShopDto.java | 23
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsTotalServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopGoodsMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsFileServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppPageDto.java | 23
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/CustomeConfigService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopFileServiceImpl.java | 20
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysClassificationServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppGoodsInfoGetDto.java | 19
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AdvertServiceImpl.java | 34
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberMapper.java | 25
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopGoodsService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppUserAuthorizeVo.java | 27
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelNurse.java | 14
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAdvertVo.java | 37
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopGoodsServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ShoppingCart.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTransferRecordMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysClassification.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/UserServiceRecordMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsTotalService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserRoleMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelTagService.java | 10
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/Coupon.java | 8
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopCertificateMapper.java | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysTagServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseDto.java | 19
hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppGoodsController.java | 41
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelGoodsService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelUserService.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopMarketingServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelTagServiceImpl.java | 18
hrt-auth/src/main/java/com/hrt/auth/controller/TokenController.java | 17
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/Member.java | 123 ++
hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelUserServiceImpl.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/AppErrorConstant.java | 60 +
hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderGoodsMapper.java | 2
hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppShopInfoVo.java | 58 +
hrt-modules/hrt-system/src/main/resources/mapper/system/goods/GoodsMapper.xml | 131 ++
206 files changed, 3,055 insertions(+), 287 deletions(-)
diff --git a/hrt-api/hrt-api-system/pom.xml b/hrt-api/hrt-api-system/pom.xml
index 49273e0..74ecb1b 100644
--- a/hrt-api/hrt-api-system/pom.xml
+++ b/hrt-api/hrt-api-system/pom.xml
@@ -22,6 +22,13 @@
<groupId>com.hrt</groupId>
<artifactId>hrt-common-core</artifactId>
</dependency>
+
+ <!--lombok的依赖，为了优化实体类，可以不去实现实体类的set()、get()-->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
diff --git a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/RemoteUserService.java b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/RemoteUserService.java
index 1e07eb9..793035c 100644
--- a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/RemoteUserService.java
+++ b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/RemoteUserService.java
@@ -2,6 +2,8 @@
import com.hrt.system.api.domain.SysUser;
import com.hrt.system.api.factory.RemoteUserFallbackFactory;
+import com.hrt.system.api.model.AppMiniLoginDto;
+import com.hrt.system.api.model.AppMiniLoginVo;
import com.hrt.system.api.model.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -40,4 +42,13 @@
*/
@PostMapping("/user/register")
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
+ /**
+ * 小程序登录
+ * @param appMiniLoginDto
+ * @return
+ */
+ @PostMapping("/user/miniLogin")
+ public R<AppMiniLoginVo> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto);
}
diff --git a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/factory/RemoteUserFallbackFactory.java b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/factory/RemoteUserFallbackFactory.java
index cb8c1f1..3c68339 100644
--- a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/factory/RemoteUserFallbackFactory.java
+++ b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/factory/RemoteUserFallbackFactory.java
@@ -1,5 +1,7 @@
package com.hrt.system.api.factory;
+import com.hrt.system.api.model.AppMiniLoginDto;
+import com.hrt.system.api.model.AppMiniLoginVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -36,6 +38,12 @@
{
return R.fail("注册用户失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<AppMiniLoginVo> miniLogin(AppMiniLoginDto appMiniLoginDto)
+ {
+ return R.fail("登录用户失败:" + throwable.getMessage());
+ }
};
}
}
diff --git a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginDto.java b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginDto.java
new file mode 100644
index 0000000..afe4842
--- /dev/null
+++ b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginDto.java
@@ -0,0 +1,19 @@
+package com.hrt.system.api.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGetUnionid
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppMiniLoginDto {
+
+ @ApiModelProperty(value = "code")
+ private String code;
+
+}
diff --git a/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginVo.java b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginVo.java
new file mode 100644
index 0000000..63d7fcb
--- /dev/null
+++ b/hrt-api/hrt-api-system/src/main/java/com/hrt/system/api/model/AppMiniLoginVo.java
@@ -0,0 +1,28 @@
+package com.hrt.system.api.model;
+
+import com.hrt.system.api.domain.SysUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGetUnionid
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppMiniLoginVo {
+
+ @ApiModelProperty(value = "小程序openid")
+ private String miniOpenid;
+
+ @ApiModelProperty(value = "微信unionid")
+ private String wxUnionid;
+
+ @ApiModelProperty(value = "微信sessionKey")
+ private String sessionKey;
+
+ @ApiModelProperty(value = "用户信息")
+ private SysUser sysUser;
+}
diff --git a/hrt-auth/src/main/java/com/hrt/auth/controller/TokenController.java b/hrt-auth/src/main/java/com/hrt/auth/controller/TokenController.java
index 8d1154e..6d30277 100644
--- a/hrt-auth/src/main/java/com/hrt/auth/controller/TokenController.java
+++ b/hrt-auth/src/main/java/com/hrt/auth/controller/TokenController.java
@@ -1,6 +1,10 @@
package com.hrt.auth.controller;
import javax.servlet.http.HttpServletRequest;
+
+import com.hrt.system.api.model.AppMiniLoginDto;
+import com.hrt.system.api.model.AppMiniLoginVo;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -31,6 +35,7 @@
@Autowired
private SysLoginService sysLoginService;
+ @ApiOperation("系统登录")
@PostMapping("login")
public R<?> login(@RequestBody LoginBody form)
{
@@ -38,6 +43,16 @@
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// 获取登录token
return R.ok(tokenService.createToken(userInfo));
+ }
+
+ @ApiOperation("小程序登录")
+ @PostMapping("miniLogin")
+ public R<?> miniLogin(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ {
+ // 小程序用户登录
+ AppMiniLoginVo appMiniLoginVo = sysLoginService.miniLogin(appMiniLoginDto);
+ // 获取登录token
+ return R.ok(tokenService.createMiniToken(appMiniLoginVo));
}
@DeleteMapping("logout")
@@ -75,4 +90,6 @@
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
return R.ok();
}
+
+
}
diff --git a/hrt-auth/src/main/java/com/hrt/auth/service/SysLoginService.java b/hrt-auth/src/main/java/com/hrt/auth/service/SysLoginService.java
index dd6831c..dd7ea08 100644
--- a/hrt-auth/src/main/java/com/hrt/auth/service/SysLoginService.java
+++ b/hrt-auth/src/main/java/com/hrt/auth/service/SysLoginService.java
@@ -1,5 +1,7 @@
package com.hrt.auth.service;
+import com.hrt.system.api.model.AppMiniLoginDto;
+import com.hrt.system.api.model.AppMiniLoginVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.hrt.common.core.constant.CacheConstants;
@@ -101,6 +103,41 @@
return userInfo;
}
+ /**
+ * 登录
+ */
+ public AppMiniLoginVo miniLogin(AppMiniLoginDto appMiniLoginDto)
+ {
+ // 查询用户信息
+ R<AppMiniLoginVo> userResult = remoteUserService.miniLogin(appMiniLoginDto);
+ if (R.FAIL == userResult.getCode())
+ {
+ throw new ServiceException(userResult.getMsg());
+ }
+ AppMiniLoginVo userInfo = userResult.getData();
+ SysUser user = userResult.getData().getSysUser();
+ String username = user.getUserName();
+ // IP黑名单校验
+ String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
+ if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
+ {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
+ throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
+ }
+ if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
+ {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+ throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+ }
+ if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
+ {
+ recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+ throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+ }
+ recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
+ return userInfo;
+ }
+
public void logout(String loginName)
{
recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
diff --git a/hrt-common/hrt-common-security/src/main/java/com/hrt/common/security/service/TokenService.java b/hrt-common/hrt-common-security/src/main/java/com/hrt/common/security/service/TokenService.java
index a08890e..e1035e2 100644
--- a/hrt-common/hrt-common-security/src/main/java/com/hrt/common/security/service/TokenService.java
+++ b/hrt-common/hrt-common-security/src/main/java/com/hrt/common/security/service/TokenService.java
@@ -6,6 +6,7 @@
import javax.servlet.http.HttpServletRequest;
import com.hrt.common.security.utils.SecurityUtils;
+import com.hrt.system.api.model.AppMiniLoginVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.hrt.common.core.constant.CacheConstants;
@@ -67,6 +68,36 @@
}
/**
+ * 创建小程序令牌
+ */
+ public Map<String, Object> createMiniToken(AppMiniLoginVo appMiniLoginVo)
+ {
+ LoginUser loginUser = new LoginUser();
+ loginUser.setSysUser(appMiniLoginVo.getSysUser());
+ String token = IdUtils.fastUUID();
+ Long userId = loginUser.getSysUser().getUserId();
+ String userName = loginUser.getSysUser().getUserName();
+ loginUser.setToken(token);
+ loginUser.setUserid(userId);
+ loginUser.setUsername(userName);
+ loginUser.setIpaddr(IpUtils.getIpAddr());
+ refreshToken(loginUser);
+
+ // Jwt存储信息
+ Map<String, Object> claimsMap = new HashMap<String, Object>();
+ claimsMap.put(SecurityConstants.USER_KEY, token);
+ claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
+ claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
+
+ // 接口返回信息
+ Map<String, Object> rspMap = new HashMap<String, Object>();
+ rspMap.put("access_token", JwtUtils.createToken(claimsMap));
+ rspMap.put("expires_in", expireTime);
+ rspMap.put("mini_openid", appMiniLoginVo.getMiniOpenid());
+ return rspMap;
+ }
+
+ /**
* 获取用户身份信息
*
* @return 用户信息
diff --git a/hrt-modules/hrt-system/pom.xml b/hrt-modules/hrt-system/pom.xml
index 7e8bc98..4b117b3 100644
--- a/hrt-modules/hrt-system/pom.xml
+++ b/hrt-modules/hrt-system/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
- <version>3.4.3.4</version>
+ <version>3.4.1</version>
<!-- pagehelper 包含该依赖存在版本冲突，因此不建议和 mp 一起混用 -->
<exclusions>
<exclusion>
@@ -91,11 +91,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-generate</artifactId>
- <version>2.3</version>
- </dependency>
+
<!--lombok的依赖，为了优化实体类，可以不去实现实体类的set()、get()-->
<dependency>
@@ -104,6 +100,18 @@
<optional>true</optional>
</dependency>
+ <!-- 小程序统一服务 -->
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-miniapp</artifactId>
+ <version>4.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-annotation</artifactId>
+ <version>3.4.3.4</version>
+ </dependency>
+
</dependencies>
<build>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/config/AppConfig.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/config/AppConfig.java
new file mode 100644
index 0000000..c6752d5
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/config/AppConfig.java
@@ -0,0 +1,35 @@
+package com.hrt.system.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author jqs34
+ * @ClassName AppConfig
+ * @description: TODO
+ * @date 2023年02月17日
+ * @version: 1.0
+ */
+@Configuration
+public class AppConfig {
+
+
+ @Bean
+ public WxMaService wxMaService() {
+ WxMaService service = new WxMaServiceImpl();
+ service.setWxMaConfig(memberWxMaConfig());
+ return service;
+ }
+
+ @Bean
+ public WxMaConfig memberWxMaConfig(){
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid("wxb7f0ea286fc4e535");
+ config.setSecret("852a2512a6ab559cafc68bae5d4160ac");
+ return config;
+ }
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/AppErrorConstant.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/AppErrorConstant.java
new file mode 100644
index 0000000..ebb7b74
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/AppErrorConstant.java
@@ -0,0 +1,60 @@
+package com.hrt.system.constant;
+
+/**
+ * @author jqs34
+ * @ClassName AppErrorContant
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+public interface AppErrorConstant {
+
+
+ String USER_NOT_LOGIN = "用户没有登录或登录已失效";
+
+ String AUTHORIZE_MISS = "授权信息不完整";
+
+ String AUTHORIZE_FAILED = "授权信息解密失败";
+
+ String USER_FROZE = "用户已被冻结";
+
+ String USER_NOT_MOBILE = "用户没有手机授权";
+
+ String NO_FIND_RESULT = "未找到编辑对象";
+
+ String NO_REQUIRED_PARAM = "缺少必要参数";
+
+ String CODE_EXPIRE = "验证码已过期";
+
+ String CODE_FAILED = "验证码错误";
+
+ String COUPON_NULL = "未找到优惠券";
+
+ String COUPON_FAILED = "未满足领取条件";
+
+ String NO_COUPON = "优惠券已领取完";
+
+ String DOUBLE_COUPON = "已拥有优惠券,请勿重复领取";
+
+ String REAL_NAME_FAILED = "实名认证失败,请检查上传的身份证图片";
+
+ String REAL_NAME_DIFF = "与资料填写姓名不符,非本人身份证";
+
+ String DISTRIBUTOR_APPLY_FAILED = "已经是分销员，请勿重复申请";
+
+ String DOUBLE_USER_BANK = "请勿重复绑定银行卡";
+
+ String USER_BANK_FAILED = "获取绑定银行卡失败";
+
+ String BEYOND_WITHDRAW = "超出可提现金额";
+
+ String BEYOND_WITHDRAW_time = "超出可提现金额";
+
+ String USER_NO_WITHDRAW = "用户没有提现权限";
+
+ String WX_WITHDRAW_FAILED = "用户没有提现权限";
+
+ String MOBILE_FAILED = "验证手机非绑定手机";
+
+ String AGREEMENT_FAILED = "获取协议失败";
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/CodeEnum.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/CodeEnum.java
new file mode 100644
index 0000000..7134452
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/CodeEnum.java
@@ -0,0 +1,52 @@
+package com.hrt.system.constant;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author jqs34
+ * @ClassName CodeEnum
+ * @description: TODO
+ * @date 2023年03月06日
+ * @version: 1.0
+ */
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+@Getter
+public enum CodeEnum {
+
+ SUCCESS("调用成功","200"),
+ NO_STOCK("没有库存","101"),
+ LIMIT_BUY("达到限购","102"),
+ NO_GOODS("商品下架","103"),
+ COUPON_FAILED("优惠券调用失败","111"),
+ INTEGRAL_FAILED("积分调用失败","112"),
+ HANDLE_ORDER_FAILED("订单处理失败","113");
+
+
+ String name;
+ String code;
+
+ private static Map<String, CodeEnum> valueMap = new HashMap<>();
+
+ static {
+ for(CodeEnum gender : CodeEnum.values()) {
+ valueMap.put(gender.name, gender);
+ }
+ }
+
+ CodeEnum(String name, String code) {
+ this.code = code;
+ this.name=name;
+ }
+
+ public static String getByName(String name) {
+ CodeEnum result = valueMap.get(name);
+ if(result == null) {
+ throw new IllegalArgumentException("No element matches " + name);
+ }
+ return result.code;
+ }
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/HttpStatus.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/HttpStatus.java
new file mode 100644
index 0000000..253f4d2
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/HttpStatus.java
@@ -0,0 +1,91 @@
+package com.hrt.system.constant;
+
+/**
+ * @author jqs34
+ * @ClassName HttpStatus
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+public class HttpStatus {
+
+ /**
+ * 操作成功
+ */
+ public static final int SUCCESS = 200;
+
+ /**
+ * 对象创建成功
+ */
+ public static final int CREATED = 201;
+
+ /**
+ * 请求已经被接受
+ */
+ public static final int ACCEPTED = 202;
+
+ /**
+ * 操作已经执行成功，但是没有返回数据
+ */
+ public static final int NO_CONTENT = 204;
+
+ /**
+ * 资源已被移除
+ */
+ public static final int MOVED_PERM = 301;
+
+ /**
+ * 重定向
+ */
+ public static final int SEE_OTHER = 303;
+
+ /**
+ * 资源没有被修改
+ */
+ public static final int NOT_MODIFIED = 304;
+
+ /**
+ * 参数列表错误（缺少，格式不匹配）
+ */
+ public static final int BAD_REQUEST = 400;
+
+ /**
+ * 未授权
+ */
+ public static final int UNAUTHORIZED = 401;
+
+ /**
+ * 访问受限，授权过期
+ */
+ public static final int FORBIDDEN = 403;
+
+ /**
+ * 资源，服务未找到
+ */
+ public static final int NOT_FOUND = 404;
+
+ /**
+ * 不允许的http方法
+ */
+ public static final int BAD_METHOD = 405;
+
+ /**
+ * 资源冲突，或者资源被锁
+ */
+ public static final int CONFLICT = 409;
+
+ /**
+ * 不支持的数据，媒体类型
+ */
+ public static final int UNSUPPORTED_TYPE = 415;
+
+ /**
+ * 系统内部错误
+ */
+ public static final int ERROR = 500;
+
+ /**
+ * 接口未实现
+ */
+ public static final int NOT_IMPLEMENTED = 501;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/SecurityConstant.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/SecurityConstant.java
new file mode 100644
index 0000000..5408f3f
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/constant/SecurityConstant.java
@@ -0,0 +1,33 @@
+package com.hrt.system.constant;
+
+/**
+ * @author jqs34
+ * @ClassName SecurityConstant
+ * @description: TODO
+ * @date 2023年02月21日
+ * @version: 1.0
+ */
+public interface SecurityConstant {
+
+
+ /**
+ * 微信sessionKey前缀
+ */
+ String SESSION_KEY = "SESSION_KEY:";
+
+
+ /**
+ * 用户验证码前缀key
+ */
+ String MESSAGE_CODE = "MESSAGE_CODE:";
+
+ /**
+ * 用户验证码前缀key
+ */
+ String MINI_CODE = "MINI_CODE:";
+
+ /**
+ * 用户验证码前缀key
+ */
+ String WX_TOKEN = "WX_TOKEN";
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppConfigController.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppConfigController.java
new file mode 100644
index 0000000..feca30f
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppConfigController.java
@@ -0,0 +1,55 @@
+package com.hrt.system.controller.miniapp;
+
+import com.hrt.common.core.domain.R;
+import com.hrt.common.security.utils.SecurityUtils;
+import com.hrt.system.domain.dto.AppAgreementDto;
+import com.hrt.system.domain.dto.AppUserAuthorizeDto;
+import com.hrt.system.domain.vo.AppAgreementVo;
+import com.hrt.system.domain.vo.AppUserAuthorizeVo;
+import com.hrt.system.service.member.MemberService;
+import com.hrt.system.service.sys.AgreementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author jqs34
+ * @ClassName AppConfigController
+ * @description: TODO
+ * @date 2023年04月19日
+ * @version: 1.0
+ */
+@Api(value = "小程序配置相关接口", tags = "小程序配置相关接口", description = "小程序配置相关接口")
+@RestController
+@RequestMapping("/app/config")
+public class AppConfigController {
+
+ @Autowired
+ private MemberService memberService;
+
+ @Autowired
+ private AgreementService agreementService;
+
+ @RequestMapping(value = "/getAppUserAuthorize", method = RequestMethod.POST)
+ @ApiOperation(value = "获取用户授权信息")
+ public R<AppUserAuthorizeVo> getAppUserAuthorize(@RequestBody AppUserAuthorizeDto appUserAuthorizeDto) {
+ Long userId = SecurityUtils.getUserId();
+ appUserAuthorizeDto.setUserId(userId);
+ AppUserAuthorizeVo appUserAuthorizeVo = memberService.getAppUserAuthorize(appUserAuthorizeDto);
+ return R.ok(appUserAuthorizeVo);
+ }
+
+ @RequestMapping(value = "/getAppAgreement", method = RequestMethod.POST)
+ @ApiOperation(value = "获取协议")
+ public R<AppAgreementVo> getAppAgreement(@RequestBody AppAgreementDto appAgreementDto){
+ AppAgreementVo appAgreementVo = agreementService.getAppAgreement(appAgreementDto);
+ return R.ok(appAgreementVo);
+ }
+
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppGoodsController.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppGoodsController.java
new file mode 100644
index 0000000..d22ead4
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppGoodsController.java
@@ -0,0 +1,41 @@
+package com.hrt.system.controller.miniapp;
+
+import com.hrt.common.core.domain.R;
+import com.hrt.system.domain.dto.AppBaseGetDto;
+import com.hrt.system.domain.dto.AppGoodsInfoGetDto;
+import com.hrt.system.domain.vo.AppGoodsInfoVo;
+import com.hrt.system.domain.vo.AppShopInfoVo;
+import com.hrt.system.service.goods.GoodsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author jqs34
+ * @ClassName AppGoodsController
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Api(value = "小程序商品相关接口", tags = "小程序商品相关接口", description = "小程序商品相关接口")
+@RestController
+@RequestMapping("/app/home")
+public class AppGoodsController {
+
+ @Autowired
+ private GoodsService goodsService;
+
+ @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商品详情")
+ public R<AppGoodsInfoVo> getGoodsInfo(@RequestBody AppGoodsInfoGetDto appGoodsInfoGetDto) {
+ AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
+ return R.ok(appGoodsInfoVo);
+ }
+
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppHomeController.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppHomeController.java
new file mode 100644
index 0000000..61e9964
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/miniapp/AppHomeController.java
@@ -0,0 +1,165 @@
+package com.hrt.system.controller.miniapp;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hrt.common.core.domain.R;
+import com.hrt.common.security.utils.SecurityUtils;
+import com.hrt.system.domain.dto.*;
+import com.hrt.system.domain.poji.member.Member;
+import com.hrt.system.domain.poji.sys.QuickEntry;
+import com.hrt.system.domain.vo.*;
+import com.hrt.system.service.goods.GoodsService;
+import com.hrt.system.service.member.MemberService;
+import com.hrt.system.service.shop.ShopService;
+import com.hrt.system.service.sys.AdvertService;
+import com.hrt.system.service.sys.BannerService;
+import com.hrt.system.service.sys.QuickEntryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Calendar;
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName AppHomeController
+ * @description: TODO
+ * @date 2023年04月18日
+ * @version: 1.0
+ */
+@Api(value = "小程序首页相关接口", tags = "小程序首页相关接口", description = "小程序首页相关接口")
+@RestController
+@RequestMapping("/app/home")
+public class AppHomeController {
+
+
+ @Autowired
+ private MemberService memberService;
+
+ @Autowired
+ private BannerService bannerService;
+
+ @Autowired
+ private QuickEntryService quickEntryService;
+
+ @Autowired
+ private AdvertService advertService;
+
+ @Autowired
+ private GoodsService goodsService;
+
+ @Autowired
+ private ShopService shopService;
+
+ @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
+ @ApiOperation(value = "获取最近商户")
+ public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
+ Long userId = SecurityUtils.getUserId();
+ appNearbyShopDto.setUserId(userId);
+ AppNearbyShopVo appNearbyShopVo = memberService.getNearbyShop(appNearbyShopDto);
+ return R.ok(appNearbyShopVo);
+ }
+
+ @RequestMapping(value = "/getHomeBanner", method = RequestMethod.POST)
+ @ApiOperation(value = "获取首页banner")
+ public R<List<AppBannerVo>> getHomeBanner() {
+ List<AppBannerVo> appBannerVoList = bannerService.listHomeBannerVo();
+ return R.ok(appBannerVoList);
+ }
+
+ @RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
+ @ApiOperation(value = "获取首页快速入口")
+ public R<List<AppQuickEntryVo>> getQuickEntry() {
+ List<AppQuickEntryVo> appQuickEntryVoList = quickEntryService.listQuickEntryVo();
+ return R.ok(appQuickEntryVoList);
+ }
+
+ @RequestMapping(value = "/getAdvert", method = RequestMethod.POST)
+ @ApiOperation(value = "获取首页广告")
+ public R<AppAdvertVo> getAdvert() {
+ AppAdvertVo appAdvertVo = advertService.getAdvertVo();
+ return R.ok(appAdvertVo);
+ }
+
+ @RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "推荐商品")
+ public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Long shopId = null;
+ if(userId!=null){
+ Member member = memberService.getById(userId);
+ if(member!=null&&member.getRealtionShopId()!=null){
+ shopId = member.getRealtionShopId();
+ }
+ }
+ Page<AppSimpleGoodsVo> page = new Page<>();
+ page.setSize(appPageDto.getPageSize());
+ page.setCurrent(appPageDto.getPageNum());
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
+ return R.ok(page.setRecords(appSimpleGoodsVoList));
+ }
+
+ @RequestMapping(value = "/pageShopGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "商城商品")
+ public R<Page<AppSimpleGoodsVo>> pageShopGoods(@RequestBody AppShopGoodsPageDto appShopGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ if(userId!=null){
+ Member member = memberService.getById(userId);
+ if(member!=null&&member.getRealtionShopId()!=null){
+ appShopGoodsPageDto.setShopId(member.getRealtionShopId());
+ }
+ }
+ Page<AppSimpleGoodsVo> page = new Page<>();
+ page.setSize(appShopGoodsPageDto.getPageSize());
+ page.setCurrent(appShopGoodsPageDto.getPageNum());
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageShopGoods(page,appShopGoodsPageDto);
+ return R.ok(page.setRecords(appSimpleGoodsVoList));
+ }
+
+ @RequestMapping(value = "/pageSearchGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "搜索商品")
+ public R<Page<AppSimpleGoodsVo>> pageSearchGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ if(userId!=null){
+ Member member = memberService.getById(userId);
+ if(member!=null&&member.getRealtionShopId()!=null){
+ appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
+ }
+ }
+ Page<AppSimpleGoodsVo> page = new Page<>();
+ page.setSize(appSearchGoodsPageDto.getPageSize());
+ page.setCurrent(appSearchGoodsPageDto.getPageNum());
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchGoods(page,appSearchGoodsPageDto);
+ return R.ok(page.setRecords(appSimpleGoodsVoList));
+ }
+
+ @RequestMapping(value = "/pageSearchActivityGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "搜索活动商品")
+ public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ if(userId!=null){
+ Member member = memberService.getById(userId);
+ if(member!=null&&member.getRealtionShopId()!=null){
+ appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
+ }
+ }
+ Page<AppSimpleActivityGoodsVo> page = new Page<>();
+ page.setSize(appSearchGoodsPageDto.getPageSize());
+ page.setCurrent(appSearchGoodsPageDto.getPageNum());
+ List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageSearchActivityGoods(page,appSearchGoodsPageDto);
+ return R.ok(page.setRecords(appSimpleGoodsVoList));
+ }
+
+ @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "获取商户详情")
+ public R<AppShopInfoVo> getShopInfo(@RequestBody AppBaseGetDto appBaseGetDto) {
+ AppShopInfoVo appShopInfoVo = shopService.getShopInfo(Long.valueOf(appBaseGetDto.getId()));
+ return R.ok(appShopInfoVo);
+ }
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/sys/SysUserController.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/sys/SysUserController.java
index 4a41ddf..5103586 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/sys/SysUserController.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/controller/sys/SysUserController.java
@@ -6,6 +6,9 @@
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+import com.hrt.system.domain.dto.AppMiniLoginDto;
+import com.hrt.system.domain.vo.AppMiniLoginVo;
+import com.hrt.system.service.member.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
@@ -69,6 +72,9 @@
@Autowired
private ISysConfigService configService;
+
+ @Autowired
+ private MemberService memberService;
@GetMapping("/test")
public AjaxResult list()
@@ -143,6 +149,21 @@
}
/**
+ * 小程序登录
+ */
+ @InnerAuth
+ @GetMapping("/miniLogin")
+ @ApiOperation("小程序登录")
+ public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
+ {
+ AppMiniLoginVo appMiniLoginVo = memberService.getMemberByCode(appMiniLoginDto);
+ if(appMiniLoginVo ==null){
+ return R.fail("登录失败！");
+ }
+ return R.ok(appMiniLoginVo);
+ }
+
+ /**
* 注册用户信息
*/
@InnerAuth
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppAgreementDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppAgreementDto.java
new file mode 100644
index 0000000..4dd76fc
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppAgreementDto.java
@@ -0,0 +1,20 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppAgreementDto
+ * @description: TODO
+ * @date 2023年03月07日
+ * @version: 1.0
+ */
+@Data
+public class AppAgreementDto extends AppBaseDto{
+
+
+ @ApiModelProperty(value = "协议类型1用户协议 2隐私协议")
+ private Integer type;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseDto.java
new file mode 100644
index 0000000..cf7a476
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseDto.java
@@ -0,0 +1,19 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppBaseDto
+ * @description: TODO
+ * @date 2023年04月19日
+ * @version: 1.0
+ */
+@Data
+public class AppBaseDto {
+
+ @ApiModelProperty(value = "userId",hidden = true)
+ private Long userId;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseGetDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseGetDto.java
new file mode 100644
index 0000000..ae79a93
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppBaseGetDto.java
@@ -0,0 +1,19 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppBaseGetDto
+ * @description: TODO
+ * @date 2023年04月19日
+ * @version: 1.0
+ */
+@Data
+public class AppBaseGetDto extends AppBaseDto{
+
+ @ApiModelProperty(value = "请求对象id")
+ private String id;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppGoodsInfoGetDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppGoodsInfoGetDto.java
new file mode 100644
index 0000000..89b4966
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppGoodsInfoGetDto.java
@@ -0,0 +1,19 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGoodsInfoGetDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppGoodsInfoGetDto extends AppBaseGetDto{
+
+ @ApiModelProperty(value = "是否活动跳转0否1是")
+ private Integer activityFlag;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppMiniLoginDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppMiniLoginDto.java
new file mode 100644
index 0000000..039d698
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppMiniLoginDto.java
@@ -0,0 +1,19 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGetUnionid
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppMiniLoginDto {
+
+ @ApiModelProperty(value = "code")
+ private String code;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppNearbyShopDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppNearbyShopDto.java
new file mode 100644
index 0000000..d74c602
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppNearbyShopDto.java
@@ -0,0 +1,23 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppNearbyShopDto
+ * @description: TODO
+ * @date 2023年04月19日
+ * @version: 1.0
+ */
+@Data
+public class AppNearbyShopDto extends AppBaseDto{
+
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "维度")
+ private String latitude;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppPageDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppPageDto.java
new file mode 100644
index 0000000..65eb0f2
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppPageDto.java
@@ -0,0 +1,23 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppPageDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppPageDto extends AppBaseDto{
+
+ @ApiModelProperty(name = "pagenum", value = "页码")
+ private Integer pageNum = 1;
+
+
+ @ApiModelProperty(name = "pagesize", value = "每页显示条数")
+ private Integer pageSize = 20;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppSearchGoodsPageDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppSearchGoodsPageDto.java
new file mode 100644
index 0000000..91eb681
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppSearchGoodsPageDto.java
@@ -0,0 +1,22 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopGoodsPageDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSearchGoodsPageDto extends AppPageDto{
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppShopGoodsPageDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppShopGoodsPageDto.java
new file mode 100644
index 0000000..32cb893
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppShopGoodsPageDto.java
@@ -0,0 +1,30 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopGoodsPageDto
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppShopGoodsPageDto extends AppPageDto{
+
+ @ApiModelProperty(value = "shopId",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value = "搜索关键词")
+ private String keyword;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品分类id")
+ private Long goodsClassId;
+
+ @ApiModelProperty(value = "排序方式1.全部2.价格正序3.价格倒序4.销量正序5.销量倒序")
+ private Integer sort;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppUserAuthorizeDto.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppUserAuthorizeDto.java
new file mode 100644
index 0000000..a995c89
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/dto/AppUserAuthorizeDto.java
@@ -0,0 +1,23 @@
+package com.hrt.system.domain.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserAuthorizeDto
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppUserAuthorizeDto extends AppBaseDto{
+
+ @ApiModelProperty(value = "手机iv")
+ private String phoneIv;
+
+ @ApiModelProperty(value = "手机encryptedData")
+ private String phoneEncryptedData;
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/Coupon.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/Coupon.java
index c394bb2..161a5ac 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/Coupon.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/Coupon.java
@@ -2,10 +2,10 @@
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelGoods.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelGoods.java
index fb8dbf4..abf8c31 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelGoods.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelGoods.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.coupon;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelUser.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelUser.java
index 29c2e29..289ebd1 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelUser.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponRelUser.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.coupon;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponTotal.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponTotal.java
index 99a2f34..8a0a2a4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponTotal.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/coupon/CouponTotal.java
@@ -1,9 +1,9 @@
package com.hrt.system.domain.poji.coupon;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/Goods.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/Goods.java
index 6b76b3c..8dd59df 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/Goods.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/Goods.java
@@ -1,12 +1,12 @@
package com.hrt.system.domain.poji.goods;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
@@ -49,12 +49,16 @@
*/
@TableField("goods_type")
private Integer goodsType;
+
@TableField("create_time")
private Date createTime;
+
@TableField("create_user_id")
private Long createUserId;
+
@TableField("update_time")
private Date updateTime;
+
@TableField("update_user_id")
private Long updateUserId;
/**
@@ -112,6 +116,12 @@
@TableField("recommend_flag")
private Integer recommendFlag;
+ /**
+ * 商品调理问题
+ */
+ @TableField("goods_nurses")
+ private String goodsNurses;
+
@Override
protected Serializable pkVal() {
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsFile.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsFile.java
index 8e19ee8..30762e6 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsFile.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsFile.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.goods;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelNurse.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelNurse.java
index 4e363fb..fe5174a 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelNurse.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelNurse.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.goods;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
@@ -42,8 +42,8 @@
/**
* 调理问题id
*/
- @TableField("nurse_id")
- private Long nurseId;
+ @TableField("nurse")
+ private String nurse;
@Override
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelTag.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelTag.java
index f297c90..e4da94d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelTag.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsRelTag.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.goods;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsTotal.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsTotal.java
index a9eb2cc..9dc293c 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsTotal.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/goods/GoodsTotal.java
@@ -1,9 +1,9 @@
package com.hrt.system.domain.poji.goods;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/Member.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/Member.java
new file mode 100644
index 0000000..da7f1f8
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/Member.java
@@ -0,0 +1,123 @@
+package com.hrt.system.domain.poji.member;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_member")
+public class Member extends Model<Member> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户id
+ */
+ @TableId("user_id")
+ private Long userId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 会员id
+ */
+ @TableField("member_id")
+ private String memberId;
+ /**
+ * 会员编号
+ */
+ @TableField("member_no")
+ private String memberNo;
+ /**
+ * 微信openid
+ */
+ @TableField("wx_openid")
+ private String wxOpenid;
+ /**
+ * 小程序openid
+ */
+ @TableField("mini_openid")
+ private String miniOpenid;
+ /**
+ * 微信unionid
+ */
+ @TableField("wx_unionid")
+ private String wxUnionid;
+ /**
+ * 关联商户id
+ */
+ @TableField("realtion_shop_id")
+ private Long realtionShopId;
+ /**
+ * 真实姓名
+ */
+ @TableField("real_name")
+ private String realName;
+ /**
+ * 手机号
+ */
+ private String mobile;
+ /**
+ * 性别0未知1男2女
+ */
+ private Integer gender;
+ /**
+ * 推荐人
+ */
+ private String referrer;
+ /**
+ * 顾客来源
+ */
+ @TableField("customer_source")
+ private String customerSource;
+ /**
+ * 等级
+ */
+ private String level;
+ /**
+ * 生日
+ */
+ private String birthday;
+ /**
+ * 创建时间
+ */
+ @TableField("create_time")
+ private Date createTime;
+ /**
+ * 更新时间
+ */
+ @TableField("update_time")
+ private Date updateTime;
+ /**
+ * 更新用户id
+ */
+ @TableField("update_user_id")
+ private Integer updateUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.userId;
+ }
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchive.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchive.java
index 810f546..09544c8 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchive.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchive.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.member;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchiveFields.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchiveFields.java
index a365aba..3995843 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchiveFields.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberArchiveFields.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.member;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberNurse.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberNurse.java
new file mode 100644
index 0000000..43afc30
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/MemberNurse.java
@@ -0,0 +1,54 @@
+package com.hrt.system.domain.poji.member;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户调理问题
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_member_nurse")
+public class MemberNurse extends Model<MemberNurse> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 用户id
+ */
+ @TableField("user_id")
+ private Integer userId;
+ /**
+ * 调理问题
+ */
+ private String nurse;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/UserCoupon.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/UserCoupon.java
index 5500a6d..3553ca0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/UserCoupon.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/member/UserCoupon.java
@@ -1,12 +1,12 @@
package com.hrt.system.domain.poji.member;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ConsumerGoods.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ConsumerGoods.java
index a43dd25..91f3eae 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ConsumerGoods.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ConsumerGoods.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.order;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/Order.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/Order.java
index e3390a1..476535f 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/Order.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/Order.java
@@ -2,10 +2,10 @@
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/OrderGoods.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/OrderGoods.java
index 0fd6f17..8dbfc77 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/OrderGoods.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/OrderGoods.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.order;
import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ShoppingCart.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ShoppingCart.java
index 9e8661d..72b1081 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ShoppingCart.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/ShoppingCart.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.order;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/UserServiceRecord.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/UserServiceRecord.java
index 9a879d6..d5b4528 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/UserServiceRecord.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/order/UserServiceRecord.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.order;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTask.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTask.java
index 2d1a800..95af881 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTask.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTask.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTaskRecord.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTaskRecord.java
index d0462ea..327a9de 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTaskRecord.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/MemberTaskRecord.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/Shop.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/Shop.java
index 0c90d87..32013d5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/Shop.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/Shop.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
@@ -227,6 +227,9 @@
@TableField("cooperation_start_time")
private Date cooperationStartTime;
+ @TableField("shop_tags")
+ private String shopTags;
+
@Override
protected Serializable pkVal() {
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopCertificate.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopCertificate.java
new file mode 100644
index 0000000..08b4257
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopCertificate.java
@@ -0,0 +1,74 @@
+package com.hrt.system.domain.poji.shop;
+
+
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 商户证书
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_shop_certificate")
+public class ShopCertificate extends Model<ShopCertificate> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 证书id
+ */
+ @TableId(value = "cer_id", type = IdType.AUTO)
+ private Integer cerId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 证书状态-1删除0待审核1审核通过2审核拒绝
+ */
+ @TableField("cer_status")
+ private Integer cerStatus;
+ /**
+ * 商户id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+ /**
+ * 证书名字
+ */
+ @TableField("cer_name")
+ private String cerName;
+ /**
+ * 证书编号
+ */
+ @TableField("cer_number")
+ private Integer cerNumber;
+ /**
+ * 证书图片
+ */
+ @TableField("cer_picture")
+ private String cerPicture;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.cerId;
+ }
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopFile.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopFile.java
index d5767b1..4aaf267 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopFile.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopFile.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopGoods.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopGoods.java
index 38a3a8d..0b8c111 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopGoods.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopGoods.java
@@ -1,12 +1,12 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.math.BigDecimal;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopMarketing.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopMarketing.java
index ef7712a..0f70269 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopMarketing.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopMarketing.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelTag.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelTag.java
index 77a4626..b7ab07c 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelTag.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelTag.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelUser.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelUser.java
index bc9ffcc..cefd611 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelUser.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopRelUser.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTask.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTask.java
index b7061b7..0335d7d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTask.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTask.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTransferRecord.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTransferRecord.java
index d9d3eb8..7705f83 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTransferRecord.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/ShopTransferRecord.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/TaskFile.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/TaskFile.java
index dbb94ed..5c706e5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/TaskFile.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/shop/TaskFile.java
@@ -1,10 +1,10 @@
package com.hrt.system.domain.poji.shop;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Advert.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Advert.java
new file mode 100644
index 0000000..7a8fff5
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Advert.java
@@ -0,0 +1,82 @@
+package com.hrt.system.domain.poji.sys;
+
+
+import java.util.Date;
+
+import java.io.Serializable;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 快速入口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("t_advert")
+public class Advert extends Model<Advert> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "ad_id", type = IdType.AUTO)
+ private Integer adId;
+ /**
+ * 删除标记
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 广告图片地址
+ */
+ @TableField("ad_url")
+ private String adUrl;
+ /**
+ * 广告语
+ */
+ @TableField("ad_content")
+ private String adContent;
+ /**
+ * 对象类型1.外链2.内链3.无
+ */
+ @TableField("target_type")
+ private Integer targetType;
+ /**
+ * 链接地址
+ */
+ @TableField("link_url")
+ private String linkUrl;
+ /**
+ * 跳转活动id
+ */
+ @TableField("jump_id")
+ private String jumpId;
+ /**
+ * logo图片地址
+ */
+ @TableField("logo_url")
+ private String logoUrl;
+ @TableField("create_time")
+ private Date createTime;
+ @TableField("create_user_id")
+ private Integer createUserId;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.adId;
+ }
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Agreement.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Agreement.java
index a8ff679..c87dc99 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Agreement.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Agreement.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Banner.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Banner.java
index 9622f35..12330a0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Banner.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Banner.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
@@ -52,7 +52,7 @@
* 链接类型1.外部2.内部3.无
*/
@TableField("target_type")
- private String targetType;
+ private Integer targetType;
/**
* 链接类型1.手动输入2.选择已有
*/
@@ -67,7 +67,7 @@
* 跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂
*/
@TableField("jump_type")
- private String jumpType;
+ private Integer jumpType;
/**
* 跳转id
*/
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/CustomeConfig.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/CustomeConfig.java
index fe91cef..f0cba81 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/CustomeConfig.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/CustomeConfig.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Pop.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Pop.java
index 8541556..8f9f5a7 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Pop.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/Pop.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/QuickEntry.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/QuickEntry.java
index 911aafd..25cd811 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/QuickEntry.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/QuickEntry.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
@@ -65,8 +65,10 @@
*/
@TableField("jump_id")
private String jumpId;
+
@TableField("create_time")
private Date createTime;
+
@TableField("create_user_id")
private Long createUserId;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysClassification.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysClassification.java
index b4c39b5..f675125 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysClassification.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysClassification.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysTag.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysTag.java
index 6fa2748..bfa4ae7 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysTag.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/poji/sys/SysTag.java
@@ -1,11 +1,11 @@
package com.hrt.system.domain.poji.sys;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;;
import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAdvertVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAdvertVo.java
new file mode 100644
index 0000000..e92ee86
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAdvertVo.java
@@ -0,0 +1,37 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppQuickEntryVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppAdvertVo {
+
+ @ApiModelProperty(value = "广告入口")
+ private Long adId;
+
+ @ApiModelProperty(value = "广告图片地址")
+ private String adUrl;
+
+ @ApiModelProperty(value = "广告语")
+ private String adContent;
+
+ @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "链接地址")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "跳转id")
+ private String jumpId;
+
+ @ApiModelProperty(value = "logo地址")
+ private String logoUrl;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAgreementVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAgreementVo.java
new file mode 100644
index 0000000..b5f5a88
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppAgreementVo.java
@@ -0,0 +1,21 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppAgreementVo
+ * @description: TODO
+ * @date 2023年03月07日
+ * @version: 1.0
+ */
+@Data
+public class AppAgreementVo {
+
+ @ApiModelProperty(value = "协议id")
+ private Long agreementId;
+
+ @ApiModelProperty(value = "协议内容")
+ private String agreementContent;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppBannerVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppBannerVo.java
new file mode 100644
index 0000000..03c0a86
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppBannerVo.java
@@ -0,0 +1,38 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppBannerVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+
+@Data
+public class AppBannerVo {
+
+ @ApiModelProperty(value = "bannerid")
+ private Long bannerId;
+
+ @ApiModelProperty(value = "banner图片地址")
+ private String bannerUrl;
+
+ @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "链接类型1.手动输入2.选择已有")
+ private Integer linkType;
+
+ @ApiModelProperty(value = "链接地址")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
+ private Integer jumpType;
+
+ @ApiModelProperty(value = "跳转id")
+ private String jumpId;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppGoodsInfoVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppGoodsInfoVo.java
new file mode 100644
index 0000000..eb5c3d4
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppGoodsInfoVo.java
@@ -0,0 +1,53 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppGoodsInfoVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppGoodsInfoVo {
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品视频")
+ private String goodsVideo;
+
+ @ApiModelProperty(value = "商品banner")
+ private String goodsBanners;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private BigDecimal goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+ @ApiModelProperty(value = "商品活动价")
+ private BigDecimal activityPrice;
+
+ @ApiModelProperty(value = "商品详情")
+ private String goodsDetail;
+
+ @ApiModelProperty(value = "销售数量")
+ private Integer salesNum;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppMiniLoginVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppMiniLoginVo.java
new file mode 100644
index 0000000..e010df4
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppMiniLoginVo.java
@@ -0,0 +1,28 @@
+package com.hrt.system.domain.vo;
+
+import com.hrt.system.api.domain.SysUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppGetUnionid
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppMiniLoginVo {
+
+ @ApiModelProperty(value = "小程序openid")
+ private String miniOpenid;
+
+ @ApiModelProperty(value = "微信unionid")
+ private String wxUnionid;
+
+ @ApiModelProperty(value = "微信sessionKey")
+ private String sessionKey;
+
+ @ApiModelProperty(value = "用户信息")
+ private SysUser sysUser;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppNearbyShopVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppNearbyShopVo.java
new file mode 100644
index 0000000..b9fa1fc
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppNearbyShopVo.java
@@ -0,0 +1,32 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppNearbyShopDto
+ * @description: TODO
+ * @date 2023年04月19日
+ * @version: 1.0
+ */
+@Data
+public class AppNearbyShopVo {
+
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "商户地址")
+ private String shopAddress;
+
+ @ApiModelProperty(value = "经度")
+ private String shopLongitude;
+
+ @ApiModelProperty(value = "维度")
+ private String shopLatitude;
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppQuickEntryVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppQuickEntryVo.java
new file mode 100644
index 0000000..46856e6
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppQuickEntryVo.java
@@ -0,0 +1,36 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppQuickEntryVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppQuickEntryVo {
+
+ @ApiModelProperty(value = "快速入口")
+ private Long entryId;
+
+ @ApiModelProperty(value = "入口图片地址")
+ private String entryUrl;
+
+ @ApiModelProperty(value = "入口名称")
+ private String entryName;
+
+ @ApiModelProperty(value = "对象类型1.外链2.内链3.无")
+ private Integer targetType;
+
+ @ApiModelProperty(value = "链接地址")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "跳转id")
+ private String jumpId;
+
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppShopInfoVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppShopInfoVo.java
new file mode 100644
index 0000000..1dc5595
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppShopInfoVo.java
@@ -0,0 +1,58 @@
+package com.hrt.system.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.hrt.system.domain.poji.shop.ShopCertificate;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @ClassName AppShopInfoVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppShopInfoVo {
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "商户地址")
+ private String shopAddress;
+
+ @ApiModelProperty(value = "经度")
+ private String shopLongitude;
+
+ @ApiModelProperty(value = "维度")
+ private String shopLatitude;
+
+ @ApiModelProperty("营业开始时间")
+ private String businessStartTime;
+
+ @ApiModelProperty("营业结束时间")
+ private String businessEndTime;
+
+ @ApiModelProperty("商户标签")
+ private String shopTags;
+
+ @ApiModelProperty("商户服务电话")
+ private String shopServicePhone;
+
+ @ApiModelProperty("商户封面")
+ private String shopPicture;
+
+ @ApiModelProperty("商户banners")
+ private String shopBanners;
+
+ @ApiModelProperty("店铺详情")
+ private String shopDetail;
+
+ @ApiModelProperty("店铺证书")
+ private List<ShopCertificate> shopCertificateList;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleActivityGoodsVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleActivityGoodsVo.java
new file mode 100644
index 0000000..0f41c50
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleActivityGoodsVo.java
@@ -0,0 +1,55 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppSimpleGoodsVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSimpleActivityGoodsVo {
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private BigDecimal goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+ @ApiModelProperty(value = "商品活动价")
+ private BigDecimal activityPrice;
+
+ @ApiModelProperty(value = "活动销售数量")
+ private Integer activityNumber;
+
+ @ApiModelProperty(value = "已售数量")
+ private Integer salesNumber;
+
+ @ApiModelProperty(value = "已售比例")
+ private BigDecimal salesPercent;
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleGoodsVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleGoodsVo.java
new file mode 100644
index 0000000..5c54f36
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppSimpleGoodsVo.java
@@ -0,0 +1,43 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author jqs34
+ * @ClassName AppSimpleGoodsVo
+ * @description: TODO
+ * @date 2023年04月20日
+ * @version: 1.0
+ */
+@Data
+public class AppSimpleGoodsVo {
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String goodsName;
+
+ @ApiModelProperty(value = "商品简介")
+ private String goodsIntroduction;
+
+ @ApiModelProperty(value = "商品图片")
+ private String goodsPicture;
+
+ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
+ private Integer goodsType;
+
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
+ @ApiModelProperty(value = "商品调理问题")
+ private BigDecimal goodsNurses;
+
+ @ApiModelProperty(value = "商品售价")
+ private BigDecimal salesPrice;
+
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppUserAuthorizeVo.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppUserAuthorizeVo.java
new file mode 100644
index 0000000..0e23544
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/domain/vo/AppUserAuthorizeVo.java
@@ -0,0 +1,27 @@
+package com.hrt.system.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @ClassName AppUserAuthorizeDto
+ * @description: TODO
+ * @date 2023年02月13日
+ * @version: 1.0
+ */
+@Data
+public class AppUserAuthorizeVo {
+
+ @ApiModelProperty(value = "微信openid")
+ private String openid;
+
+ @ApiModelProperty(value = "微信unionid")
+ private String unionid;
+
+ @ApiModelProperty(value = "微信昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户手机")
+ private String mobile;
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponMapper.java
index 40eb86f..1410465 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.coupon;
import com.hrt.system.domain.poji.coupon.Coupon;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelGoodsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelGoodsMapper.java
index 74fc4d3..88cba61 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelGoodsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelGoodsMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.coupon;
import com.hrt.system.domain.poji.coupon.CouponRelGoods;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelUserMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelUserMapper.java
index 19e6f97..b3d2d06 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelUserMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponRelUserMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.coupon;
import com.hrt.system.domain.poji.coupon.CouponRelUser;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponTotalMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponTotalMapper.java
index a72bf2d..283b6a0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponTotalMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/coupon/CouponTotalMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.coupon;
import com.hrt.system.domain.poji.coupon.CouponTotal;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsFileMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsFileMapper.java
index 023e37e..acca2c9 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsFileMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsFileMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.goods;
import com.hrt.system.domain.poji.goods.GoodsFile;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsMapper.java
index 6b8568f..16d9f88 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsMapper.java
@@ -1,7 +1,15 @@
package com.hrt.system.mapper.goods;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hrt.system.domain.dto.AppSearchGoodsPageDto;
+import com.hrt.system.domain.dto.AppShopGoodsPageDto;
import com.hrt.system.domain.poji.goods.Goods;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.vo.AppSimpleActivityGoodsVo;
+import com.hrt.system.domain.vo.AppSimpleGoodsVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +21,34 @@
*/
public interface GoodsMapper extends BaseMapper<Goods> {
+ /**
+ * 获取推荐商品列表
+ * @param page
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageRecommendGoods(Page page, @Param("shopId")Long shopId);
+
+ /**
+ * 获取商城商品列表
+ * @param page
+ * @param appShopGoodsPageDto
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageShopGoods(Page page, @Param("param")AppShopGoodsPageDto appShopGoodsPageDto);
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageSearchGoods(Page page, @Param("param")AppSearchGoodsPageDto appSearchGoodsPageDto);
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ List<AppSimpleActivityGoodsVo> pageSearchActivityGoods(Page page, @Param("param")AppSearchGoodsPageDto appSearchGoodsPageDto);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelNurseMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelNurseMapper.java
index 128c2e8..c8c46d8 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelNurseMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelNurseMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.goods;
import com.hrt.system.domain.poji.goods.GoodsRelNurse;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelTagMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelTagMapper.java
index cc04d55..61f38f0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelTagMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsRelTagMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.goods;
import com.hrt.system.domain.poji.goods.GoodsRelTag;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsTotalMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsTotalMapper.java
index b614603..039040d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsTotalMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/goods/GoodsTotalMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.goods;
import com.hrt.system.domain.poji.goods.GoodsTotal;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveFieldsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveFieldsMapper.java
index dab7387..39967f4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveFieldsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveFieldsMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.member;
import com.hrt.system.domain.poji.member.MemberArchiveFields;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveMapper.java
index a9a965f..068ef15 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberArchiveMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.member;
import com.hrt.system.domain.poji.member.MemberArchive;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberMapper.java
new file mode 100644
index 0000000..b453378
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberMapper.java
@@ -0,0 +1,25 @@
+package com.hrt.system.mapper.member;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.poji.member.Member;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-19
+ */
+public interface MemberMapper extends BaseMapper<Member> {
+
+ /**
+ *
+ * @param miniOpenid
+ * @return
+ */
+ Member getOneByMiniOpenid(@Param("miniOpenid")String miniOpenid);
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberNurseMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberNurseMapper.java
new file mode 100644
index 0000000..b1d4edb
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/MemberNurseMapper.java
@@ -0,0 +1,16 @@
+package com.hrt.system.mapper.member;
+
+import com.hrt.system.domain.poji.member.MemberNurse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户调理问题 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface MemberNurseMapper extends BaseMapper<MemberNurse> {
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/UserCouponMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/UserCouponMapper.java
index 105edd8..8423d02 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/UserCouponMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/member/UserCouponMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.member;
import com.hrt.system.domain.poji.member.UserCoupon;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ConsumerGoodsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ConsumerGoodsMapper.java
index bc2aaaf..0a62d64 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ConsumerGoodsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ConsumerGoodsMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.order;
import com.hrt.system.domain.poji.order.ConsumerGoods;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderGoodsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderGoodsMapper.java
index 9be1321..99b7530 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderGoodsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderGoodsMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.order;
import com.hrt.system.domain.poji.order.OrderGoods;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderMapper.java
index 1455d11..d5a3cc5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/OrderMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.order;
import com.hrt.system.domain.poji.order.Order;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ShoppingCartMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ShoppingCartMapper.java
index 0ede057..f2cb7d4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ShoppingCartMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/ShoppingCartMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.order;
import com.hrt.system.domain.poji.order.ShoppingCart;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/UserServiceRecordMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/UserServiceRecordMapper.java
index d742dfc..291ae14 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/UserServiceRecordMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/order/UserServiceRecordMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.order;
import com.hrt.system.domain.poji.order.UserServiceRecord;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskMapper.java
index 50fb89b..bfbf526 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.MemberTask;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskRecordMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskRecordMapper.java
index b268b01..c8e7ff0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskRecordMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/MemberTaskRecordMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.MemberTaskRecord;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopCertificateMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopCertificateMapper.java
new file mode 100644
index 0000000..8b7adaf
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopCertificateMapper.java
@@ -0,0 +1,17 @@
+package com.hrt.system.mapper.shop;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.poji.shop.ShopCertificate;
+
+
+/**
+ * <p>
+ * 商户证书 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface ShopCertificateMapper extends BaseMapper<ShopCertificate> {
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopFileMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopFileMapper.java
index 95ab50f..18f4dc2 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopFileMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopFileMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopFile;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopGoodsMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopGoodsMapper.java
index 9290fd4..a1438fc 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopGoodsMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopGoodsMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopGoods;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMapper.java
index 493c585..b95b2a4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.Shop;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMarketingMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMarketingMapper.java
index ba88572..471754f 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMarketingMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopMarketingMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopMarketing;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelTagMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelTagMapper.java
index 810302a..0ddfab5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelTagMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelTagMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopRelTag;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelUserMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelUserMapper.java
index 816f1f8..48493c6 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelUserMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopRelUserMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopRelUser;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTaskMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTaskMapper.java
index ce520b2..f569f13 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTaskMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTaskMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopTask;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTransferRecordMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTransferRecordMapper.java
index 1b6c829..f191304 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTransferRecordMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/ShopTransferRecordMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.ShopTransferRecord;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/TaskFileMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/TaskFileMapper.java
index 4e9bc6f..8863120 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/TaskFileMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/shop/TaskFileMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.shop;
import com.hrt.system.domain.poji.shop.TaskFile;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AdvertMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AdvertMapper.java
new file mode 100644
index 0000000..0f1dfff
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AdvertMapper.java
@@ -0,0 +1,22 @@
+package com.hrt.system.mapper.sys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.poji.sys.Advert;
+import com.hrt.system.domain.vo.AppAdvertVo;
+
+/**
+ * <p>
+ * 快速入口 Mapper 接口
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface AdvertMapper extends BaseMapper<Advert> {
+
+ /**
+ * 获取首页广告
+ * @return
+ */
+ AppAdvertVo getAdvertVo();
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AgreementMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AgreementMapper.java
index d68eeae..93349c5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AgreementMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/AgreementMapper.java
@@ -1,7 +1,9 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.Agreement;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.vo.AppAgreementVo;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +15,10 @@
*/
public interface AgreementMapper extends BaseMapper<Agreement> {
+ /**
+ * 通过协议类型获取协议
+ * @param type
+ * @return
+ */
+ AppAgreementVo getAppAgreementVoByType(@Param("type")Integer type);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/BannerMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/BannerMapper.java
index cffb1b2..4431e2b 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/BannerMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/BannerMapper.java
@@ -1,7 +1,10 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.Banner;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.vo.AppBannerVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,10 @@
*/
public interface BannerMapper extends BaseMapper<Banner> {
+
+ /**
+ * 获取首页banner
+ * @return
+ */
+ List<AppBannerVo> listHomeBannerVo();
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/CustomeConfigMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/CustomeConfigMapper.java
index fbf9278..0d4e335 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/CustomeConfigMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/CustomeConfigMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.CustomeConfig;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/PopMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/PopMapper.java
index e2fc726..eb603f8 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/PopMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/PopMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.Pop;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/QuickEntryMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/QuickEntryMapper.java
index 2fa781e..9824358 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/QuickEntryMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/QuickEntryMapper.java
@@ -1,7 +1,10 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.QuickEntry;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrt.system.domain.vo.AppQuickEntryVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,9 @@
*/
public interface QuickEntryMapper extends BaseMapper<QuickEntry> {
+ /**
+ * 获取快速入口列表
+ * @return
+ */
+ List<AppQuickEntryVo> listQuickEntryVo();
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysClassificationMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysClassificationMapper.java
index dd0424b..b93b026 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysClassificationMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysClassificationMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.SysClassification;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysTagMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysTagMapper.java
index 673d265..b583a35 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysTagMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/sys/SysTagMapper.java
@@ -1,7 +1,7 @@
package com.hrt.system.mapper.sys;
import com.hrt.system.domain.poji.sys.SysTag;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserMapper.java
index 0c57071..57f5735 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserMapper.java
@@ -2,7 +2,7 @@
import java.util.List;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.hrt.system.api.domain.SysUser;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserPostMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserPostMapper.java
index 1b59986..1217f96 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserPostMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserPostMapper.java
@@ -2,7 +2,7 @@
import java.util.List;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hrt.system.domain.poji.user.SysUserPost;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserRoleMapper.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserRoleMapper.java
index 5a3e66d..fadfcc0 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserRoleMapper.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/mapper/user/SysUserRoleMapper.java
@@ -2,7 +2,7 @@
import java.util.List;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hrt.system.domain.poji.user.SysUserRole;
import org.apache.ibatis.annotations.Param;
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelGoodsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelGoodsService.java
index ddea6df..a57c139 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelGoodsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelGoodsService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.coupon;
import com.hrt.system.domain.poji.coupon.CouponRelGoods;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelUserService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelUserService.java
index f289e81..5d32478 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelUserService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponRelUserService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.coupon;
import com.hrt.system.domain.poji.coupon.CouponRelUser;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponService.java
index 8cb9519..9e2513d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.coupon;
import com.hrt.system.domain.poji.coupon.Coupon;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponTotalService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponTotalService.java
index c292089..11f504f 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponTotalService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/coupon/CouponTotalService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.coupon;
import com.hrt.system.domain.poji.coupon.CouponTotal;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsFileService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsFileService.java
index 7376ef6..519d098 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsFileService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsFileService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.goods;
import com.hrt.system.domain.poji.goods.GoodsFile;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelNurseService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelNurseService.java
index cb67cd8..2cb1f45 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelNurseService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelNurseService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.goods;
import com.hrt.system.domain.poji.goods.GoodsRelNurse;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelTagService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelTagService.java
index eb1814d..2d83e64 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelTagService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsRelTagService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.goods;
import com.hrt.system.domain.poji.goods.GoodsRelTag;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsService.java
index 87d7be6..efdc5ce 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsService.java
@@ -1,7 +1,17 @@
package com.hrt.system.service.goods;
+import com.hrt.system.domain.dto.AppGoodsInfoGetDto;
+import com.hrt.system.domain.dto.AppSearchGoodsPageDto;
+import com.hrt.system.domain.dto.AppShopGoodsPageDto;
import com.hrt.system.domain.poji.goods.Goods;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.vo.AppGoodsInfoVo;
+import com.hrt.system.domain.vo.AppSimpleActivityGoodsVo;
+import com.hrt.system.domain.vo.AppSimpleGoodsVo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+
+import java.util.List;
/**
* <p>
@@ -13,4 +23,41 @@
*/
public interface GoodsService extends IService<Goods> {
+ /**
+ * 获取推荐商品列表
+ * @param page
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageRecommendGoods(Page page,Long shopId);
+
+ /**
+ * 获取商城商品列表
+ * @param page
+ * @param appShopGoodsPageDto
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageShopGoods(Page page, AppShopGoodsPageDto appShopGoodsPageDto);
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ List<AppSimpleGoodsVo> pageSearchGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto);
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ List<AppSimpleActivityGoodsVo> pageSearchActivityGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto);
+
+ /**
+ * 获取商品详情
+ * @param appGoodsInfoGetDto
+ * @return
+ */
+ AppGoodsInfoVo getGoodsInfo(AppGoodsInfoGetDto appGoodsInfoGetDto);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsTotalService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsTotalService.java
index e855d0a..b94b264 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsTotalService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/goods/GoodsTotalService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.goods;
import com.hrt.system.domain.poji.goods.GoodsTotal;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AdvertServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AdvertServiceImpl.java
new file mode 100644
index 0000000..dd97ba8
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AdvertServiceImpl.java
@@ -0,0 +1,34 @@
+package com.hrt.system.service.impl;
+
+import com.hrt.system.domain.poji.sys.Advert;
+import com.hrt.system.domain.vo.AppAdvertVo;
+import com.hrt.system.mapper.sys.AdvertMapper;
+import com.hrt.system.service.sys.AdvertService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 快速入口 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Service
+public class AdvertServiceImpl extends ServiceImpl<AdvertMapper, Advert> implements AdvertService {
+
+ @Resource
+ private AdvertMapper advertMapper;
+
+ /**
+ * 获取首页广告
+ * @return
+ */
+ @Override
+ public AppAdvertVo getAdvertVo(){
+ return advertMapper.getAdvertVo();
+ }
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AgreementServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AgreementServiceImpl.java
index 06dad48..a9d9bfa 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AgreementServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/AgreementServiceImpl.java
@@ -1,10 +1,17 @@
package com.hrt.system.service.impl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hrt.common.core.exception.ServiceException;
+import com.hrt.system.constant.AppErrorConstant;
+import com.hrt.system.domain.dto.AppAgreementDto;
import com.hrt.system.domain.poji.sys.Agreement;
+import com.hrt.system.domain.vo.AppAgreementVo;
import com.hrt.system.mapper.sys.AgreementMapper;
import com.hrt.system.service.sys.AgreementService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -17,4 +24,21 @@
@Service
public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements AgreementService {
+
+ @Resource
+ private AgreementMapper agreementMapper;
+
+ /**
+ * 获取各种协议
+ * @param appAgreementDto
+ * @return
+ */
+ @Override
+ public AppAgreementVo getAppAgreement(AppAgreementDto appAgreementDto){
+ AppAgreementVo appAgreementVo = agreementMapper.getAppAgreementVoByType(appAgreementDto.getType());
+ if(appAgreementVo==null){
+ throw new ServiceException(AppErrorConstant.AGREEMENT_FAILED);
+ }
+ return appAgreementVo;
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/BannerServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/BannerServiceImpl.java
index 1a30e21..8c38b11 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/BannerServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/BannerServiceImpl.java
@@ -1,10 +1,14 @@
package com.hrt.system.service.impl;
import com.hrt.system.domain.poji.sys.Banner;
+import com.hrt.system.domain.vo.AppBannerVo;
import com.hrt.system.mapper.sys.BannerMapper;
import com.hrt.system.service.sys.BannerService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +21,15 @@
@Service
public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
+ @Resource
+ private BannerMapper bannerMapper;
+
+ /**
+ * 获取首页banner
+ * @return
+ */
+ @Override
+ public List<AppBannerVo> listHomeBannerVo(){
+ return bannerMapper.listHomeBannerVo();
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ConsumerGoodsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ConsumerGoodsServiceImpl.java
index add6e53..b2a6764 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ConsumerGoodsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ConsumerGoodsServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.order.ConsumerGoods;
import com.hrt.system.mapper.order.ConsumerGoodsMapper;
import com.hrt.system.service.order.ConsumerGoodsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelGoodsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelGoodsServiceImpl.java
index 9961906..d96438e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelGoodsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelGoodsServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.coupon.CouponRelGoods;
import com.hrt.system.mapper.coupon.CouponRelGoodsMapper;
import com.hrt.system.service.coupon.CouponRelGoodsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelUserServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelUserServiceImpl.java
index 81778a2..72f4a55 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelUserServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponRelUserServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.coupon.CouponRelUser;
import com.hrt.system.mapper.coupon.CouponRelUserMapper;
import com.hrt.system.service.coupon.CouponRelUserService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponServiceImpl.java
index 8f33b4c..409efa5 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.coupon.Coupon;
import com.hrt.system.mapper.coupon.CouponMapper;
import com.hrt.system.service.coupon.CouponService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponTotalServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponTotalServiceImpl.java
index ef9eb2d..1cd30c2 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponTotalServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CouponTotalServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.coupon.CouponTotal;
import com.hrt.system.mapper.coupon.CouponTotalMapper;
import com.hrt.system.service.coupon.CouponTotalService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CustomeConfigServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CustomeConfigServiceImpl.java
index 43c7157..a2ce739 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CustomeConfigServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/CustomeConfigServiceImpl.java
@@ -1,9 +1,10 @@
package com.hrt.system.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hrt.system.domain.poji.sys.CustomeConfig;
import com.hrt.system.mapper.sys.CustomeConfigMapper;
import com.hrt.system.service.sys.CustomeConfigService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsFileServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsFileServiceImpl.java
index 48a5113..e3faaa9 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsFileServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsFileServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.goods.GoodsFile;
import com.hrt.system.mapper.goods.GoodsFileMapper;
import com.hrt.system.service.goods.GoodsFileService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelNurseServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelNurseServiceImpl.java
index fbaeb4d..081038e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelNurseServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelNurseServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.goods.GoodsRelNurse;
import com.hrt.system.mapper.goods.GoodsRelNurseMapper;
import com.hrt.system.service.goods.GoodsRelNurseService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelTagServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelTagServiceImpl.java
index 9e746e7..6f99da4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelTagServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsRelTagServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.goods.GoodsRelTag;
import com.hrt.system.mapper.goods.GoodsRelTagMapper;
import com.hrt.system.service.goods.GoodsRelTagService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsServiceImpl.java
index 120a5e6..b71a5e1 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsServiceImpl.java
@@ -1,10 +1,23 @@
package com.hrt.system.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hrt.common.core.utils.bean.BeanUtils;
+import com.hrt.system.domain.dto.AppGoodsInfoGetDto;
+import com.hrt.system.domain.dto.AppSearchGoodsPageDto;
+import com.hrt.system.domain.dto.AppShopGoodsPageDto;
import com.hrt.system.domain.poji.goods.Goods;
+import com.hrt.system.domain.poji.shop.ShopGoods;
+import com.hrt.system.domain.vo.AppGoodsInfoVo;
+import com.hrt.system.domain.vo.AppSimpleActivityGoodsVo;
+import com.hrt.system.domain.vo.AppSimpleGoodsVo;
import com.hrt.system.mapper.goods.GoodsMapper;
import com.hrt.system.service.goods.GoodsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
/**
* <p>
@@ -17,4 +30,82 @@
@Service
public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
+ @Resource
+ private GoodsMapper goodsMapper;
+
+ /**
+ * 获取推荐商品列表
+ * @param page
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageRecommendGoods(Page page,Long shopId){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageRecommendGoods(page,shopId);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取商城商品列表
+ * @param page
+ * @param appShopGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageShopGoods(Page page, AppShopGoodsPageDto appShopGoodsPageDto){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageShopGoods(page,appShopGoodsPageDto);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleGoodsVo> pageSearchGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
+ List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchGoods(page,appSearchGoodsPageDto);
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取搜索商品列表
+ * @param page
+ * @param appSearchGoodsPageDto
+ * @return
+ */
+ @Override
+ public List<AppSimpleActivityGoodsVo> pageSearchActivityGoods(Page page, AppSearchGoodsPageDto appSearchGoodsPageDto){
+ List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsMapper.pageSearchActivityGoods(page,appSearchGoodsPageDto);
+ Integer activityNumber;
+ BigDecimal activityNumberBig;
+ Integer salesNumber;
+ BigDecimal salesNumberBig;
+ BigDecimal salesPercent;
+ for(AppSimpleActivityGoodsVo appSimpleActivityGoodsVo : appSimpleGoodsVoList){
+ activityNumber = appSimpleActivityGoodsVo.getActivityNumber();
+ salesNumber = appSimpleActivityGoodsVo.getSalesNumber();
+ activityNumberBig = BigDecimal.valueOf(activityNumber);
+ salesNumberBig = BigDecimal.valueOf(salesNumber);
+ salesPercent = salesNumberBig.divide(activityNumberBig,2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.00"));
+ appSimpleActivityGoodsVo.setSalesPercent(salesPercent);
+ }
+ return appSimpleGoodsVoList;
+ }
+
+ /**
+ * 获取商品详情
+ * @param appGoodsInfoGetDto
+ * @return
+ */
+ @Override
+ public AppGoodsInfoVo getGoodsInfo(AppGoodsInfoGetDto appGoodsInfoGetDto){
+ AppGoodsInfoVo appGoodsInfoVo = new AppGoodsInfoVo();
+ Goods goods = this.getById(appGoodsInfoGetDto.getId());
+ BeanUtils.copyProperties(goods, appGoodsInfoVo);
+ if(appGoodsInfoGetDto.getActivityFlag()==1){
+
+ }
+ return appGoodsInfoVo;
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsTotalServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsTotalServiceImpl.java
index 4117544..33bb79b 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsTotalServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/GoodsTotalServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.goods.GoodsTotal;
import com.hrt.system.mapper.goods.GoodsTotalMapper;
import com.hrt.system.service.goods.GoodsTotalService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveFieldsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveFieldsServiceImpl.java
index b5548d3..0f1b05d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveFieldsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveFieldsServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.member.MemberArchiveFields;
import com.hrt.system.mapper.member.MemberArchiveFieldsMapper;
import com.hrt.system.service.member.MemberArchiveFieldsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveServiceImpl.java
index 81ac71c..62f5d09 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberArchiveServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.member.MemberArchive;
import com.hrt.system.mapper.member.MemberArchiveMapper;
import com.hrt.system.service.member.MemberArchiveService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberNurseServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberNurseServiceImpl.java
new file mode 100644
index 0000000..c87a98c
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberNurseServiceImpl.java
@@ -0,0 +1,21 @@
+package com.hrt.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hrt.system.domain.poji.member.MemberNurse;
+import com.hrt.system.mapper.member.MemberNurseMapper;
+import com.hrt.system.service.member.MemberNurseService;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户调理问题 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Service
+public class MemberNurseServiceImpl extends ServiceImpl<MemberNurseMapper, MemberNurse> implements MemberNurseService {
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberServiceImpl.java
new file mode 100644
index 0000000..d41678f
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberServiceImpl.java
@@ -0,0 +1,186 @@
+package com.hrt.system.service.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hrt.common.core.exception.ServiceException;
+import com.hrt.common.core.utils.StringUtils;
+import com.hrt.common.core.utils.uuid.UUID;
+import com.hrt.common.security.utils.SecurityUtils;
+import com.hrt.system.api.domain.SysUser;
+import com.hrt.system.constant.AppErrorConstant;
+import com.hrt.system.constant.SecurityConstant;
+import com.hrt.system.domain.dto.AppMiniLoginDto;
+import com.hrt.system.domain.dto.AppNearbyShopDto;
+import com.hrt.system.domain.dto.AppUserAuthorizeDto;
+import com.hrt.system.domain.poji.member.Member;
+import com.hrt.system.domain.poji.shop.Shop;
+import com.hrt.system.domain.vo.AppMiniLoginVo;
+import com.hrt.system.domain.vo.AppNearbyShopVo;
+import com.hrt.system.domain.vo.AppUserAuthorizeVo;
+import com.hrt.system.mapper.member.MemberMapper;
+import com.hrt.system.service.member.MemberService;
+import com.hrt.system.service.shop.ShopService;
+import com.hrt.system.service.user.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-19
+ */
+@Service
+public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
+
+
+ @Resource
+ private WxMaService wxMaService;
+
+ @Resource
+ private ISysUserService sysUserService;
+
+ @Resource
+ private MemberMapper memberMapper;
+
+ @Resource
+ private ShopService shopService;
+
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
+
+ /**
+ *
+ * @param appMiniLoginDto
+ * @return
+ */
+ @Override
+ public AppMiniLoginVo getMemberByCode(AppMiniLoginDto appMiniLoginDto){
+
+ AppMiniLoginVo appMiniLoginVo = new AppMiniLoginVo();
+ WxMaJscode2SessionResult session = null;
+ String unionid;
+ String openid;
+ String sessionKey = null;
+ //获取session
+ try {
+ session = wxMaService.getUserService().getSessionInfo(appMiniLoginDto.getCode());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
+ }
+ if(session!=null&& StringUtils.isNotBlank(session.getOpenid())){
+ unionid = session.getUnionid();
+ openid = session.getOpenid();
+ sessionKey = session.getSessionKey();
+ //获取用户
+ Member member = memberMapper.getOneByMiniOpenid(openid);
+ SysUser sysUser;
+ if(member==null){
+ //创建新用户
+ String memberId = UUID.randomUUID().toString();
+ sysUser = new SysUser();
+ sysUser.setUserName(memberId);
+ sysUser.setNickName("微信用户");
+ String password = "hongruitang";
+ sysUser.setPassword(SecurityUtils.encryptPassword(password));
+ sysUserService.registerUser(sysUser);
+ member = new Member();
+ member.setUserId(sysUser.getUserId());
+ member.setDelFlag(0);
+ member.setMemberId(memberId);
+ member.setWxUnionid(unionid);
+ member.setMiniOpenid(openid);
+ member.setCreateTime(new Date());
+ this.save(member);
+ }else{
+ sysUser = sysUserService.selectUserById(member.getUserId());
+ }
+ appMiniLoginVo.setMiniOpenid(openid);
+ appMiniLoginVo.setWxUnionid(unionid);
+ appMiniLoginVo.setSysUser(sysUser);
+ appMiniLoginVo.setSessionKey(sessionKey);
+ //sessionKey
+ stringRedisTemplate.opsForValue().set(SecurityConstant.SESSION_KEY+openid,sessionKey);
+ }else{
+ return null;
+ }
+ return appMiniLoginVo;
+ }
+
+ /**
+ * 获取授权信息
+ * @param appUserAuthorizeDto
+ * @return
+ */
+ @Override
+ public AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto){
+ Member member = this.getById(appUserAuthorizeDto.getUserId());
+ AppUserAuthorizeVo appUserAuthorizeVo = new AppUserAuthorizeVo();
+ //获取code接口在redis里存放的sessionkey用于解密
+ String sessionkey = stringRedisTemplate.opsForValue().get(SecurityConstant.SESSION_KEY+ member.getMiniOpenid());
+ if(StringUtils.isBlank(sessionkey)){
+ throw new ServiceException(AppErrorConstant.USER_NOT_LOGIN);
+ }
+ String mobile = null;
+ try {
+ //解密微信加密用户信息和手机号
+ WxMaPhoneNumberInfo wxPhoneInfo;
+ if(StringUtils.isNotBlank(appUserAuthorizeDto.getPhoneEncryptedData())&&StringUtils.isNotBlank(appUserAuthorizeDto.getPhoneIv())){
+ wxPhoneInfo = wxMaService.getUserService().getPhoneNoInfo(sessionkey, appUserAuthorizeDto.getPhoneEncryptedData(), appUserAuthorizeDto.getPhoneIv());
+ }else{
+ throw new ServiceException(AppErrorConstant.AUTHORIZE_MISS);
+ }
+ if(StringUtils.isBlank(wxPhoneInfo.getPhoneNumber())){
+ throw new ServiceException(AppErrorConstant.AUTHORIZE_FAILED);
+ }
+ mobile = wxPhoneInfo.getPhoneNumber();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //更新用户手机信息
+ SysUser sysUser = sysUserService.selectUserById(appUserAuthorizeDto.getUserId());
+ sysUser.setPhonenumber(mobile);
+ sysUserService.updateUser(sysUser);
+ member.setMobile(mobile);
+ this.saveOrUpdate(member);
+ appUserAuthorizeVo.setMobile(mobile);
+ appUserAuthorizeVo.setNickName(sysUser.getNickName());
+ appUserAuthorizeVo.setOpenid(member.getMiniOpenid());
+ appUserAuthorizeVo.setUnionid(member.getWxUnionid());
+ return appUserAuthorizeVo;
+ }
+
+ /**
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ @Override
+ public AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto){
+ Member member = this.getById(appNearbyShopDto.getUserId());
+ AppNearbyShopVo appNearbyShopVo = new AppNearbyShopVo();
+ Shop shop = null;
+ if(member.getRealtionShopId()!=null){
+ //获取绑定商户
+ shop = shopService.getById(member.getRealtionShopId());
+ }else{
+ //获取附近商户
+ shop = shopService.getById(1L);
+ }
+ appNearbyShopVo.setShopId(shop.getShopId());
+ appNearbyShopVo.setShopName(shop.getShopName());
+ appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
+ appNearbyShopVo.setShopLatitude(shop.getShopLatitude());
+ appNearbyShopVo.setShopLongitude(shop.getShopLongitude());
+ return appNearbyShopVo;
+ }
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskRecordServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskRecordServiceImpl.java
index b0d48f2..7d55b58 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskRecordServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskRecordServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.MemberTaskRecord;
import com.hrt.system.mapper.shop.MemberTaskRecordMapper;
import com.hrt.system.service.shop.MemberTaskRecordService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskServiceImpl.java
index e653efd..bd37e7e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/MemberTaskServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.MemberTask;
import com.hrt.system.mapper.shop.MemberTaskMapper;
import com.hrt.system.service.shop.MemberTaskService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderGoodsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderGoodsServiceImpl.java
index d738d55..42b8d92 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderGoodsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderGoodsServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.order.OrderGoods;
import com.hrt.system.mapper.order.OrderGoodsMapper;
import com.hrt.system.service.order.OrderGoodsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderServiceImpl.java
index 005010d..ec3985a 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/OrderServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.order.Order;
import com.hrt.system.mapper.order.OrderMapper;
import com.hrt.system.service.order.OrderService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/PopServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/PopServiceImpl.java
index c427e6b..7d4edd9 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/PopServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/PopServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.sys.Pop;
import com.hrt.system.mapper.sys.PopMapper;
import com.hrt.system.service.sys.PopService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/QuickEntryServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/QuickEntryServiceImpl.java
index 23c0df7..9db7d92 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/QuickEntryServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/QuickEntryServiceImpl.java
@@ -1,10 +1,14 @@
package com.hrt.system.service.impl;
import com.hrt.system.domain.poji.sys.QuickEntry;
+import com.hrt.system.domain.vo.AppQuickEntryVo;
import com.hrt.system.mapper.sys.QuickEntryMapper;
import com.hrt.system.service.sys.QuickEntryService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +21,15 @@
@Service
public class QuickEntryServiceImpl extends ServiceImpl<QuickEntryMapper, QuickEntry> implements QuickEntryService {
+ @Resource
+ private QuickEntryMapper quickEntryMapper;
+
+ /**
+ * 获取快速入口列表
+ * @return
+ */
+ @Override
+ public List<AppQuickEntryVo> listQuickEntryVo(){
+ return quickEntryMapper.listQuickEntryVo();
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopCertificateServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopCertificateServiceImpl.java
new file mode 100644
index 0000000..639e380
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopCertificateServiceImpl.java
@@ -0,0 +1,39 @@
+package com.hrt.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hrt.system.domain.poji.shop.ShopCertificate;
+import com.hrt.system.domain.poji.shop.ShopFile;
+import com.hrt.system.mapper.shop.ShopCertificateMapper;
+import com.hrt.system.service.shop.ShopCertificateService;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商户证书 服务实现类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+@Service
+public class ShopCertificateServiceImpl extends ServiceImpl<ShopCertificateMapper, ShopCertificate> implements ShopCertificateService {
+
+
+ /**
+ * 通过商户id获取商户证书
+ * @param shopId
+ * @return
+ */
+ @Override
+ public List<ShopCertificate> listShopCertificateByShopId(Long shopId){
+ LambdaQueryWrapper<ShopCertificate> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopCertificate::getDelFlag, 0).eq(ShopCertificate::getShopId, shopId).eq(ShopCertificate::getCerStatus,1);
+ return this.list(queryWrapper);
+ }
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopFileServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopFileServiceImpl.java
index 31cc894..28e4bc8 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopFileServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopFileServiceImpl.java
@@ -1,10 +1,14 @@
package com.hrt.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hrt.system.domain.poji.shop.ShopFile;
import com.hrt.system.mapper.shop.ShopFileMapper;
import com.hrt.system.service.shop.ShopFileService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +21,18 @@
@Service
public class ShopFileServiceImpl extends ServiceImpl<ShopFileMapper, ShopFile> implements ShopFileService {
+
+ /**
+ * 通过商户id获取商户文件
+ * @param shopId
+ * @return
+ */
+ @Override
+ public List<ShopFile> listShopFileByShopId(Long shopId){
+ LambdaQueryWrapper<ShopFile> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopFile::getDelFlag, 0).eq(ShopFile::getShopId, shopId);
+ return this.list(queryWrapper);
+ }
+
+
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopGoodsServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopGoodsServiceImpl.java
index 7a25010..daa654d 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopGoodsServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopGoodsServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.ShopGoods;
import com.hrt.system.mapper.shop.ShopGoodsMapper;
import com.hrt.system.service.shop.ShopGoodsService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopMarketingServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopMarketingServiceImpl.java
index b2e889f..49eee93 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopMarketingServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopMarketingServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.ShopMarketing;
import com.hrt.system.mapper.shop.ShopMarketingMapper;
import com.hrt.system.service.shop.ShopMarketingService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelTagServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelTagServiceImpl.java
index bbae999..788dd10 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelTagServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelTagServiceImpl.java
@@ -1,10 +1,15 @@
package com.hrt.system.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hrt.system.domain.poji.shop.ShopFile;
import com.hrt.system.domain.poji.shop.ShopRelTag;
import com.hrt.system.mapper.shop.ShopRelTagMapper;
import com.hrt.system.service.shop.ShopRelTagService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +22,15 @@
@Service
public class ShopRelTagServiceImpl extends ServiceImpl<ShopRelTagMapper, ShopRelTag> implements ShopRelTagService {
+ /**
+ * 通过商户id获取标签
+ * @param shopId
+ * @return
+ */
+ @Override
+ public List<ShopRelTag> listShopRelTagByShopId(Long shopId){
+ LambdaQueryWrapper<ShopRelTag> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopRelTag::getDelFlag, 0).eq(ShopRelTag::getShopId, shopId);
+ return this.list(queryWrapper);
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelUserServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelUserServiceImpl.java
index 29d22ae..53189c6 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelUserServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopRelUserServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.ShopRelUser;
import com.hrt.system.mapper.shop.ShopRelUserMapper;
import com.hrt.system.service.shop.ShopRelUserService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopServiceImpl.java
index f5b753b..2aade65 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopServiceImpl.java
@@ -1,10 +1,23 @@
package com.hrt.system.service.impl;
import com.hrt.system.domain.poji.shop.Shop;
+import com.hrt.system.domain.poji.shop.ShopCertificate;
+import com.hrt.system.domain.poji.shop.ShopFile;
+import com.hrt.system.domain.poji.shop.ShopRelTag;
+import com.hrt.system.domain.vo.AppShopInfoVo;
import com.hrt.system.mapper.shop.ShopMapper;
+import com.hrt.system.service.shop.ShopCertificateService;
+import com.hrt.system.service.shop.ShopFileService;
+import com.hrt.system.service.shop.ShopRelTagService;
import com.hrt.system.service.shop.ShopService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.StringJoiner;
/**
* <p>
@@ -17,4 +30,47 @@
@Service
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
+ @Resource
+ private ShopMapper shopMapper;
+
+ @Resource
+ private ShopFileService shopFileService;
+
+ @Resource
+ private ShopCertificateService shopCertificateService;
+
+ /**
+ * 获取商户详情
+ * @param shopId
+ * @return
+ */
+ @Override
+ public AppShopInfoVo getShopInfo(Long shopId){
+ AppShopInfoVo appShopInfoVo = new AppShopInfoVo();
+ Shop shop = this.getById(shopId);
+ BeanUtils.copyProperties(shop,appShopInfoVo);
+ //商户地址
+ appShopInfoVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
+ //商品图片
+ List<ShopFile> shopFileList = shopFileService.listShopFileByShopId(shopId);
+ String shopPicture = null;
+ StringJoiner shopBanners = new StringJoiner(",");
+ if(shopFileList!=null&&!shopFileList.isEmpty()){
+ for(ShopFile shopFile : shopFileList){
+ if(shopFile.getFileType()==1){
+ shopPicture = shopFile.getFileUrl();
+ }else{
+ shopBanners.add(shopFile.getFileUrl());
+ }
+ }
+ }
+ appShopInfoVo.setShopPicture(shopPicture);
+ appShopInfoVo.setShopBanners(shopBanners.toString());
+ //商户证书
+ List<ShopCertificate> shopCertificateList = shopCertificateService.listShopCertificateByShopId(shopId);
+ if(shopCertificateList!=null&&!shopCertificateList.isEmpty()){
+ appShopInfoVo.setShopCertificateList(shopCertificateList);
+ }
+ return appShopInfoVo;
+ }
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTaskServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTaskServiceImpl.java
index 3896c69..ac7b5eb 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTaskServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTaskServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.ShopTask;
import com.hrt.system.mapper.shop.ShopTaskMapper;
import com.hrt.system.service.shop.ShopTaskService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTransferRecordServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTransferRecordServiceImpl.java
index 322877c..041c89e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTransferRecordServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShopTransferRecordServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.ShopTransferRecord;
import com.hrt.system.mapper.shop.ShopTransferRecordMapper;
import com.hrt.system.service.shop.ShopTransferRecordService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShoppingCartServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShoppingCartServiceImpl.java
index e496c5e..aa57b32 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShoppingCartServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/ShoppingCartServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.order.ShoppingCart;
import com.hrt.system.mapper.order.ShoppingCartMapper;
import com.hrt.system.service.order.ShoppingCartService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysClassificationServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysClassificationServiceImpl.java
index f5f9026..36f0b56 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysClassificationServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysClassificationServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.sys.SysClassification;
import com.hrt.system.mapper.sys.SysClassificationMapper;
import com.hrt.system.service.sys.SysClassificationService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysTagServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysTagServiceImpl.java
index d164617..c35521f 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysTagServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/SysTagServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.sys.SysTag;
import com.hrt.system.mapper.sys.SysTagMapper;
import com.hrt.system.service.sys.SysTagService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/TaskFileServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/TaskFileServiceImpl.java
index 95962bb..bd3c829 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/TaskFileServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/TaskFileServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.shop.TaskFile;
import com.hrt.system.mapper.shop.TaskFileMapper;
import com.hrt.system.service.shop.TaskFileService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserCouponServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserCouponServiceImpl.java
index a7bdbc7..685d1c2 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserCouponServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserCouponServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.member.UserCoupon;
import com.hrt.system.mapper.member.UserCouponMapper;
import com.hrt.system.service.member.UserCouponService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserServiceRecordServiceImpl.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserServiceRecordServiceImpl.java
index c2f3cc6..e801fb9 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserServiceRecordServiceImpl.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/impl/UserServiceRecordServiceImpl.java
@@ -3,7 +3,7 @@
import com.hrt.system.domain.poji.order.UserServiceRecord;
import com.hrt.system.mapper.order.UserServiceRecordMapper;
import com.hrt.system.service.shop.UserServiceRecordService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveFieldsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveFieldsService.java
index 6bbc179..c839aae 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveFieldsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveFieldsService.java
@@ -1,7 +1,8 @@
package com.hrt.system.service.member;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.hrt.system.domain.poji.member.MemberArchiveFields;
-import com.baomidou.mybatisplus.service.IService;
+
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveService.java
index 1d3c5f7..fc0c7aa 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberArchiveService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.member;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.hrt.system.domain.poji.member.MemberArchive;
-import com.baomidou.mybatisplus.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberNurseService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberNurseService.java
new file mode 100644
index 0000000..e628573
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberNurseService.java
@@ -0,0 +1,17 @@
+package com.hrt.system.service.member;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.poji.member.MemberNurse;
+
+
+/**
+ * <p>
+ * 用户调理问题 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface MemberNurseService extends IService<MemberNurse> {
+
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberService.java
new file mode 100644
index 0000000..c6c97a9
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/MemberService.java
@@ -0,0 +1,42 @@
+package com.hrt.system.service.member;
+
+import com.hrt.system.domain.dto.AppMiniLoginDto;
+import com.hrt.system.domain.dto.AppNearbyShopDto;
+import com.hrt.system.domain.dto.AppUserAuthorizeDto;
+import com.hrt.system.domain.vo.AppMiniLoginVo;
+import com.hrt.system.domain.vo.AppNearbyShopVo;
+import com.hrt.system.domain.vo.AppUserAuthorizeVo;
+import com.hrt.system.domain.poji.member.Member;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-19
+ */
+public interface MemberService extends IService<Member> {
+
+ /**
+ * 小程序登录
+ * @param appMiniLoginDto
+ * @return
+ */
+ AppMiniLoginVo getMemberByCode(AppMiniLoginDto appMiniLoginDto);
+
+ /**
+ * 获取授权信息
+ * @param appUserAuthorizeDto
+ * @return
+ */
+ AppUserAuthorizeVo getAppUserAuthorize(AppUserAuthorizeDto appUserAuthorizeDto);
+
+ /**
+ * 获取附近门店
+ * @param appNearbyShopDto
+ * @return
+ */
+ AppNearbyShopVo getNearbyShop(AppNearbyShopDto appNearbyShopDto);
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/UserCouponService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/UserCouponService.java
index 0c2fc98..c8fb424 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/UserCouponService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/member/UserCouponService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.member;
import com.hrt.system.domain.poji.member.UserCoupon;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ConsumerGoodsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ConsumerGoodsService.java
index a9e7bf3..e2e7bb7 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ConsumerGoodsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ConsumerGoodsService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.order;
import com.hrt.system.domain.poji.order.ConsumerGoods;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderGoodsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderGoodsService.java
index f9f90b6..7d7c41c 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderGoodsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderGoodsService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.order;
import com.hrt.system.domain.poji.order.OrderGoods;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderService.java
index eb19017..d76081e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/OrderService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.order;
import com.hrt.system.domain.poji.order.Order;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ShoppingCartService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ShoppingCartService.java
index d178404..a00e751 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ShoppingCartService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/order/ShoppingCartService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.order;
import com.hrt.system.domain.poji.order.ShoppingCart;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskRecordService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskRecordService.java
index 7012b7f..c69b9e3 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskRecordService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskRecordService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.MemberTaskRecord;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskService.java
index 54aa9c2..9e1f9c7 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/MemberTaskService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.MemberTask;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopCertificateService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopCertificateService.java
new file mode 100644
index 0000000..59d02a8
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopCertificateService.java
@@ -0,0 +1,25 @@
+package com.hrt.system.service.shop;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.poji.shop.ShopCertificate;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 商户证书 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface ShopCertificateService extends IService<ShopCertificate> {
+
+ /**
+ * 通过商户id获取商户证书
+ * @param shopId
+ * @return
+ */
+ List<ShopCertificate> listShopCertificateByShopId(Long shopId);
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopFileService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopFileService.java
index 0e10002..0c1539f 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopFileService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopFileService.java
@@ -1,7 +1,9 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopFile;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +15,10 @@
*/
public interface ShopFileService extends IService<ShopFile> {
+ /**
+ * 通过商户id获取商户文件
+ * @param shopId
+ * @return
+ */
+ List<ShopFile> listShopFileByShopId(Long shopId);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopGoodsService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopGoodsService.java
index fc82c28..96542bd 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopGoodsService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopGoodsService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopGoods;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopMarketingService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopMarketingService.java
index 77cd30f..17a8447 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopMarketingService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopMarketingService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopMarketing;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelTagService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelTagService.java
index b801e18..9f22ba7 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelTagService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelTagService.java
@@ -1,7 +1,9 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopRelTag;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +15,10 @@
*/
public interface ShopRelTagService extends IService<ShopRelTag> {
+ /**
+ * 通过商户id获取标签
+ * @param shopId
+ * @return
+ */
+ List<ShopRelTag> listShopRelTagByShopId(Long shopId);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelUserService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelUserService.java
index e9464aa..e0a44ed 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelUserService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopRelUserService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopRelUser;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopService.java
index 3a902b7..16b7747 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopService.java
@@ -1,7 +1,8 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.Shop;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.vo.AppShopInfoVo;
/**
* <p>
@@ -13,4 +14,10 @@
*/
public interface ShopService extends IService<Shop> {
+ /**
+ * 获取商户详情
+ * @param shopId
+ * @return
+ */
+ AppShopInfoVo getShopInfo(Long shopId);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTaskService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTaskService.java
index 7e3b058..09500dd 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTaskService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTaskService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopTask;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTransferRecordService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTransferRecordService.java
index 864276b..d3a7bc4 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTransferRecordService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/ShopTransferRecordService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.ShopTransferRecord;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/TaskFileService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/TaskFileService.java
index 363bca0..236f2d2 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/TaskFileService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/TaskFileService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.shop.TaskFile;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/UserServiceRecordService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/UserServiceRecordService.java
index 2a126b9..d72d5eb 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/UserServiceRecordService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/shop/UserServiceRecordService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.shop;
import com.hrt.system.domain.poji.order.UserServiceRecord;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AdvertService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AdvertService.java
new file mode 100644
index 0000000..0a52fcf
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AdvertService.java
@@ -0,0 +1,23 @@
+package com.hrt.system.service.sys;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.poji.sys.Advert;
+import com.hrt.system.domain.vo.AppAdvertVo;
+
+
+/**
+ * <p>
+ * 快速入口 服务类
+ * </p>
+ *
+ * @author jqs
+ * @since 2023-04-20
+ */
+public interface AdvertService extends IService<Advert> {
+
+ /**
+ * 获取首页广告
+ * @return
+ */
+ AppAdvertVo getAdvertVo();
+}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AgreementService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AgreementService.java
index 7ffa7ee..6f12808 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AgreementService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/AgreementService.java
@@ -1,7 +1,9 @@
package com.hrt.system.service.sys;
+import com.hrt.system.domain.dto.AppAgreementDto;
import com.hrt.system.domain.poji.sys.Agreement;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.vo.AppAgreementVo;
/**
* <p>
@@ -13,4 +15,10 @@
*/
public interface AgreementService extends IService<Agreement> {
+ /**
+ * 获取各种协议
+ * @param appAgreementDto
+ * @return
+ */
+ AppAgreementVo getAppAgreement(AppAgreementDto appAgreementDto);
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/BannerService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/BannerService.java
index ae6db43..14a5fee 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/BannerService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/BannerService.java
@@ -1,7 +1,10 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.Banner;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.vo.AppBannerVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,9 @@
*/
public interface BannerService extends IService<Banner> {
+ /**
+ * 获取首页banner
+ * @return
+ */
+ List<AppBannerVo> listHomeBannerVo();
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/CustomeConfigService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/CustomeConfigService.java
index 4392537..6f6a76e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/CustomeConfigService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/CustomeConfigService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.CustomeConfig;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/PopService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/PopService.java
index 4d4beb7..fc891b9 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/PopService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/PopService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.Pop;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/QuickEntryService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/QuickEntryService.java
index 588ba0d..5505d44 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/QuickEntryService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/QuickEntryService.java
@@ -1,7 +1,10 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.QuickEntry;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hrt.system.domain.vo.AppQuickEntryVo;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,9 @@
*/
public interface QuickEntryService extends IService<QuickEntry> {
+ /**
+ * 获取快速入口列表
+ * @return
+ */
+ List<AppQuickEntryVo> listQuickEntryVo();
}
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysClassificationService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysClassificationService.java
index 8671075..29e94d3 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysClassificationService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysClassificationService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.SysClassification;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysTagService.java b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysTagService.java
index bd593b1..16c5d1e 100644
--- a/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysTagService.java
+++ b/hrt-modules/hrt-system/src/main/java/com/hrt/system/service/sys/SysTagService.java
@@ -1,7 +1,7 @@
package com.hrt.system.service.sys;
import com.hrt.system.domain.poji.sys.SysTag;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/goods/GoodsMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/goods/GoodsMapper.xml
index 9689341..4ae4811 100644
--- a/hrt-modules/hrt-system/src/main/resources/mapper/system/goods/GoodsMapper.xml
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/goods/GoodsMapper.xml
@@ -2,6 +2,137 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hrt.system.mapper.goods.GoodsMapper">
+ <!--分页获取推荐商品-->
+ <select id="pageRecommendGoods" resultType="com.hrt.system.domain.vo.AppSimpleGoodsVo">
+ SELECT
+ tg.goods_id goodsId,
+ tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
+ tg.goods_type goodsType,
+ CASE tg.goods_type
+ WHEN 1 THEN "周期"
+ WHEN 2 THEN "服务"
+ WHEN 3 THEN "体验"
+ WHEN 4 THEN "单品"
+ END goodsTag,
+ IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
+ tgf.file_url goodsPicture,
+ tg.goods_nurses goodsNurses
+ FROM t_goods tg
+ LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
+ LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{shopId}
+ WHERE tg.del_flag = 0 AND tg.goods_status = 1 AND tg.recommend_flag = 1
+ ORDER BY tg.create_time DESC
+ </select>
+ <!--分页获取商城商品列表-->
+ <select id="pageShopGoods" resultType="com.hrt.system.domain.vo.AppSimpleGoodsVo">
+ SELECT
+ tg.goods_id goodsId,
+ tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
+ tg.goods_type goodsType,
+ CASE tg.goods_type
+ WHEN 1 THEN "周期"
+ WHEN 2 THEN "服务"
+ WHEN 3 THEN "体验"
+ WHEN 4 THEN "单品"
+ END goodsTag,
+ IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
+ tgf.file_url goodsPicture,
+ tg.goods_nurses goodsNurses
+ FROM t_goods tg
+ INNER JOIN t_goods_total tgt ON tg.goods_id = tgt.goods_id
+ LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
+ LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{shopId}
+ WHERE tg.del_flag = 0 AND tg.goods_status = 1
+ <if test="param.goodsType!=null and param.goodsType != ''">
+ AND tg.goods_type = #{param.goodsType}
+ </if>
+ <if test="param.goodsClassId!=null and param.goodsClassId != ''">
+ AND tg.goods_class_id = #{param.goodsClassId}
+ </if>
+ <if test="param.keyword!=null and param.keyword != ''">
+ AND tg.goods_name LIKE CONCAT('%',#{param.keyword},'%')
+ </if>
+ ORDER BY
+ <if test="param.sort != null and param.sort != ''">
+ <choose>
+ <when test="param.sort==1">
+ salesPrice DESC,tg.create_time DESC
+ </when>
+ <when test="param.sort==2">
+ salesPrice ASC,tg.create_time DESC
+ </when>
+ <when test="param.sort==3">
+ tgt.buy_num_count ASC,tg.create_time DESC
+ </when>
+ <when test="param.sort==4">
+ tgt.buy_num_count DESC,tg.create_time DESC
+ </when>
+ <when test="param.sort==5">
+ tg.create_time DESC
+ </when>
+ <otherwise>
+ tg.create_time DESC
+ </otherwise>
+ </choose>
+ </if>
+ </select>
+ <!--分页获取搜索商品列表-->
+ <select id="pageSearchGoods" resultType="com.hrt.system.domain.vo.AppSimpleGoodsVo">
+ SELECT
+ tg.goods_id goodsId,
+ tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
+ tg.goods_type goodsType,
+ CASE tg.goods_type
+ WHEN 1 THEN "周期"
+ WHEN 2 THEN "服务"
+ WHEN 3 THEN "体验"
+ WHEN 4 THEN "单品"
+ END goodsTag,
+ IFNULL(tsg.sales_price,tg.sales_price) salesPrice,
+ tgf.file_url goodsPicture,
+ tg.goods_tags goodsNurses
+ FROM t_goods tg
+ LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
+ LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{shopId}
+ WHERE tg.del_flag = 0 AND tg.goods_status = 1
+ <if test="param.keyword!=null and param.keyword != ''">
+ AND tg.goods_name LIKE CONCAT('%',#{param.keyword},'%')
+ </if>
+ ORDER BY tg.create_time DESC
+ </select>
+
+ <!--分页获取搜索活动商品列表-->
+ <select id="pageSearchActivityGoods" resultType="com.hrt.system.domain.vo.AppSimpleActivityGoodsVo">
+ SELECT
+ tg.goods_id goodsId,
+ tg.goods_name goodsName,
+ tg.goods_introduction goodsIntroduction,
+ tg.goods_type goodsType,
+ CASE tg.goods_type
+ WHEN 1 THEN "周期"
+ WHEN 2 THEN "服务"
+ WHEN 3 THEN "体验"
+ WHEN 4 THEN "单品"
+ END goodsTag,
+ GREATEST(tg.sales_price,IFNULL(tsg.sales_price,'0.00')) salesPrice,
+ tag.activity_price activityPrice,
+ tgf.file_url goodsPicture,
+ tg.goods_tags goodsNurses,
+ tag.activity_number activityNumber,
+ tag.sales_number salesNumber
+ FROM t_goods tg
+ INNER JOIN t_activity_goods tag ON tg.goods_id = tag.goods_id
+ LEFT JOIN t_goods_file tgf ON tg.goods_id = tgf.goods_id AND tgf.del_flag = 0 AND tgf.file_type = 1
+ LEFT JOIN t_shop_goods tsg ON tg.goods_id = tsg.goods_id AND tsg.shop_id = #{shopId}
+ WHERE tg.del_flag = 0 AND tg.goods_status = 1
+ <if test="param.keyword!=null and param.keyword != ''">
+ AND tg.goods_name LIKE CONCAT('%',#{param.keyword},'%')
+ </if>
+ ORDER BY tg.create_time DESC
+ </select>
</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberMapper.xml
new file mode 100644
index 0000000..fe882a8
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberMapper.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hrt.system.mapper.member.MemberMapper">
+
+ <select id="getOneByMiniOpenid" resultType="com.hrt.system.pojo.Member">
+ SELECT * FROM t_member WHERE mini_openid = #{miniOpenid}
+ </select>
+
+</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberNurseMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberNurseMapper.xml
new file mode 100644
index 0000000..a556601
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/member/MemberNurseMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hrt.system.mapper.member.MemberNurseMapper">
+
+
+
+</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/shop/ShopCertificateMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/shop/ShopCertificateMapper.xml
new file mode 100644
index 0000000..20f9c3e
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/shop/ShopCertificateMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hrt.system.mapper.shop.ShopCertificateMapper">
+
+
+
+</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AdvertMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AdvertMapper.xml
new file mode 100644
index 0000000..ed5d936
--- /dev/null
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AdvertMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hrt.system.mapper.sys.AdvertMapper">
+
+ <select id="getAdvertVo" resultType="com.hrt.system.domain.vo.AppAdvertVo">
+ SELECT
+ ad_id adId,
+ ad_url adUrl,
+ ad_content adContent,
+ target_type targetType,
+ link_url linkUrl,
+ jump_id jumpId,
+ logo_url logoUrl
+ FROM t_advert WHERE del_flag = 0 ORDER BY create_time DESC LIMIT 1
+ </select>
+
+</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AgreementMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AgreementMapper.xml
index 73e5b5d..c55217d 100644
--- a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AgreementMapper.xml
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/AgreementMapper.xml
@@ -2,6 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hrt.system.mapper.sys.AgreementMapper">
+ <select id="getAppAgreementVoByType" resultType="com.hrt.system.domain.vo.AppAgreementVo">
+ SELECT agreement_id agreementId,agreement_content agreementContent FROM t_agreement WHERE del_flag = 0 AND agreement_type = #{type}
+ </select>
</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/BannerMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/BannerMapper.xml
index 2e191ea..a596b92 100644
--- a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/BannerMapper.xml
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/BannerMapper.xml
@@ -2,6 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hrt.system.mapper.sys.BannerMapper">
-
+ <select id="listHomeBannerVo" resultType="com.hrt.system.domain.vo.AppBannerVo">
+ SELECT
+ banner_id bannerId,
+ banner_url bannerUrl,
+ target_type targetType,
+ link_type linkType,
+ link_url linkUrl,
+ jump_type jumpType,
+ jump_id jumpId
+ FROM t_banner WHERE del_flag = 0 AND banner_position = 1
+ ORDER BY create_time ASC
+ </select>
</mapper>
diff --git a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/QuickEntryMapper.xml b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/QuickEntryMapper.xml
index 612c233..b1e8569 100644
--- a/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/QuickEntryMapper.xml
+++ b/hrt-modules/hrt-system/src/main/resources/mapper/system/sys/QuickEntryMapper.xml
@@ -2,6 +2,16 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hrt.system.mapper.sys.QuickEntryMapper">
-
+ <select id="listQuickEntryVo" resultType="com.hrt.system.domain.vo.AppQuickEntryVo">
+ SELECT
+ entry_id entryId,
+ entry_url entryUrl,
+ entry_name entryName,
+ target_type targetType,
+ link_url linkUrl,
+ jump_id jumpId
+ FROM t_quick_entry WHERE del_flag = 0
+ ORDER BY entry_sort DESC
+ </select>
</mapper>
--
Gitblit v1.7.1