From d9d6205e560f8258eafcfb210ebda1494bd5df6a Mon Sep 17 00:00:00 2001 From: SeriousTom Date: Wed, 13 Mar 2024 09:19:36 +0800 Subject: [PATCH] =?UTF-8?q?gateway=E7=BD=91=E5=85=B3=E6=95=B4=E5=90=88?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall-commons/pom.xml | 90 +++ .../carl/common/exception/RRException.java | 61 ++ .../java/com/carl/common/utils/Constant.java | 154 +++++ .../java/com/carl/common/utils/PageUtils.java | 110 ++++ .../java/com/carl/common/utils/Query.java | 78 +++ .../main/java/com/carl/common/utils/R.java | 64 ++ .../com/carl/common/validator/Assert.java | 32 + .../carl/common/validator/ValidatorUtils.java | 54 ++ .../carl/common/validator/group/AddGroup.java | 17 + .../common/validator/group/AliyunGroup.java | 17 + .../carl/common/validator/group/Group.java | 21 + .../common/validator/group/QcloudGroup.java | 17 + .../common/validator/group/QiniuGroup.java | 17 + .../common/validator/group/UpdateGroup.java | 19 + .../java/com/carl/common/xss/SQLFilter.java | 51 ++ mall-coupon/pom.xml | 54 ++ .../mall/coupon/MallCouponApplication.java | 18 + .../coupon/controller/CouponController.java | 90 +++ .../controller/CouponHistoryController.java | 90 +++ .../CouponSpuCategoryRelationController.java | 90 +++ .../CouponSpuRelationController.java | 90 +++ .../coupon/controller/HomeAdvController.java | 90 +++ .../controller/HomeSubjectController.java | 90 +++ .../controller/HomeSubjectSpuController.java | 90 +++ .../controller/MemberPriceController.java | 90 +++ .../SeckillPromotionController.java | 90 +++ .../controller/SeckillSessionController.java | 90 +++ .../SeckillSkuNoticeController.java | 90 +++ .../SeckillSkuRelationController.java | 90 +++ .../SkuFullReductionController.java | 90 +++ .../controller/SkuLadderController.java | 90 +++ .../controller/SpuBoundsController.java | 90 +++ .../com/carl/mall/coupon/dao/CouponDao.java | 17 + .../mall/coupon/dao/CouponHistoryDao.java | 17 + .../dao/CouponSpuCategoryRelationDao.java | 17 + .../mall/coupon/dao/CouponSpuRelationDao.java | 17 + .../com/carl/mall/coupon/dao/HomeAdvDao.java | 17 + .../carl/mall/coupon/dao/HomeSubjectDao.java | 17 + .../mall/coupon/dao/HomeSubjectSpuDao.java | 17 + .../carl/mall/coupon/dao/MemberPriceDao.java | 17 + .../mall/coupon/dao/SeckillPromotionDao.java | 17 + .../mall/coupon/dao/SeckillSessionDao.java | 17 + .../mall/coupon/dao/SeckillSkuNoticeDao.java | 17 + .../coupon/dao/SeckillSkuRelationDao.java | 17 + .../mall/coupon/dao/SkuFullReductionDao.java | 17 + .../carl/mall/coupon/dao/SkuLadderDao.java | 17 + .../carl/mall/coupon/dao/SpuBoundsDao.java | 17 + .../carl/mall/coupon/entity/CouponEntity.java | 105 +++ .../coupon/entity/CouponHistoryEntity.java | 64 ++ .../CouponSpuCategoryRelationEntity.java | 40 ++ .../entity/CouponSpuRelationEntity.java | 40 ++ .../mall/coupon/entity/HomeAdvEntity.java | 72 +++ .../mall/coupon/entity/HomeSubjectEntity.java | 56 ++ .../coupon/entity/HomeSubjectSpuEntity.java | 44 ++ .../mall/coupon/entity/MemberPriceEntity.java | 49 ++ .../coupon/entity/SeckillPromotionEntity.java | 52 ++ .../coupon/entity/SeckillSessionEntity.java | 48 ++ .../coupon/entity/SeckillSkuNoticeEntity.java | 52 ++ .../entity/SeckillSkuRelationEntity.java | 57 ++ .../coupon/entity/SkuFullReductionEntity.java | 45 ++ .../mall/coupon/entity/SkuLadderEntity.java | 49 ++ .../mall/coupon/entity/SpuBoundsEntity.java | 45 ++ .../coupon/service/CouponHistoryService.java | 20 + .../mall/coupon/service/CouponService.java | 20 + .../CouponSpuCategoryRelationService.java | 20 + .../service/CouponSpuRelationService.java | 20 + .../mall/coupon/service/HomeAdvService.java | 20 + .../coupon/service/HomeSubjectService.java | 20 + .../coupon/service/HomeSubjectSpuService.java | 20 + .../coupon/service/MemberPriceService.java | 20 + .../service/SeckillPromotionService.java | 20 + .../coupon/service/SeckillSessionService.java | 20 + .../service/SeckillSkuNoticeService.java | 20 + .../service/SeckillSkuRelationService.java | 20 + .../service/SkuFullReductionService.java | 20 + .../mall/coupon/service/SkuLadderService.java | 20 + .../mall/coupon/service/SpuBoundsService.java | 20 + .../impl/CouponHistoryServiceImpl.java | 29 + .../service/impl/CouponServiceImpl.java | 29 + .../CouponSpuCategoryRelationServiceImpl.java | 29 + .../impl/CouponSpuRelationServiceImpl.java | 29 + .../service/impl/HomeAdvServiceImpl.java | 29 + .../service/impl/HomeSubjectServiceImpl.java | 29 + .../impl/HomeSubjectSpuServiceImpl.java | 29 + .../service/impl/MemberPriceServiceImpl.java | 29 + .../impl/SeckillPromotionServiceImpl.java | 29 + .../impl/SeckillSessionServiceImpl.java | 29 + .../impl/SeckillSkuNoticeServiceImpl.java | 29 + .../impl/SeckillSkuRelationServiceImpl.java | 29 + .../impl/SkuFullReductionServiceImpl.java | 29 + .../service/impl/SkuLadderServiceImpl.java | 29 + .../service/impl/SpuBoundsServiceImpl.java | 29 + .../src/main/resources/application.yml | 23 + .../src/main/resources/bootstrap.properties | 3 + .../resources/mapper/coupon/CouponDao.xml | 31 + .../mapper/coupon/CouponHistoryDao.xml | 21 + .../coupon/CouponSpuCategoryRelationDao.xml | 15 + .../mapper/coupon/CouponSpuRelationDao.xml | 15 + .../resources/mapper/coupon/HomeAdvDao.xml | 23 + .../mapper/coupon/HomeSubjectDao.xml | 19 + .../mapper/coupon/HomeSubjectSpuDao.xml | 16 + .../mapper/coupon/MemberPriceDao.xml | 17 + .../mapper/coupon/SeckillPromotionDao.xml | 18 + .../mapper/coupon/SeckillSessionDao.xml | 17 + .../mapper/coupon/SeckillSkuNoticeDao.xml | 18 + .../mapper/coupon/SeckillSkuRelationDao.xml | 19 + .../mapper/coupon/SkuFullReductionDao.xml | 16 + .../resources/mapper/coupon/SkuLadderDao.xml | 17 + .../resources/mapper/coupon/SpuBoundsDao.xml | 16 + mall-coupon/src/site/apt/format.apt | 602 ------------------ mall-coupon/src/site/apt/index.apt | 16 - mall-coupon/src/site/fml/faq.fml | 27 - mall-coupon/src/site/fr/apt/format.apt | 602 ------------------ mall-coupon/src/site/fr/apt/index.apt | 17 - mall-coupon/src/site/fr/fml/faq.fml | 27 - .../site/fr/markdown/markdown-velocity.md.vm | 13 - mall-coupon/src/site/fr/markdown/markdown.md | 11 - mall-coupon/src/site/fr/xdoc/xdoc.xml | 17 - .../src/site/markdown/markdown-velocity.md.vm | 13 - mall-coupon/src/site/markdown/markdown.md | 11 - mall-coupon/src/site/site.xml | 39 -- mall-coupon/src/site/site_fr.xml | 39 -- mall-coupon/src/site/xdoc/xdoc.xml | 17 - mall-gateway/pom.xml | 76 +++ .../mall/gateway/MallGatewayApplication.java | 16 + .../src/main/resources/application.yml | 20 + .../src/main/resources/bootstrap.properties | 20 + mall-member/pom.xml | 51 +- .../mall/member/MallMemberApplication.java | 18 + .../GrowthChangeHistoryController.java | 90 +++ .../IntegrationChangeHistoryController.java | 90 +++ .../MemberCollectSpuController.java | 90 +++ .../MemberCollectSubjectController.java | 90 +++ .../member/controller/MemberController.java | 90 +++ .../controller/MemberLevelController.java | 90 +++ .../controller/MemberLoginLogController.java | 90 +++ .../MemberReceiveAddressController.java | 90 +++ .../MemberStatisticsInfoController.java | 90 +++ .../member/dao/GrowthChangeHistoryDao.java | 17 + .../dao/IntegrationChangeHistoryDao.java | 17 + .../mall/member/dao/MemberCollectSpuDao.java | 17 + .../member/dao/MemberCollectSubjectDao.java | 17 + .../com/carl/mall/member/dao/MemberDao.java | 17 + .../carl/mall/member/dao/MemberLevelDao.java | 17 + .../mall/member/dao/MemberLoginLogDao.java | 17 + .../member/dao/MemberReceiveAddressDao.java | 17 + .../member/dao/MemberStatisticsInfoDao.java | 17 + .../entity/GrowthChangeHistoryEntity.java | 48 ++ .../IntegrationChangeHistoryEntity.java | 48 ++ .../member/entity/MemberCollectSpuEntity.java | 48 ++ .../entity/MemberCollectSubjectEntity.java | 44 ++ .../carl/mall/member/entity/MemberEntity.java | 96 +++ .../mall/member/entity/MemberLevelEntity.java | 65 ++ .../member/entity/MemberLoginLogEntity.java | 48 ++ .../entity/MemberReceiveAddressEntity.java | 68 ++ .../entity/MemberStatisticsInfoEntity.java | 85 +++ .../service/GrowthChangeHistoryService.java | 20 + .../IntegrationChangeHistoryService.java | 20 + .../service/MemberCollectSpuService.java | 20 + .../service/MemberCollectSubjectService.java | 20 + .../member/service/MemberLevelService.java | 20 + .../member/service/MemberLoginLogService.java | 20 + .../service/MemberReceiveAddressService.java | 20 + .../mall/member/service/MemberService.java | 20 + .../service/MemberStatisticsInfoService.java | 20 + .../impl/GrowthChangeHistoryServiceImpl.java | 29 + .../IntegrationChangeHistoryServiceImpl.java | 29 + .../impl/MemberCollectSpuServiceImpl.java | 29 + .../impl/MemberCollectSubjectServiceImpl.java | 29 + .../service/impl/MemberLevelServiceImpl.java | 29 + .../impl/MemberLoginLogServiceImpl.java | 29 + .../impl/MemberReceiveAddressServiceImpl.java | 29 + .../service/impl/MemberServiceImpl.java | 29 + .../impl/MemberStatisticsInfoServiceImpl.java | 29 + .../src/main/resources/application.yml | 23 + .../src/main/resources/bootstrap.properties | 3 + .../mapper/member/GrowthChangeHistoryDao.xml | 17 + .../member/IntegrationChangeHistoryDao.xml | 17 + .../mapper/member/MemberCollectSpuDao.xml | 17 + .../mapper/member/MemberCollectSubjectDao.xml | 16 + .../resources/mapper/member/MemberDao.xml | 29 + .../mapper/member/MemberLevelDao.xml | 21 + .../mapper/member/MemberLoginLogDao.xml | 17 + .../mapper/member/MemberReceiveAddressDao.xml | 22 + .../mapper/member/MemberStatisticsInfoDao.xml | 26 + mall-order/pom.xml | 55 ++ .../carl/mall/order/MallOrderApplication.java | 20 + .../order/controller/OrderController.java | 101 +++ .../order/controller/OrderItemController.java | 90 +++ .../OrderOperateHistoryController.java | 90 +++ .../OrderReturnApplyController.java | 90 +++ .../OrderReturnReasonController.java | 90 +++ .../controller/OrderSettingController.java | 90 +++ .../controller/PaymentInfoController.java | 90 +++ .../controller/RefundInfoController.java | 90 +++ .../com/carl/mall/order/dao/OrderDao.java | 17 + .../com/carl/mall/order/dao/OrderItemDao.java | 17 + .../order/dao/OrderOperateHistoryDao.java | 17 + .../mall/order/dao/OrderReturnApplyDao.java | 17 + .../mall/order/dao/OrderReturnReasonDao.java | 17 + .../carl/mall/order/dao/OrderSettingDao.java | 17 + .../carl/mall/order/dao/PaymentInfoDao.java | 17 + .../carl/mall/order/dao/RefundInfoDao.java | 17 + .../carl/mall/order/entity/OrderEntity.java | 193 ++++++ .../mall/order/entity/OrderItemEntity.java | 105 +++ .../entity/OrderOperateHistoryEntity.java | 48 ++ .../order/entity/OrderReturnApplyEntity.java | 137 ++++ .../order/entity/OrderReturnReasonEntity.java | 44 ++ .../mall/order/entity/OrderSettingEntity.java | 52 ++ .../mall/order/entity/PaymentInfoEntity.java | 69 ++ .../mall/order/entity/RefundInfoEntity.java | 53 ++ .../carl/mall/order/feign/ProductService.java | 13 + .../mall/order/service/OrderItemService.java | 20 + .../service/OrderOperateHistoryService.java | 20 + .../service/OrderReturnApplyService.java | 20 + .../service/OrderReturnReasonService.java | 20 + .../carl/mall/order/service/OrderService.java | 20 + .../order/service/OrderSettingService.java | 20 + .../order/service/PaymentInfoService.java | 20 + .../mall/order/service/RefundInfoService.java | 20 + .../service/impl/OrderItemServiceImpl.java | 29 + .../impl/OrderOperateHistoryServiceImpl.java | 29 + .../impl/OrderReturnApplyServiceImpl.java | 29 + .../impl/OrderReturnReasonServiceImpl.java | 29 + .../order/service/impl/OrderServiceImpl.java | 29 + .../service/impl/OrderSettingServiceImpl.java | 29 + .../service/impl/PaymentInfoServiceImpl.java | 29 + .../service/impl/RefundInfoServiceImpl.java | 29 + mall-order/src/main/resources/application.yml | 23 + .../src/main/resources/bootstrap.properties | 22 + .../main/resources/mapper/order/OrderDao.xml | 53 ++ .../resources/mapper/order/OrderItemDao.xml | 31 + .../mapper/order/OrderOperateHistoryDao.xml | 17 + .../mapper/order/OrderReturnApplyDao.xml | 39 ++ .../mapper/order/OrderReturnReasonDao.xml | 16 + .../mapper/order/OrderSettingDao.xml | 18 + .../resources/mapper/order/PaymentInfoDao.xml | 22 + .../resources/mapper/order/RefundInfoDao.xml | 18 + mall-order/src/site/apt/format.apt | 602 ------------------ mall-order/src/site/apt/index.apt | 16 - mall-order/src/site/fml/faq.fml | 27 - mall-order/src/site/fr/apt/format.apt | 602 ------------------ mall-order/src/site/fr/apt/index.apt | 17 - mall-order/src/site/fr/fml/faq.fml | 27 - .../site/fr/markdown/markdown-velocity.md.vm | 13 - mall-order/src/site/fr/markdown/markdown.md | 11 - mall-order/src/site/fr/xdoc/xdoc.xml | 17 - .../src/site/markdown/markdown-velocity.md.vm | 13 - mall-order/src/site/markdown/markdown.md | 11 - mall-order/src/site/site.xml | 39 -- mall-order/src/site/site_fr.xml | 39 -- mall-order/src/site/xdoc/xdoc.xml | 17 - mall-product/pom.xml | 55 +- .../mall/product/MallProductApplication.java | 18 + .../src/main/resources/application.yml | 23 + .../src/main/resources/bootstrap.properties | 22 + .../product/MallProductApplicationTest.java | 51 ++ mall-ware/pom.xml | 51 +- .../carl/mall/ware/MallWareApplication.java | 18 + .../ware/controller/PurchaseController.java | 90 +++ .../controller/PurchaseDetailController.java | 90 +++ .../ware/controller/WareInfoController.java | 90 +++ .../controller/WareOrderTaskController.java | 90 +++ .../WareOrderTaskDetailController.java | 90 +++ .../ware/controller/WareSkuController.java | 90 +++ .../com/carl/mall/ware/dao/PurchaseDao.java | 17 + .../carl/mall/ware/dao/PurchaseDetailDao.java | 17 + .../com/carl/mall/ware/dao/WareInfoDao.java | 17 + .../carl/mall/ware/dao/WareOrderTaskDao.java | 17 + .../mall/ware/dao/WareOrderTaskDetailDao.java | 17 + .../com/carl/mall/ware/dao/WareSkuDao.java | 17 + .../ware/entity/PurchaseDetailEntity.java | 53 ++ .../carl/mall/ware/entity/PurchaseEntity.java | 65 ++ .../carl/mall/ware/entity/WareInfoEntity.java | 40 ++ .../entity/WareOrderTaskDetailEntity.java | 44 ++ .../mall/ware/entity/WareOrderTaskEntity.java | 80 +++ .../carl/mall/ware/entity/WareSkuEntity.java | 48 ++ .../ware/service/PurchaseDetailService.java | 20 + .../mall/ware/service/PurchaseService.java | 20 + .../mall/ware/service/WareInfoService.java | 20 + .../service/WareOrderTaskDetailService.java | 20 + .../ware/service/WareOrderTaskService.java | 20 + .../mall/ware/service/WareSkuService.java | 20 + .../impl/PurchaseDetailServiceImpl.java | 29 + .../service/impl/PurchaseServiceImpl.java | 29 + .../service/impl/WareInfoServiceImpl.java | 29 + .../impl/WareOrderTaskDetailServiceImpl.java | 29 + .../impl/WareOrderTaskServiceImpl.java | 29 + .../ware/service/impl/WareSkuServiceImpl.java | 29 + mall-ware/src/main/resources/application.yml | 23 + .../src/main/resources/bootstrap.properties | 3 + .../resources/mapper/ware/PurchaseDao.xml | 21 + .../mapper/ware/PurchaseDetailDao.xml | 18 + .../resources/mapper/ware/WareInfoDao.xml | 15 + .../mapper/ware/WareOrderTaskDao.xml | 25 + .../mapper/ware/WareOrderTaskDetailDao.xml | 16 + .../main/resources/mapper/ware/WareSkuDao.xml | 17 + mall-ware/src/site/apt/format.apt | 602 ------------------ mall-ware/src/site/apt/index.apt | 16 - mall-ware/src/site/fml/faq.fml | 27 - mall-ware/src/site/fr/apt/format.apt | 602 ------------------ mall-ware/src/site/fr/apt/index.apt | 17 - mall-ware/src/site/fr/fml/faq.fml | 27 - .../site/fr/markdown/markdown-velocity.md.vm | 13 - mall-ware/src/site/fr/markdown/markdown.md | 11 - mall-ware/src/site/fr/xdoc/xdoc.xml | 17 - .../src/site/markdown/markdown-velocity.md.vm | 13 - mall-ware/src/site/markdown/markdown.md | 11 - mall-ware/src/site/site.xml | 39 -- mall-ware/src/site/site_fr.xml | 39 -- mall-ware/src/site/xdoc/xdoc.xml | 17 - pom.xml | 3 + renren-fast/pom.xml | 134 ++-- 313 files changed, 10715 insertions(+), 4423 deletions(-) create mode 100644 mall-commons/pom.xml create mode 100644 mall-commons/src/main/java/com/carl/common/exception/RRException.java create mode 100644 mall-commons/src/main/java/com/carl/common/utils/Constant.java create mode 100644 mall-commons/src/main/java/com/carl/common/utils/PageUtils.java create mode 100644 mall-commons/src/main/java/com/carl/common/utils/Query.java create mode 100644 mall-commons/src/main/java/com/carl/common/utils/R.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/Assert.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/ValidatorUtils.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/AddGroup.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/AliyunGroup.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/Group.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/QcloudGroup.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/QiniuGroup.java create mode 100644 mall-commons/src/main/java/com/carl/common/validator/group/UpdateGroup.java create mode 100644 mall-commons/src/main/java/com/carl/common/xss/SQLFilter.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/MallCouponApplication.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponHistoryController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuCategoryRelationController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuRelationController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeAdvController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectSpuController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/MemberPriceController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillPromotionController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSessionController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuNoticeController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuRelationController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuFullReductionController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuLadderController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/controller/SpuBoundsController.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponHistoryDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuCategoryRelationDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuRelationDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeAdvDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectSpuDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/MemberPriceDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillPromotionDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSessionDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuNoticeDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuRelationDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuFullReductionDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuLadderDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/dao/SpuBoundsDao.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponHistoryEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuCategoryRelationEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuRelationEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeAdvEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectSpuEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/MemberPriceEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillPromotionEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSessionEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuNoticeEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuRelationEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuFullReductionEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuLadderEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/entity/SpuBoundsEntity.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponHistoryService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuCategoryRelationService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuRelationService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeAdvService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectSpuService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/MemberPriceService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillPromotionService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSessionService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuNoticeService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuRelationService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuFullReductionService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuLadderService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/SpuBoundsService.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponHistoryServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuRelationServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeAdvServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectSpuServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/MemberPriceServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillPromotionServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSessionServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuRelationServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuFullReductionServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuLadderServiceImpl.java create mode 100644 mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SpuBoundsServiceImpl.java create mode 100644 mall-coupon/src/main/resources/application.yml create mode 100644 mall-coupon/src/main/resources/bootstrap.properties create mode 100644 mall-coupon/src/main/resources/mapper/coupon/CouponDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml create mode 100644 mall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml delete mode 100644 mall-coupon/src/site/apt/format.apt delete mode 100644 mall-coupon/src/site/apt/index.apt delete mode 100644 mall-coupon/src/site/fml/faq.fml delete mode 100644 mall-coupon/src/site/fr/apt/format.apt delete mode 100644 mall-coupon/src/site/fr/apt/index.apt delete mode 100644 mall-coupon/src/site/fr/fml/faq.fml delete mode 100644 mall-coupon/src/site/fr/markdown/markdown-velocity.md.vm delete mode 100644 mall-coupon/src/site/fr/markdown/markdown.md delete mode 100644 mall-coupon/src/site/fr/xdoc/xdoc.xml delete mode 100644 mall-coupon/src/site/markdown/markdown-velocity.md.vm delete mode 100644 mall-coupon/src/site/markdown/markdown.md delete mode 100644 mall-coupon/src/site/site.xml delete mode 100644 mall-coupon/src/site/site_fr.xml delete mode 100644 mall-coupon/src/site/xdoc/xdoc.xml create mode 100644 mall-gateway/pom.xml create mode 100644 mall-gateway/src/main/java/com/carl/mall/gateway/MallGatewayApplication.java create mode 100644 mall-gateway/src/main/resources/application.yml create mode 100644 mall-gateway/src/main/resources/bootstrap.properties create mode 100644 mall-member/src/main/java/com/carl/mall/member/MallMemberApplication.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/GrowthChangeHistoryController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/IntegrationChangeHistoryController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSpuController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSubjectController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberLevelController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberLoginLogController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberReceiveAddressController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/controller/MemberStatisticsInfoController.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/GrowthChangeHistoryDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/IntegrationChangeHistoryDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSpuDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSubjectDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberLevelDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberLoginLogDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberReceiveAddressDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/dao/MemberStatisticsInfoDao.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/GrowthChangeHistoryEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/IntegrationChangeHistoryEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSpuEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSubjectEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberLevelEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberLoginLogEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberReceiveAddressEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/entity/MemberStatisticsInfoEntity.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/GrowthChangeHistoryService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/IntegrationChangeHistoryService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSpuService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSubjectService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberLevelService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberLoginLogService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberReceiveAddressService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/MemberStatisticsInfoService.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/GrowthChangeHistoryServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/IntegrationChangeHistoryServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSpuServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSubjectServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLevelServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLoginLogServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberReceiveAddressServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberServiceImpl.java create mode 100644 mall-member/src/main/java/com/carl/mall/member/service/impl/MemberStatisticsInfoServiceImpl.java create mode 100644 mall-member/src/main/resources/application.yml create mode 100644 mall-member/src/main/resources/bootstrap.properties create mode 100644 mall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberLevelDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml create mode 100644 mall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml create mode 100644 mall-order/src/main/java/com/carl/mall/order/MallOrderApplication.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderItemController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderOperateHistoryController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnApplyController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnReasonController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/OrderSettingController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/PaymentInfoController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/controller/RefundInfoController.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderItemDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderOperateHistoryDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnApplyDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnReasonDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/OrderSettingDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/PaymentInfoDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/dao/RefundInfoDao.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderItemEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderOperateHistoryEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnApplyEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnReasonEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/OrderSettingEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/PaymentInfoEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/entity/RefundInfoEntity.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/feign/ProductService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderItemService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderOperateHistoryService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderReturnApplyService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderReturnReasonService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/OrderSettingService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/PaymentInfoService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/RefundInfoService.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderItemServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderOperateHistoryServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnApplyServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnReasonServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/OrderSettingServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/PaymentInfoServiceImpl.java create mode 100644 mall-order/src/main/java/com/carl/mall/order/service/impl/RefundInfoServiceImpl.java create mode 100644 mall-order/src/main/resources/application.yml create mode 100644 mall-order/src/main/resources/bootstrap.properties create mode 100644 mall-order/src/main/resources/mapper/order/OrderDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/OrderItemDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/OrderSettingDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/PaymentInfoDao.xml create mode 100644 mall-order/src/main/resources/mapper/order/RefundInfoDao.xml delete mode 100644 mall-order/src/site/apt/format.apt delete mode 100644 mall-order/src/site/apt/index.apt delete mode 100644 mall-order/src/site/fml/faq.fml delete mode 100644 mall-order/src/site/fr/apt/format.apt delete mode 100644 mall-order/src/site/fr/apt/index.apt delete mode 100644 mall-order/src/site/fr/fml/faq.fml delete mode 100644 mall-order/src/site/fr/markdown/markdown-velocity.md.vm delete mode 100644 mall-order/src/site/fr/markdown/markdown.md delete mode 100644 mall-order/src/site/fr/xdoc/xdoc.xml delete mode 100644 mall-order/src/site/markdown/markdown-velocity.md.vm delete mode 100644 mall-order/src/site/markdown/markdown.md delete mode 100644 mall-order/src/site/site.xml delete mode 100644 mall-order/src/site/site_fr.xml delete mode 100644 mall-order/src/site/xdoc/xdoc.xml create mode 100644 mall-product/src/main/java/com/carl/mall/product/MallProductApplication.java create mode 100644 mall-product/src/main/resources/application.yml create mode 100644 mall-product/src/main/resources/bootstrap.properties create mode 100644 mall-product/src/test/java/com/carl/mall/product/MallProductApplicationTest.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/MallWareApplication.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseDetailController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/WareInfoController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskDetailController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/controller/WareSkuController.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDetailDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/WareInfoDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDetailDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/dao/WareSkuDao.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseDetailEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/WareInfoEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskDetailEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/entity/WareSkuEntity.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseDetailService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/WareInfoService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskDetailService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/WareSkuService.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseDetailServiceImpl.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseServiceImpl.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareInfoServiceImpl.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskDetailServiceImpl.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskServiceImpl.java create mode 100644 mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareSkuServiceImpl.java create mode 100644 mall-ware/src/main/resources/application.yml create mode 100644 mall-ware/src/main/resources/bootstrap.properties create mode 100644 mall-ware/src/main/resources/mapper/ware/PurchaseDao.xml create mode 100644 mall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml create mode 100644 mall-ware/src/main/resources/mapper/ware/WareInfoDao.xml create mode 100644 mall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml create mode 100644 mall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml create mode 100644 mall-ware/src/main/resources/mapper/ware/WareSkuDao.xml delete mode 100644 mall-ware/src/site/apt/format.apt delete mode 100644 mall-ware/src/site/apt/index.apt delete mode 100644 mall-ware/src/site/fml/faq.fml delete mode 100644 mall-ware/src/site/fr/apt/format.apt delete mode 100644 mall-ware/src/site/fr/apt/index.apt delete mode 100644 mall-ware/src/site/fr/fml/faq.fml delete mode 100644 mall-ware/src/site/fr/markdown/markdown-velocity.md.vm delete mode 100644 mall-ware/src/site/fr/markdown/markdown.md delete mode 100644 mall-ware/src/site/fr/xdoc/xdoc.xml delete mode 100644 mall-ware/src/site/markdown/markdown-velocity.md.vm delete mode 100644 mall-ware/src/site/markdown/markdown.md delete mode 100644 mall-ware/src/site/site.xml delete mode 100644 mall-ware/src/site/site_fr.xml delete mode 100644 mall-ware/src/site/xdoc/xdoc.xml diff --git a/mall-commons/pom.xml b/mall-commons/pom.xml new file mode 100644 index 0000000..c494b3f --- /dev/null +++ b/mall-commons/pom.xml @@ -0,0 +1,90 @@ + + + + + SuperMall + com.carl.mall + 1.0-SNAPSHOT + + 4.0.0 + + mall-commons + + 8 + 8 + + + + + + mysql + mysql-connector-java + 8.0.11 + + + com.baomidou + mybatis-plus-boot-starter + 3.3.1 + + + + + org.projectlombok + lombok + 1.18.22 + + + + commons-lang + commons-lang + 2.6 + + + + org.apache.httpcomponents + httpcore + 4.4.14 + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + 3.0.3 + + + org.springframework.boot + spring-boot-starter-validation + 2.4.12 + + + + org.springframework.boot + spring-boot-starter-web + 2.4.12 + + + + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2021.1 + pom + import + + + + diff --git a/mall-commons/src/main/java/com/carl/common/exception/RRException.java b/mall-commons/src/main/java/com/carl/common/exception/RRException.java new file mode 100644 index 0000000..ad56bef --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/exception/RRException.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.exception; + +/** + * 自定义异常 + * + * @author Mark sunlightcs@gmail.com + */ +public class RRException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public RRException(String msg) { + super(msg); + this.msg = msg; + } + + public RRException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public RRException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public RRException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} diff --git a/mall-commons/src/main/java/com/carl/common/utils/Constant.java b/mall-commons/src/main/java/com/carl/common/utils/Constant.java new file mode 100644 index 0000000..c93165f --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/utils/Constant.java @@ -0,0 +1,154 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有,侵权必究! + */ + +package com.carl.common.utils; + + + +import com.carl.common.validator.group.AliyunGroup; +import com.carl.common.validator.group.QcloudGroup; +import com.carl.common.validator.group.QiniuGroup; + +import java.util.Optional; +import java.util.stream.Stream; + +/** + * 常量 + * + * @author Mark sunlightcs@gmail.com + */ +public class Constant { + /** + * 超级管理员ID + */ + public static final int SUPER_ADMIN = 1; + /** + * 当前页码 + */ + public static final String PAGE = "page"; + /** + * 每页显示记录数 + */ + public static final String LIMIT = "limit"; + /** + * 排序字段 + */ + public static final String ORDER_FIELD = "sidx"; + /** + * 排序方式 + */ + public static final String ORDER = "order"; + /** + * 升序 + */ + public static final String ASC = "asc"; + + /** + * 菜单类型 + * + * @author chenshun + * @email sunlightcs@gmail.com + * @date 2016年11月15日 下午1:24:29 + */ + public enum MenuType { + /** + * 目录 + */ + CATALOG(0), + /** + * 菜单 + */ + MENU(1), + /** + * 按钮 + */ + BUTTON(2); + + private int value; + + MenuType(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + } + + /** + * 定时任务状态 + * + * @author chenshun + * @email sunlightcs@gmail.com + * @date 2016年12月3日 上午12:07:22 + */ + public enum ScheduleStatus { + /** + * 正常 + */ + NORMAL(0), + /** + * 暂停 + */ + PAUSE(1); + + private int value; + + ScheduleStatus(int value) { + this.value = value; + } + + public int getValue() { + return value; + } + } + + /** + * 云服务商 + */ + public enum CloudService { + /** + * 七牛云 + */ + QINIU(1, QiniuGroup.class), + /** + * 阿里云 + */ + ALIYUN(2, AliyunGroup.class), + /** + * 腾讯云 + */ + QCLOUD(3, QcloudGroup.class); + + private int value; + + private Class validatorGroupClass; + + CloudService(int value, Class validatorGroupClass) { + this.value = value; + this.validatorGroupClass = validatorGroupClass; + } + + public int getValue() { + return value; + } + + public Class getValidatorGroupClass() { + return this.validatorGroupClass; + } + + public static CloudService getByValue(Integer value) { + Optional first = Stream.of(CloudService.values()).filter(cs -> value.equals(cs.value)).findFirst(); + if (!first.isPresent()) { + throw new IllegalArgumentException("非法的枚举值:" + value); + } + return first.get(); + } + } + +} diff --git a/mall-commons/src/main/java/com/carl/common/utils/PageUtils.java b/mall-commons/src/main/java/com/carl/common/utils/PageUtils.java new file mode 100644 index 0000000..3e93b39 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/utils/PageUtils.java @@ -0,0 +1,110 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.utils; + +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.io.Serializable; +import java.util.List; + +/** + * 分页工具类 + * + * @author Mark sunlightcs@gmail.com + */ +public class PageUtils implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 总记录数 + */ + private int totalCount; + /** + * 每页记录数 + */ + private int pageSize; + /** + * 总页数 + */ + private int totalPage; + /** + * 当前页数 + */ + private int currPage; + /** + * 列表数据 + */ + private List list; + + /** + * 分页 + * @param list 列表数据 + * @param totalCount 总记录数 + * @param pageSize 每页记录数 + * @param currPage 当前页数 + */ + public PageUtils(List list, int totalCount, int pageSize, int currPage) { + this.list = list; + this.totalCount = totalCount; + this.pageSize = pageSize; + this.currPage = currPage; + this.totalPage = (int)Math.ceil((double)totalCount/pageSize); + } + + /** + * 分页 + */ + public PageUtils(IPage page) { + this.list = page.getRecords(); + this.totalCount = (int)page.getTotal(); + this.pageSize = (int)page.getSize(); + this.currPage = (int)page.getCurrent(); + this.totalPage = (int)page.getPages(); + } + + public int getTotalCount() { + return totalCount; + } + + public void setTotalCount(int totalCount) { + this.totalCount = totalCount; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public int getTotalPage() { + return totalPage; + } + + public void setTotalPage(int totalPage) { + this.totalPage = totalPage; + } + + public int getCurrPage() { + return currPage; + } + + public void setCurrPage(int currPage) { + this.currPage = currPage; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + +} diff --git a/mall-commons/src/main/java/com/carl/common/utils/Query.java b/mall-commons/src/main/java/com/carl/common/utils/Query.java new file mode 100644 index 0000000..3aa3f82 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/utils/Query.java @@ -0,0 +1,78 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.utils; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.carl.common.xss.SQLFilter; +import org.apache.commons.lang.StringUtils; + +import java.util.Map; + +/** + * 查询参数 + * + * @author Mark sunlightcs@gmail.com + */ +public class Query { + + public IPage getPage(Map params) { + return this.getPage(params, null, false); + } + + public IPage getPage(Map params, String defaultOrderField, boolean isAsc) { + //分页参数 + long curPage = 1; + long limit = 10; + + if(params.get(Constant.PAGE) != null){ + curPage = Long.parseLong((String)params.get(Constant.PAGE)); + } + if(params.get(Constant.LIMIT) != null){ + limit = Long.parseLong((String)params.get(Constant.LIMIT)); + } + + //分页对象 + Page page = new Page<>(curPage, limit); + + //分页参数 + params.put(Constant.PAGE, page); + + //排序字段 + //防止SQL注入(因为sidx、order是通过拼接SQL实现排序的,会有SQL注入风险) + String orderField = SQLFilter.sqlInject((String)params.get(Constant.ORDER_FIELD)); + String order = (String)params.get(Constant.ORDER); + + + //前端字段排序 + if(StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)){ + if(Constant.ASC.equalsIgnoreCase(order)) { + return page.addOrder(OrderItem.asc(orderField)); + }else { + return page.addOrder(OrderItem.desc(orderField)); + } + } + + //没有排序字段,则不排序 + if(StringUtils.isBlank(defaultOrderField)){ + return page; + } + + //默认排序 + if(isAsc) { + page.addOrder(OrderItem.asc(defaultOrderField)); + }else { + page.addOrder(OrderItem.desc(defaultOrderField)); + } + + return page; + } +} diff --git a/mall-commons/src/main/java/com/carl/common/utils/R.java b/mall-commons/src/main/java/com/carl/common/utils/R.java new file mode 100644 index 0000000..9f8cf7d --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/utils/R.java @@ -0,0 +1,64 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.utils; + +import org.apache.http.HttpStatus; + +import java.util.HashMap; +import java.util.Map; + +/** + * 返回数据 + * + * @author Mark sunlightcs@gmail.com + */ +public class R extends HashMap { + private static final long serialVersionUID = 1L; + + public R() { + put("code", 0); + put("msg", "success"); + } + + public static R error() { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常,请联系管理员"); + } + + public static R error(String msg) { + return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg); + } + + public static R error(int code, String msg) { + R r = new R(); + r.put("code", code); + r.put("msg", msg); + return r; + } + + public static R ok(String msg) { + R r = new R(); + r.put("msg", msg); + return r; + } + + public static R ok(Map map) { + R r = new R(); + r.putAll(map); + return r; + } + + public static R ok() { + return new R(); + } + + public R put(String key, Object value) { + super.put(key, value); + return this; + } +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/Assert.java b/mall-commons/src/main/java/com/carl/common/validator/Assert.java new file mode 100644 index 0000000..8f9a1f8 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/Assert.java @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator; + +import com.carl.common.exception.RRException; +import org.apache.commons.lang.StringUtils; + +/** + * 数据校验 + * + * @author Mark sunlightcs@gmail.com + */ +public abstract class Assert { + + public static void isBlank(String str, String message) { + if (StringUtils.isBlank(str)) { + throw new RRException(message); + } + } + + public static void isNull(Object object, String message) { + if (object == null) { + throw new RRException(message); + } + } +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/ValidatorUtils.java b/mall-commons/src/main/java/com/carl/common/validator/ValidatorUtils.java new file mode 100644 index 0000000..dd5f3a2 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/ValidatorUtils.java @@ -0,0 +1,54 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有,侵权必究! + */ + +package com.carl.common.validator; + +import com.carl.common.exception.RRException; +import com.carl.common.utils.Constant; + +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import java.util.Set; + +/** + * hibernate-validator校验工具类 + * + * 参考文档:http://docs.jboss.org/hibernate/validator/5.4/reference/en-US/html_single/ + * + * @author Mark sunlightcs@gmail.com + */ +public class ValidatorUtils { + private static Validator validator; + + static { + validator = Validation.buildDefaultValidatorFactory().getValidator(); + } + + /** + * 校验对象 + * @param object 待校验对象 + * @param groups 待校验的组 + * @throws RRException 校验不通过,则报RRException异常 + */ + public static void validateEntity(Object object, Class... groups) + throws RRException { + Set> constraintViolations = validator.validate(object, groups); + if (!constraintViolations.isEmpty()) { + StringBuilder msg = new StringBuilder(); + for (ConstraintViolation constraint : constraintViolations) { + msg.append(constraint.getMessage()).append("
"); + } + throw new RRException(msg.toString()); + } + } + + public static void validateEntity(Object object, Constant.CloudService type) { + validateEntity(object, type.getValidatorGroupClass()); + } +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/AddGroup.java b/mall-commons/src/main/java/com/carl/common/validator/group/AddGroup.java new file mode 100644 index 0000000..14c34df --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/AddGroup.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +/** + * 新增数据 Group + * + * @author Mark sunlightcs@gmail.com + */ +public interface AddGroup { +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/AliyunGroup.java b/mall-commons/src/main/java/com/carl/common/validator/group/AliyunGroup.java new file mode 100644 index 0000000..d22bc65 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/AliyunGroup.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +/** + * 阿里云 + * + * @author Mark sunlightcs@gmail.com + */ +public interface AliyunGroup { +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/Group.java b/mall-commons/src/main/java/com/carl/common/validator/group/Group.java new file mode 100644 index 0000000..57a2e91 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/Group.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +import javax.validation.GroupSequence; + +/** + * 定义校验顺序,如果AddGroup组失败,则UpdateGroup组不会再校验 + * + * @author Mark sunlightcs@gmail.com + */ +@GroupSequence({AddGroup.class, UpdateGroup.class}) +public interface Group { + +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/QcloudGroup.java b/mall-commons/src/main/java/com/carl/common/validator/group/QcloudGroup.java new file mode 100644 index 0000000..4838eb9 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/QcloudGroup.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +/** + * 腾讯云 + * + * @author Mark sunlightcs@gmail.com + */ +public interface QcloudGroup { +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/QiniuGroup.java b/mall-commons/src/main/java/com/carl/common/validator/group/QiniuGroup.java new file mode 100644 index 0000000..ee57513 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/QiniuGroup.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +/** + * 七牛 + * + * @author Mark sunlightcs@gmail.com + */ +public interface QiniuGroup { +} diff --git a/mall-commons/src/main/java/com/carl/common/validator/group/UpdateGroup.java b/mall-commons/src/main/java/com/carl/common/validator/group/UpdateGroup.java new file mode 100644 index 0000000..7204349 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/validator/group/UpdateGroup.java @@ -0,0 +1,19 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.validator.group; + +/** + * 更新数据 Group + * + * @author Mark sunlightcs@gmail.com + */ + +public interface UpdateGroup { + +} diff --git a/mall-commons/src/main/java/com/carl/common/xss/SQLFilter.java b/mall-commons/src/main/java/com/carl/common/xss/SQLFilter.java new file mode 100644 index 0000000..fce5916 --- /dev/null +++ b/mall-commons/src/main/java/com/carl/common/xss/SQLFilter.java @@ -0,0 +1,51 @@ +/** + * Copyright (c) 2016-2019 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有,侵权必究! + */ + +package com.carl.common.xss; + + +import com.carl.common.exception.RRException; +import org.apache.commons.lang.StringUtils; + +/** + * SQL过滤 + * + * @author Mark sunlightcs@gmail.com + */ +public class SQLFilter { + + /** + * SQL注入过滤 + * @param str 待验证的字符串 + */ + public static String sqlInject(String str){ + if(StringUtils.isBlank(str)){ + return null; + } + //去掉'|"|;|\字符 + str = StringUtils.replace(str, "'", ""); + str = StringUtils.replace(str, "\"", ""); + str = StringUtils.replace(str, ";", ""); + str = StringUtils.replace(str, "\\", ""); + + //转换成小写 + str = str.toLowerCase(); + + //非法字符 + String[] keywords = {"master", "truncate", "insert", "select", "delete", "update", "declare", "alter", "drop"}; + + //判断是否包含非法字符 + for(String keyword : keywords){ + if(str.indexOf(keyword) != -1){ + throw new RRException("包含非法字符"); + } + } + + return str; + } +} diff --git a/mall-coupon/pom.xml b/mall-coupon/pom.xml index 8756671..7406252 100644 --- a/mall-coupon/pom.xml +++ b/mall-coupon/pom.xml @@ -7,5 +7,59 @@ com.carl.mall mall-coupon 1.0-SNAPSHOT + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + + + + 1.8 + 2020.0.1 + + + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/MallCouponApplication.java b/mall-coupon/src/main/java/com/carl/mall/coupon/MallCouponApplication.java new file mode 100644 index 0000000..0152ff9 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/MallCouponApplication.java @@ -0,0 +1,18 @@ +package com.carl.mall.coupon; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +// 指定Mapper接口对应的路径 +@MapperScan("com.carl.mall.coupon.dao") +@EnableDiscoveryClient +public class MallCouponApplication { + + public static void main(String[] args) { + SpringApplication.run(MallCouponApplication.class,args); + } +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponController.java new file mode 100644 index 0000000..81c6d21 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.CouponEntity; +import com.carl.mall.coupon.service.CouponService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 优惠券信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/coupon") +public class CouponController { + @Autowired + private CouponService couponService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:coupon:list") + public R list(@RequestParam Map params){ + PageUtils page = couponService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:coupon:info") + public R info(@PathVariable("id") Long id){ + CouponEntity coupon = couponService.getById(id); + + return R.ok().put("coupon", coupon); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:coupon:save") + public R save(@RequestBody CouponEntity coupon){ + couponService.save(coupon); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:coupon:update") + public R update(@RequestBody CouponEntity coupon){ + couponService.updateById(coupon); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:coupon:delete") + public R delete(@RequestBody Long[] ids){ + couponService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponHistoryController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponHistoryController.java new file mode 100644 index 0000000..9318da2 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponHistoryController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.CouponHistoryEntity; +import com.carl.mall.coupon.service.CouponHistoryService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 优惠券领取历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/couponhistory") +public class CouponHistoryController { + @Autowired + private CouponHistoryService couponHistoryService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:couponhistory:list") + public R list(@RequestParam Map params){ + PageUtils page = couponHistoryService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:couponhistory:info") + public R info(@PathVariable("id") Long id){ + CouponHistoryEntity couponHistory = couponHistoryService.getById(id); + + return R.ok().put("couponHistory", couponHistory); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:couponhistory:save") + public R save(@RequestBody CouponHistoryEntity couponHistory){ + couponHistoryService.save(couponHistory); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:couponhistory:update") + public R update(@RequestBody CouponHistoryEntity couponHistory){ + couponHistoryService.updateById(couponHistory); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:couponhistory:delete") + public R delete(@RequestBody Long[] ids){ + couponHistoryService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuCategoryRelationController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuCategoryRelationController.java new file mode 100644 index 0000000..90df296 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuCategoryRelationController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.carl.mall.coupon.service.CouponSpuCategoryRelationService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 优惠券分类关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/couponspucategoryrelation") +public class CouponSpuCategoryRelationController { + @Autowired + private CouponSpuCategoryRelationService couponSpuCategoryRelationService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:couponspucategoryrelation:list") + public R list(@RequestParam Map params){ + PageUtils page = couponSpuCategoryRelationService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:couponspucategoryrelation:info") + public R info(@PathVariable("id") Long id){ + CouponSpuCategoryRelationEntity couponSpuCategoryRelation = couponSpuCategoryRelationService.getById(id); + + return R.ok().put("couponSpuCategoryRelation", couponSpuCategoryRelation); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:couponspucategoryrelation:save") + public R save(@RequestBody CouponSpuCategoryRelationEntity couponSpuCategoryRelation){ + couponSpuCategoryRelationService.save(couponSpuCategoryRelation); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:couponspucategoryrelation:update") + public R update(@RequestBody CouponSpuCategoryRelationEntity couponSpuCategoryRelation){ + couponSpuCategoryRelationService.updateById(couponSpuCategoryRelation); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:couponspucategoryrelation:delete") + public R delete(@RequestBody Long[] ids){ + couponSpuCategoryRelationService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuRelationController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuRelationController.java new file mode 100644 index 0000000..c24ae33 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/CouponSpuRelationController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.CouponSpuRelationEntity; +import com.carl.mall.coupon.service.CouponSpuRelationService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 优惠券与产品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/couponspurelation") +public class CouponSpuRelationController { + @Autowired + private CouponSpuRelationService couponSpuRelationService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:couponspurelation:list") + public R list(@RequestParam Map params){ + PageUtils page = couponSpuRelationService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:couponspurelation:info") + public R info(@PathVariable("id") Long id){ + CouponSpuRelationEntity couponSpuRelation = couponSpuRelationService.getById(id); + + return R.ok().put("couponSpuRelation", couponSpuRelation); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:couponspurelation:save") + public R save(@RequestBody CouponSpuRelationEntity couponSpuRelation){ + couponSpuRelationService.save(couponSpuRelation); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:couponspurelation:update") + public R update(@RequestBody CouponSpuRelationEntity couponSpuRelation){ + couponSpuRelationService.updateById(couponSpuRelation); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:couponspurelation:delete") + public R delete(@RequestBody Long[] ids){ + couponSpuRelationService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeAdvController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeAdvController.java new file mode 100644 index 0000000..57371b9 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeAdvController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.HomeAdvEntity; +import com.carl.mall.coupon.service.HomeAdvService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 首页轮播广告 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/homeadv") +public class HomeAdvController { + @Autowired + private HomeAdvService homeAdvService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:homeadv:list") + public R list(@RequestParam Map params){ + PageUtils page = homeAdvService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:homeadv:info") + public R info(@PathVariable("id") Long id){ + HomeAdvEntity homeAdv = homeAdvService.getById(id); + + return R.ok().put("homeAdv", homeAdv); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:homeadv:save") + public R save(@RequestBody HomeAdvEntity homeAdv){ + homeAdvService.save(homeAdv); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:homeadv:update") + public R update(@RequestBody HomeAdvEntity homeAdv){ + homeAdvService.updateById(homeAdv); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:homeadv:delete") + public R delete(@RequestBody Long[] ids){ + homeAdvService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectController.java new file mode 100644 index 0000000..124a376 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.HomeSubjectEntity; +import com.carl.mall.coupon.service.HomeSubjectService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 首页专题表【jd首页下面很多专题,每个专题链接新的页面,展示专题商品信息】 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/homesubject") +public class HomeSubjectController { + @Autowired + private HomeSubjectService homeSubjectService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:homesubject:list") + public R list(@RequestParam Map params){ + PageUtils page = homeSubjectService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:homesubject:info") + public R info(@PathVariable("id") Long id){ + HomeSubjectEntity homeSubject = homeSubjectService.getById(id); + + return R.ok().put("homeSubject", homeSubject); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:homesubject:save") + public R save(@RequestBody HomeSubjectEntity homeSubject){ + homeSubjectService.save(homeSubject); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:homesubject:update") + public R update(@RequestBody HomeSubjectEntity homeSubject){ + homeSubjectService.updateById(homeSubject); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:homesubject:delete") + public R delete(@RequestBody Long[] ids){ + homeSubjectService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectSpuController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectSpuController.java new file mode 100644 index 0000000..7a3ed6c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/HomeSubjectSpuController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.HomeSubjectSpuEntity; +import com.carl.mall.coupon.service.HomeSubjectSpuService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 专题商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/homesubjectspu") +public class HomeSubjectSpuController { + @Autowired + private HomeSubjectSpuService homeSubjectSpuService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:homesubjectspu:list") + public R list(@RequestParam Map params){ + PageUtils page = homeSubjectSpuService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:homesubjectspu:info") + public R info(@PathVariable("id") Long id){ + HomeSubjectSpuEntity homeSubjectSpu = homeSubjectSpuService.getById(id); + + return R.ok().put("homeSubjectSpu", homeSubjectSpu); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:homesubjectspu:save") + public R save(@RequestBody HomeSubjectSpuEntity homeSubjectSpu){ + homeSubjectSpuService.save(homeSubjectSpu); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:homesubjectspu:update") + public R update(@RequestBody HomeSubjectSpuEntity homeSubjectSpu){ + homeSubjectSpuService.updateById(homeSubjectSpu); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:homesubjectspu:delete") + public R delete(@RequestBody Long[] ids){ + homeSubjectSpuService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/MemberPriceController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/MemberPriceController.java new file mode 100644 index 0000000..ef654df --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/MemberPriceController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.MemberPriceEntity; +import com.carl.mall.coupon.service.MemberPriceService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 商品会员价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/memberprice") +public class MemberPriceController { + @Autowired + private MemberPriceService memberPriceService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:memberprice:list") + public R list(@RequestParam Map params){ + PageUtils page = memberPriceService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:memberprice:info") + public R info(@PathVariable("id") Long id){ + MemberPriceEntity memberPrice = memberPriceService.getById(id); + + return R.ok().put("memberPrice", memberPrice); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:memberprice:save") + public R save(@RequestBody MemberPriceEntity memberPrice){ + memberPriceService.save(memberPrice); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:memberprice:update") + public R update(@RequestBody MemberPriceEntity memberPrice){ + memberPriceService.updateById(memberPrice); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:memberprice:delete") + public R delete(@RequestBody Long[] ids){ + memberPriceService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillPromotionController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillPromotionController.java new file mode 100644 index 0000000..c0f7e36 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillPromotionController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SeckillPromotionEntity; +import com.carl.mall.coupon.service.SeckillPromotionService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 秒杀活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/seckillpromotion") +public class SeckillPromotionController { + @Autowired + private SeckillPromotionService seckillPromotionService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:seckillpromotion:list") + public R list(@RequestParam Map params){ + PageUtils page = seckillPromotionService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:seckillpromotion:info") + public R info(@PathVariable("id") Long id){ + SeckillPromotionEntity seckillPromotion = seckillPromotionService.getById(id); + + return R.ok().put("seckillPromotion", seckillPromotion); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:seckillpromotion:save") + public R save(@RequestBody SeckillPromotionEntity seckillPromotion){ + seckillPromotionService.save(seckillPromotion); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:seckillpromotion:update") + public R update(@RequestBody SeckillPromotionEntity seckillPromotion){ + seckillPromotionService.updateById(seckillPromotion); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:seckillpromotion:delete") + public R delete(@RequestBody Long[] ids){ + seckillPromotionService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSessionController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSessionController.java new file mode 100644 index 0000000..169c352 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSessionController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SeckillSessionEntity; +import com.carl.mall.coupon.service.SeckillSessionService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 秒杀活动场次 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/seckillsession") +public class SeckillSessionController { + @Autowired + private SeckillSessionService seckillSessionService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:seckillsession:list") + public R list(@RequestParam Map params){ + PageUtils page = seckillSessionService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:seckillsession:info") + public R info(@PathVariable("id") Long id){ + SeckillSessionEntity seckillSession = seckillSessionService.getById(id); + + return R.ok().put("seckillSession", seckillSession); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:seckillsession:save") + public R save(@RequestBody SeckillSessionEntity seckillSession){ + seckillSessionService.save(seckillSession); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:seckillsession:update") + public R update(@RequestBody SeckillSessionEntity seckillSession){ + seckillSessionService.updateById(seckillSession); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:seckillsession:delete") + public R delete(@RequestBody Long[] ids){ + seckillSessionService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuNoticeController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuNoticeController.java new file mode 100644 index 0000000..b7622cc --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuNoticeController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SeckillSkuNoticeEntity; +import com.carl.mall.coupon.service.SeckillSkuNoticeService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 秒杀商品通知订阅 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/seckillskunotice") +public class SeckillSkuNoticeController { + @Autowired + private SeckillSkuNoticeService seckillSkuNoticeService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:seckillskunotice:list") + public R list(@RequestParam Map params){ + PageUtils page = seckillSkuNoticeService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:seckillskunotice:info") + public R info(@PathVariable("id") Long id){ + SeckillSkuNoticeEntity seckillSkuNotice = seckillSkuNoticeService.getById(id); + + return R.ok().put("seckillSkuNotice", seckillSkuNotice); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:seckillskunotice:save") + public R save(@RequestBody SeckillSkuNoticeEntity seckillSkuNotice){ + seckillSkuNoticeService.save(seckillSkuNotice); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:seckillskunotice:update") + public R update(@RequestBody SeckillSkuNoticeEntity seckillSkuNotice){ + seckillSkuNoticeService.updateById(seckillSkuNotice); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:seckillskunotice:delete") + public R delete(@RequestBody Long[] ids){ + seckillSkuNoticeService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuRelationController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuRelationController.java new file mode 100644 index 0000000..a088363 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SeckillSkuRelationController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SeckillSkuRelationEntity; +import com.carl.mall.coupon.service.SeckillSkuRelationService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 秒杀活动商品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/seckillskurelation") +public class SeckillSkuRelationController { + @Autowired + private SeckillSkuRelationService seckillSkuRelationService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:seckillskurelation:list") + public R list(@RequestParam Map params){ + PageUtils page = seckillSkuRelationService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:seckillskurelation:info") + public R info(@PathVariable("id") Long id){ + SeckillSkuRelationEntity seckillSkuRelation = seckillSkuRelationService.getById(id); + + return R.ok().put("seckillSkuRelation", seckillSkuRelation); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:seckillskurelation:save") + public R save(@RequestBody SeckillSkuRelationEntity seckillSkuRelation){ + seckillSkuRelationService.save(seckillSkuRelation); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:seckillskurelation:update") + public R update(@RequestBody SeckillSkuRelationEntity seckillSkuRelation){ + seckillSkuRelationService.updateById(seckillSkuRelation); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:seckillskurelation:delete") + public R delete(@RequestBody Long[] ids){ + seckillSkuRelationService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuFullReductionController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuFullReductionController.java new file mode 100644 index 0000000..2b49315 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuFullReductionController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SkuFullReductionEntity; +import com.carl.mall.coupon.service.SkuFullReductionService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 商品满减信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/skufullreduction") +public class SkuFullReductionController { + @Autowired + private SkuFullReductionService skuFullReductionService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:skufullreduction:list") + public R list(@RequestParam Map params){ + PageUtils page = skuFullReductionService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:skufullreduction:info") + public R info(@PathVariable("id") Long id){ + SkuFullReductionEntity skuFullReduction = skuFullReductionService.getById(id); + + return R.ok().put("skuFullReduction", skuFullReduction); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:skufullreduction:save") + public R save(@RequestBody SkuFullReductionEntity skuFullReduction){ + skuFullReductionService.save(skuFullReduction); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:skufullreduction:update") + public R update(@RequestBody SkuFullReductionEntity skuFullReduction){ + skuFullReductionService.updateById(skuFullReduction); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:skufullreduction:delete") + public R delete(@RequestBody Long[] ids){ + skuFullReductionService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuLadderController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuLadderController.java new file mode 100644 index 0000000..9608315 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SkuLadderController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SkuLadderEntity; +import com.carl.mall.coupon.service.SkuLadderService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 商品阶梯价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/skuladder") +public class SkuLadderController { + @Autowired + private SkuLadderService skuLadderService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:skuladder:list") + public R list(@RequestParam Map params){ + PageUtils page = skuLadderService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:skuladder:info") + public R info(@PathVariable("id") Long id){ + SkuLadderEntity skuLadder = skuLadderService.getById(id); + + return R.ok().put("skuLadder", skuLadder); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:skuladder:save") + public R save(@RequestBody SkuLadderEntity skuLadder){ + skuLadderService.save(skuLadder); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:skuladder:update") + public R update(@RequestBody SkuLadderEntity skuLadder){ + skuLadderService.updateById(skuLadder); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:skuladder:delete") + public R delete(@RequestBody Long[] ids){ + skuLadderService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SpuBoundsController.java b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SpuBoundsController.java new file mode 100644 index 0000000..04fd918 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/controller/SpuBoundsController.java @@ -0,0 +1,90 @@ +package com.carl.mall.coupon.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.coupon.entity.SpuBoundsEntity; +import com.carl.mall.coupon.service.SpuBoundsService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 商品spu积分设置 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@RestController +@RequestMapping("coupon/spubounds") +public class SpuBoundsController { + @Autowired + private SpuBoundsService spuBoundsService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("coupon:spubounds:list") + public R list(@RequestParam Map params){ + PageUtils page = spuBoundsService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("coupon:spubounds:info") + public R info(@PathVariable("id") Long id){ + SpuBoundsEntity spuBounds = spuBoundsService.getById(id); + + return R.ok().put("spuBounds", spuBounds); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("coupon:spubounds:save") + public R save(@RequestBody SpuBoundsEntity spuBounds){ + spuBoundsService.save(spuBounds); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("coupon:spubounds:update") + public R update(@RequestBody SpuBoundsEntity spuBounds){ + spuBoundsService.updateById(spuBounds); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("coupon:spubounds:delete") + public R delete(@RequestBody Long[] ids){ + spuBoundsService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponDao.java new file mode 100644 index 0000000..74a1bd5 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.CouponEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface CouponDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponHistoryDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponHistoryDao.java new file mode 100644 index 0000000..250a968 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponHistoryDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.CouponHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券领取历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface CouponHistoryDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuCategoryRelationDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuCategoryRelationDao.java new file mode 100644 index 0000000..f83b405 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuCategoryRelationDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券分类关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface CouponSpuCategoryRelationDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuRelationDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuRelationDao.java new file mode 100644 index 0000000..3eb077c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/CouponSpuRelationDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.CouponSpuRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券与产品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface CouponSpuRelationDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeAdvDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeAdvDao.java new file mode 100644 index 0000000..a98bd25 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeAdvDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.HomeAdvEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 首页轮播广告 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface HomeAdvDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectDao.java new file mode 100644 index 0000000..8dcfa07 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.HomeSubjectEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 首页专题表【jd首页下面很多专题,每个专题链接新的页面,展示专题商品信息】 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface HomeSubjectDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectSpuDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectSpuDao.java new file mode 100644 index 0000000..a02ee2d --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/HomeSubjectSpuDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.HomeSubjectSpuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 专题商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface HomeSubjectSpuDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/MemberPriceDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/MemberPriceDao.java new file mode 100644 index 0000000..7587a39 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/MemberPriceDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.MemberPriceEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品会员价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface MemberPriceDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillPromotionDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillPromotionDao.java new file mode 100644 index 0000000..47df5be --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillPromotionDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SeckillPromotionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SeckillPromotionDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSessionDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSessionDao.java new file mode 100644 index 0000000..c27a14a --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSessionDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SeckillSessionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动场次 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SeckillSessionDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuNoticeDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuNoticeDao.java new file mode 100644 index 0000000..1ebd1ed --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuNoticeDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SeckillSkuNoticeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀商品通知订阅 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SeckillSkuNoticeDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuRelationDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuRelationDao.java new file mode 100644 index 0000000..65c0d67 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SeckillSkuRelationDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SeckillSkuRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动商品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SeckillSkuRelationDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuFullReductionDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuFullReductionDao.java new file mode 100644 index 0000000..b3fc40a --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuFullReductionDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SkuFullReductionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品满减信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SkuFullReductionDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuLadderDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuLadderDao.java new file mode 100644 index 0000000..216e45b --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SkuLadderDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SkuLadderEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品阶梯价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SkuLadderDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SpuBoundsDao.java b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SpuBoundsDao.java new file mode 100644 index 0000000..5be938a --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/dao/SpuBoundsDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.coupon.dao; + +import com.carl.mall.coupon.entity.SpuBoundsEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品spu积分设置 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Mapper +public interface SpuBoundsDao extends BaseMapper { + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponEntity.java new file mode 100644 index 0000000..6e8d52c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponEntity.java @@ -0,0 +1,105 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 优惠券信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_coupon") +public class CouponEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 优惠卷类型[0->全场赠券;1->会员赠券;2->购物赠券;3->注册赠券] + */ + private Integer couponType; + /** + * 优惠券图片 + */ + private String couponImg; + /** + * 优惠卷名字 + */ + private String couponName; + /** + * 数量 + */ + private Integer num; + /** + * 金额 + */ + private BigDecimal amount; + /** + * 每人限领张数 + */ + private Integer perLimit; + /** + * 使用门槛 + */ + private BigDecimal minPoint; + /** + * 开始时间 + */ + private Date startTime; + /** + * 结束时间 + */ + private Date endTime; + /** + * 使用类型[0->全场通用;1->指定分类;2->指定商品] + */ + private Integer useType; + /** + * 备注 + */ + private String note; + /** + * 发行数量 + */ + private Integer publishCount; + /** + * 已使用数量 + */ + private Integer useCount; + /** + * 领取数量 + */ + private Integer receiveCount; + /** + * 可以领取的开始日期 + */ + private Date enableStartTime; + /** + * 可以领取的结束日期 + */ + private Date enableEndTime; + /** + * 优惠码 + */ + private String code; + /** + * 可以领取的会员等级[0->不限等级,其他-对应等级] + */ + private Integer memberLevel; + /** + * 发布状态[0-未发布,1-已发布] + */ + private Integer publish; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponHistoryEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponHistoryEntity.java new file mode 100644 index 0000000..36cff90 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponHistoryEntity.java @@ -0,0 +1,64 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 优惠券领取历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_coupon_history") +public class CouponHistoryEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 优惠券id + */ + private Long couponId; + /** + * 会员id + */ + private Long memberId; + /** + * 会员名字 + */ + private String memberNickName; + /** + * 获取方式[0->后台赠送;1->主动领取] + */ + private Integer getType; + /** + * 创建时间 + */ + private Date createTime; + /** + * 使用状态[0->未使用;1->已使用;2->已过期] + */ + private Integer useType; + /** + * 使用时间 + */ + private Date useTime; + /** + * 订单id + */ + private Long orderId; + /** + * 订单号 + */ + private Long orderSn; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuCategoryRelationEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuCategoryRelationEntity.java new file mode 100644 index 0000000..a558294 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuCategoryRelationEntity.java @@ -0,0 +1,40 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 优惠券分类关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_coupon_spu_category_relation") +public class CouponSpuCategoryRelationEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 优惠券id + */ + private Long couponId; + /** + * 产品分类id + */ + private Long categoryId; + /** + * 产品分类名称 + */ + private String categoryName; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuRelationEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuRelationEntity.java new file mode 100644 index 0000000..8b5fa18 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/CouponSpuRelationEntity.java @@ -0,0 +1,40 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 优惠券与产品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_coupon_spu_relation") +public class CouponSpuRelationEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 优惠券id + */ + private Long couponId; + /** + * spu_id + */ + private Long spuId; + /** + * spu_name + */ + private String spuName; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeAdvEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeAdvEntity.java new file mode 100644 index 0000000..db8624a --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeAdvEntity.java @@ -0,0 +1,72 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 首页轮播广告 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_home_adv") +public class HomeAdvEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 名字 + */ + private String name; + /** + * 图片地址 + */ + private String pic; + /** + * 开始时间 + */ + private Date startTime; + /** + * 结束时间 + */ + private Date endTime; + /** + * 状态 + */ + private Integer status; + /** + * 点击数 + */ + private Integer clickCount; + /** + * 广告详情连接地址 + */ + private String url; + /** + * 备注 + */ + private String note; + /** + * 排序 + */ + private Integer sort; + /** + * 发布者 + */ + private Long publisherId; + /** + * 审核者 + */ + private Long authId; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectEntity.java new file mode 100644 index 0000000..fa48b74 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectEntity.java @@ -0,0 +1,56 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 首页专题表【jd首页下面很多专题,每个专题链接新的页面,展示专题商品信息】 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_home_subject") +public class HomeSubjectEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 专题名字 + */ + private String name; + /** + * 专题标题 + */ + private String title; + /** + * 专题副标题 + */ + private String subTitle; + /** + * 显示状态 + */ + private Integer status; + /** + * 详情连接 + */ + private String url; + /** + * 排序 + */ + private Integer sort; + /** + * 专题图片地址 + */ + private String img; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectSpuEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectSpuEntity.java new file mode 100644 index 0000000..d64dbe1 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/HomeSubjectSpuEntity.java @@ -0,0 +1,44 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 专题商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_home_subject_spu") +public class HomeSubjectSpuEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 专题名字 + */ + private String name; + /** + * 专题id + */ + private Long subjectId; + /** + * spu_id + */ + private Long spuId; + /** + * 排序 + */ + private Integer sort; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/MemberPriceEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/MemberPriceEntity.java new file mode 100644 index 0000000..ed08a1c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/MemberPriceEntity.java @@ -0,0 +1,49 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品会员价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_member_price") +public class MemberPriceEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * sku_id + */ + private Long skuId; + /** + * 会员等级id + */ + private Long memberLevelId; + /** + * 会员等级名 + */ + private String memberLevelName; + /** + * 会员对应价格 + */ + private BigDecimal memberPrice; + /** + * 可否叠加其他优惠[0-不可叠加优惠,1-可叠加] + */ + private Integer addOther; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillPromotionEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillPromotionEntity.java new file mode 100644 index 0000000..44da4dc --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillPromotionEntity.java @@ -0,0 +1,52 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 秒杀活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_seckill_promotion") +public class SeckillPromotionEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 活动标题 + */ + private String title; + /** + * 开始日期 + */ + private Date startTime; + /** + * 结束日期 + */ + private Date endTime; + /** + * 上下线状态 + */ + private Integer status; + /** + * 创建时间 + */ + private Date createTime; + /** + * 创建人 + */ + private Long userId; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSessionEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSessionEntity.java new file mode 100644 index 0000000..c081718 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSessionEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 秒杀活动场次 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_seckill_session") +public class SeckillSessionEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 场次名称 + */ + private String name; + /** + * 每日开始时间 + */ + private Date startTime; + /** + * 每日结束时间 + */ + private Date endTime; + /** + * 启用状态 + */ + private Integer status; + /** + * 创建时间 + */ + private Date createTime; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuNoticeEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuNoticeEntity.java new file mode 100644 index 0000000..0812b8d --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuNoticeEntity.java @@ -0,0 +1,52 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 秒杀商品通知订阅 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_seckill_sku_notice") +public class SeckillSkuNoticeEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * sku_id + */ + private Long skuId; + /** + * 活动场次id + */ + private Long sessionId; + /** + * 订阅时间 + */ + private Date subcribeTime; + /** + * 发送时间 + */ + private Date sendTime; + /** + * 通知方式[0-短信,1-邮件] + */ + private Integer noticeType; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuRelationEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuRelationEntity.java new file mode 100644 index 0000000..7f6fe0c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SeckillSkuRelationEntity.java @@ -0,0 +1,57 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 秒杀活动商品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_seckill_sku_relation") +public class SeckillSkuRelationEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 活动id + */ + private Long promotionId; + /** + * 活动场次id + */ + private Long promotionSessionId; + /** + * 商品id + */ + private Long skuId; + /** + * 秒杀价格 + */ + private BigDecimal seckillPrice; + /** + * 秒杀总量 + */ + private BigDecimal seckillCount; + /** + * 每人限购数量 + */ + private BigDecimal seckillLimit; + /** + * 排序 + */ + private Integer seckillSort; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuFullReductionEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuFullReductionEntity.java new file mode 100644 index 0000000..e85bb3c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuFullReductionEntity.java @@ -0,0 +1,45 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品满减信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_sku_full_reduction") +public class SkuFullReductionEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * spu_id + */ + private Long skuId; + /** + * 满多少 + */ + private BigDecimal fullPrice; + /** + * 减多少 + */ + private BigDecimal reducePrice; + /** + * 是否参与其他优惠 + */ + private Integer addOther; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuLadderEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuLadderEntity.java new file mode 100644 index 0000000..8ae2b16 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SkuLadderEntity.java @@ -0,0 +1,49 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品阶梯价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_sku_ladder") +public class SkuLadderEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * spu_id + */ + private Long skuId; + /** + * 满几件 + */ + private Integer fullCount; + /** + * 打几折 + */ + private BigDecimal discount; + /** + * 折后价 + */ + private BigDecimal price; + /** + * 是否叠加其他优惠[0-不可叠加,1-可叠加] + */ + private Integer addOther; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SpuBoundsEntity.java b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SpuBoundsEntity.java new file mode 100644 index 0000000..775370c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/entity/SpuBoundsEntity.java @@ -0,0 +1,45 @@ +package com.carl.mall.coupon.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品spu积分设置 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +@Data +@TableName("sms_spu_bounds") +public class SpuBoundsEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * + */ + private Long spuId; + /** + * 成长积分 + */ + private BigDecimal growBounds; + /** + * 购物积分 + */ + private BigDecimal buyBounds; + /** + * 优惠生效情况[1111(四个状态位,从右到左);0 - 无优惠,成长积分是否赠送;1 - 无优惠,购物积分是否赠送;2 - 有优惠,成长积分是否赠送;3 - 有优惠,购物积分是否赠送【状态位0:不赠送,1:赠送】] + */ + private Integer work; + +} diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponHistoryService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponHistoryService.java new file mode 100644 index 0000000..ae694db --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponHistoryService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.CouponHistoryEntity; + +import java.util.Map; + +/** + * 优惠券领取历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface CouponHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponService.java new file mode 100644 index 0000000..f51a1a3 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.CouponEntity; + +import java.util.Map; + +/** + * 优惠券信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface CouponService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuCategoryRelationService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuCategoryRelationService.java new file mode 100644 index 0000000..af463d5 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuCategoryRelationService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.CouponSpuCategoryRelationEntity; + +import java.util.Map; + +/** + * 优惠券分类关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface CouponSpuCategoryRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuRelationService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuRelationService.java new file mode 100644 index 0000000..7815b3b --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/CouponSpuRelationService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.CouponSpuRelationEntity; + +import java.util.Map; + +/** + * 优惠券与产品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface CouponSpuRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeAdvService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeAdvService.java new file mode 100644 index 0000000..ff7ac71 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeAdvService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.HomeAdvEntity; + +import java.util.Map; + +/** + * 首页轮播广告 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface HomeAdvService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectService.java new file mode 100644 index 0000000..6342b3b --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.HomeSubjectEntity; + +import java.util.Map; + +/** + * 首页专题表【jd首页下面很多专题,每个专题链接新的页面,展示专题商品信息】 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface HomeSubjectService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectSpuService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectSpuService.java new file mode 100644 index 0000000..64a7af8 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/HomeSubjectSpuService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.HomeSubjectSpuEntity; + +import java.util.Map; + +/** + * 专题商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface HomeSubjectSpuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/MemberPriceService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/MemberPriceService.java new file mode 100644 index 0000000..0f07d6c --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/MemberPriceService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.MemberPriceEntity; + +import java.util.Map; + +/** + * 商品会员价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface MemberPriceService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillPromotionService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillPromotionService.java new file mode 100644 index 0000000..014b877 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillPromotionService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SeckillPromotionEntity; + +import java.util.Map; + +/** + * 秒杀活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SeckillPromotionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSessionService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSessionService.java new file mode 100644 index 0000000..df35f48 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSessionService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SeckillSessionEntity; + +import java.util.Map; + +/** + * 秒杀活动场次 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SeckillSessionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuNoticeService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuNoticeService.java new file mode 100644 index 0000000..1b2e7ec --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuNoticeService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SeckillSkuNoticeEntity; + +import java.util.Map; + +/** + * 秒杀商品通知订阅 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SeckillSkuNoticeService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuRelationService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuRelationService.java new file mode 100644 index 0000000..eb49b3f --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SeckillSkuRelationService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SeckillSkuRelationEntity; + +import java.util.Map; + +/** + * 秒杀活动商品关联 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SeckillSkuRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuFullReductionService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuFullReductionService.java new file mode 100644 index 0000000..f22f5be --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuFullReductionService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SkuFullReductionEntity; + +import java.util.Map; + +/** + * 商品满减信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SkuFullReductionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuLadderService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuLadderService.java new file mode 100644 index 0000000..f55cd9d --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SkuLadderService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SkuLadderEntity; + +import java.util.Map; + +/** + * 商品阶梯价格 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SkuLadderService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/SpuBoundsService.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SpuBoundsService.java new file mode 100644 index 0000000..897ab89 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/SpuBoundsService.java @@ -0,0 +1,20 @@ +package com.carl.mall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.coupon.entity.SpuBoundsEntity; + +import java.util.Map; + +/** + * 商品spu积分设置 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:23:16 + */ +public interface SpuBoundsService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponHistoryServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponHistoryServiceImpl.java new file mode 100644 index 0000000..0f0a8aa --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.CouponHistoryDao; +import com.carl.mall.coupon.entity.CouponHistoryEntity; +import com.carl.mall.coupon.service.CouponHistoryService; + + +@Service("couponHistoryService") +public class CouponHistoryServiceImpl extends ServiceImpl implements CouponHistoryService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponServiceImpl.java new file mode 100644 index 0000000..7a833c9 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.CouponDao; +import com.carl.mall.coupon.entity.CouponEntity; +import com.carl.mall.coupon.service.CouponService; + + +@Service("couponService") +public class CouponServiceImpl extends ServiceImpl implements CouponService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java new file mode 100644 index 0000000..5d47983 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.CouponSpuCategoryRelationDao; +import com.carl.mall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.carl.mall.coupon.service.CouponSpuCategoryRelationService; + + +@Service("couponSpuCategoryRelationService") +public class CouponSpuCategoryRelationServiceImpl extends ServiceImpl implements CouponSpuCategoryRelationService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuRelationServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuRelationServiceImpl.java new file mode 100644 index 0000000..d28268b --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/CouponSpuRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.CouponSpuRelationDao; +import com.carl.mall.coupon.entity.CouponSpuRelationEntity; +import com.carl.mall.coupon.service.CouponSpuRelationService; + + +@Service("couponSpuRelationService") +public class CouponSpuRelationServiceImpl extends ServiceImpl implements CouponSpuRelationService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeAdvServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeAdvServiceImpl.java new file mode 100644 index 0000000..406f222 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeAdvServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.HomeAdvDao; +import com.carl.mall.coupon.entity.HomeAdvEntity; +import com.carl.mall.coupon.service.HomeAdvService; + + +@Service("homeAdvService") +public class HomeAdvServiceImpl extends ServiceImpl implements HomeAdvService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectServiceImpl.java new file mode 100644 index 0000000..3de60fb --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.HomeSubjectDao; +import com.carl.mall.coupon.entity.HomeSubjectEntity; +import com.carl.mall.coupon.service.HomeSubjectService; + + +@Service("homeSubjectService") +public class HomeSubjectServiceImpl extends ServiceImpl implements HomeSubjectService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectSpuServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectSpuServiceImpl.java new file mode 100644 index 0000000..6e15e40 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/HomeSubjectSpuServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.HomeSubjectSpuDao; +import com.carl.mall.coupon.entity.HomeSubjectSpuEntity; +import com.carl.mall.coupon.service.HomeSubjectSpuService; + + +@Service("homeSubjectSpuService") +public class HomeSubjectSpuServiceImpl extends ServiceImpl implements HomeSubjectSpuService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/MemberPriceServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/MemberPriceServiceImpl.java new file mode 100644 index 0000000..6ea687b --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/MemberPriceServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.MemberPriceDao; +import com.carl.mall.coupon.entity.MemberPriceEntity; +import com.carl.mall.coupon.service.MemberPriceService; + + +@Service("memberPriceService") +public class MemberPriceServiceImpl extends ServiceImpl implements MemberPriceService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillPromotionServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillPromotionServiceImpl.java new file mode 100644 index 0000000..c97b096 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillPromotionServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SeckillPromotionDao; +import com.carl.mall.coupon.entity.SeckillPromotionEntity; +import com.carl.mall.coupon.service.SeckillPromotionService; + + +@Service("seckillPromotionService") +public class SeckillPromotionServiceImpl extends ServiceImpl implements SeckillPromotionService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSessionServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSessionServiceImpl.java new file mode 100644 index 0000000..ac0cd98 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSessionServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SeckillSessionDao; +import com.carl.mall.coupon.entity.SeckillSessionEntity; +import com.carl.mall.coupon.service.SeckillSessionService; + + +@Service("seckillSessionService") +public class SeckillSessionServiceImpl extends ServiceImpl implements SeckillSessionService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java new file mode 100644 index 0000000..16ca3a8 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SeckillSkuNoticeDao; +import com.carl.mall.coupon.entity.SeckillSkuNoticeEntity; +import com.carl.mall.coupon.service.SeckillSkuNoticeService; + + +@Service("seckillSkuNoticeService") +public class SeckillSkuNoticeServiceImpl extends ServiceImpl implements SeckillSkuNoticeService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuRelationServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuRelationServiceImpl.java new file mode 100644 index 0000000..4052186 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SeckillSkuRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SeckillSkuRelationDao; +import com.carl.mall.coupon.entity.SeckillSkuRelationEntity; +import com.carl.mall.coupon.service.SeckillSkuRelationService; + + +@Service("seckillSkuRelationService") +public class SeckillSkuRelationServiceImpl extends ServiceImpl implements SeckillSkuRelationService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuFullReductionServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuFullReductionServiceImpl.java new file mode 100644 index 0000000..a030297 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuFullReductionServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SkuFullReductionDao; +import com.carl.mall.coupon.entity.SkuFullReductionEntity; +import com.carl.mall.coupon.service.SkuFullReductionService; + + +@Service("skuFullReductionService") +public class SkuFullReductionServiceImpl extends ServiceImpl implements SkuFullReductionService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuLadderServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuLadderServiceImpl.java new file mode 100644 index 0000000..582e517 --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SkuLadderServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SkuLadderDao; +import com.carl.mall.coupon.entity.SkuLadderEntity; +import com.carl.mall.coupon.service.SkuLadderService; + + +@Service("skuLadderService") +public class SkuLadderServiceImpl extends ServiceImpl implements SkuLadderService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SpuBoundsServiceImpl.java b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SpuBoundsServiceImpl.java new file mode 100644 index 0000000..b02321d --- /dev/null +++ b/mall-coupon/src/main/java/com/carl/mall/coupon/service/impl/SpuBoundsServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.coupon.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.coupon.dao.SpuBoundsDao; +import com.carl.mall.coupon.entity.SpuBoundsEntity; +import com.carl.mall.coupon.service.SpuBoundsService; + + +@Service("spuBoundsService") +public class SpuBoundsServiceImpl extends ServiceImpl implements SpuBoundsService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-coupon/src/main/resources/application.yml b/mall-coupon/src/main/resources/application.yml new file mode 100644 index 0000000..3283e0c --- /dev/null +++ b/mall-coupon/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 9001 +# 数据库的连接新 +spring: + datasource: + username: root + password: 123456 + url: jdbc:mysql://192.168.73.130:12345/mall-sms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 192.168.73.130:8848 + application: + name: mall-coupon + + +#mybatis-plus 配置 +mybatis-plus: + mapper-locations: classpath*:/mapper/**/*.xml + global-config: + db-config: + id-type: auto # 主键自增 \ No newline at end of file diff --git a/mall-coupon/src/main/resources/bootstrap.properties b/mall-coupon/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..a0d815d --- /dev/null +++ b/mall-coupon/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +#nacos config +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 +spring.application.name= mall-coupon \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/CouponDao.xml b/mall-coupon/src/main/resources/mapper/coupon/CouponDao.xml new file mode 100644 index 0000000..011e6f1 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/CouponDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml b/mall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml new file mode 100644 index 0000000..c1d00d8 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml b/mall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml new file mode 100644 index 0000000..9bd1916 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml b/mall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml new file mode 100644 index 0000000..a931392 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml b/mall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml new file mode 100644 index 0000000..162cecc --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml b/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml new file mode 100644 index 0000000..631227b --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml b/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml new file mode 100644 index 0000000..70d3609 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml b/mall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml new file mode 100644 index 0000000..77261a9 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml new file mode 100644 index 0000000..b6263ad --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml new file mode 100644 index 0000000..0fcef57 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml new file mode 100644 index 0000000..c2047c0 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml new file mode 100644 index 0000000..a974de7 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml new file mode 100644 index 0000000..cfb9706 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml new file mode 100644 index 0000000..5b7ff84 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml b/mall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml new file mode 100644 index 0000000..b59af95 --- /dev/null +++ b/mall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-coupon/src/site/apt/format.apt b/mall-coupon/src/site/apt/format.apt deleted file mode 100644 index 39bb340..0000000 --- a/mall-coupon/src/site/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - The APT format - ----- - The Maven Team - ----- - ----- - -The APT format -~~~~~~~~~~~~~~ - - In the following section, boxes containing text in typewriter-like font are - examples of APT source. - -* Document structure -~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionally be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-coupon/src/site/apt/index.apt b/mall-coupon/src/site/apt/index.apt deleted file mode 100644 index 985ddeb..0000000 --- a/mall-coupon/src/site/apt/index.apt +++ /dev/null @@ -1,16 +0,0 @@ - ----- - The Site - ----- - The Maven Team - ----- - -Maven Site for your project - - Congratulations! If you are looking at this page then you have successfully generated a - template site employing the site archetype and you have run: - -+-----+ - -mvn site - -+-----+ diff --git a/mall-coupon/src/site/fml/faq.fml b/mall-coupon/src/site/fml/faq.fml deleted file mode 100644 index ba39c83..0000000 --- a/mall-coupon/src/site/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Where did Maven come from? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Why is Maven so wildly popular? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-coupon/src/site/fr/apt/format.apt b/mall-coupon/src/site/fr/apt/format.apt deleted file mode 100644 index eed0961..0000000 --- a/mall-coupon/src/site/fr/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - Le format APT - ----- - L'équipe Maven - ----- - ----- - -Le format APT -~~~~~~~~~~~~~ - - Dans la section suivante, les boîtes contenant du texte dans la police - de type machine à écrire sont des exemples de source APT. - -* Structure du document -~~~~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionaly be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-coupon/src/site/fr/apt/index.apt b/mall-coupon/src/site/fr/apt/index.apt deleted file mode 100644 index dde1c9f..0000000 --- a/mall-coupon/src/site/fr/apt/index.apt +++ /dev/null @@ -1,17 +0,0 @@ - ----- - Le Site - ----- - L'équipe Maven - ----- - -Site Maven pour votre projet - - Félicitations! Si vous regardez cette page alors vous avez - généré avec succès un modèle de site en utilisant l'archétype - de site et vous avez lancé : - -+-----+ - -mvn site - -+-----+ diff --git a/mall-coupon/src/site/fr/fml/faq.fml b/mall-coupon/src/site/fr/fml/faq.fml deleted file mode 100644 index 22ab255..0000000 --- a/mall-coupon/src/site/fr/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - D'où vient Maven ? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Pourquoi Maven est-il si populaire ? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-coupon/src/site/fr/markdown/markdown-velocity.md.vm b/mall-coupon/src/site/fr/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-coupon/src/site/fr/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-coupon/src/site/fr/markdown/markdown.md b/mall-coupon/src/site/fr/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-coupon/src/site/fr/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-coupon/src/site/fr/xdoc/xdoc.xml b/mall-coupon/src/site/fr/xdoc/xdoc.xml deleted file mode 100644 index 49e79bb..0000000 --- a/mall-coupon/src/site/fr/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Bienvenue - The Maven Team - - - -
-

- Ceci est du texte pour le fichier xdoc. -

-
- -
- diff --git a/mall-coupon/src/site/markdown/markdown-velocity.md.vm b/mall-coupon/src/site/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-coupon/src/site/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-coupon/src/site/markdown/markdown.md b/mall-coupon/src/site/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-coupon/src/site/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-coupon/src/site/site.xml b/mall-coupon/src/site/site.xml deleted file mode 100644 index 1cc2973..0000000 --- a/mall-coupon/src/site/site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-coupon/src/site/site_fr.xml b/mall-coupon/src/site/site_fr.xml deleted file mode 100644 index 17035ef..0000000 --- a/mall-coupon/src/site/site_fr.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-coupon/src/site/xdoc/xdoc.xml b/mall-coupon/src/site/xdoc/xdoc.xml deleted file mode 100644 index 557034e..0000000 --- a/mall-coupon/src/site/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Welcome - The Maven Team - - - -
-

- This is some text for the xdoc file. -

-
- -
- diff --git a/mall-gateway/pom.xml b/mall-gateway/pom.xml new file mode 100644 index 0000000..5f770c2 --- /dev/null +++ b/mall-gateway/pom.xml @@ -0,0 +1,76 @@ + + + + + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + + + 1.8 + 2020.0.1 + + 4.0.0 + + mall-gateway + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/mall-gateway/src/main/java/com/carl/mall/gateway/MallGatewayApplication.java b/mall-gateway/src/main/java/com/carl/mall/gateway/MallGatewayApplication.java new file mode 100644 index 0000000..2687e6d --- /dev/null +++ b/mall-gateway/src/main/java/com/carl/mall/gateway/MallGatewayApplication.java @@ -0,0 +1,16 @@ +package com.carl.mall.gateway; + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication(exclude = DataSourceAutoConfiguration.class) //DataSourceAutoConfiguration 不会加载数据连接池 +@EnableDiscoveryClient +public class MallGatewayApplication { + + public static void main(String[] args) { + SpringApplication.run(MallGatewayApplication.class,args); + } +} diff --git a/mall-gateway/src/main/resources/application.yml b/mall-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..e506506 --- /dev/null +++ b/mall-gateway/src/main/resources/application.yml @@ -0,0 +1,20 @@ +#spring: +# application: +# name: mall-gateway +# cloud: +# nacos: +# discovery: +# server-addr: 192.168.73.130:8848 +# gateway: +# routes: +# - id: route1 +# uri: http://www.baidu.com +# predicates: +# - Query=url,baidu +# - id: route2 +# uri: http://www.jd.com +# predicates: +# - Query=url,jd +# +#server: +# port: 9006 \ No newline at end of file diff --git a/mall-gateway/src/main/resources/bootstrap.properties b/mall-gateway/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..56cc1e8 --- /dev/null +++ b/mall-gateway/src/main/resources/bootstrap.properties @@ -0,0 +1,20 @@ +spring.application.name=mall-gateway +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 + + +#指定使用的命名空间 +spring.cloud.nacos.config.namespace=c36c110d-8a55-41c1-a50f-e804fe5603da + +spring.cloud.nacos.discovery.namespace=c36c110d-8a55-41c1-a50f-e804fe5603da +spring.cloud.nacos.discovery.group=prod +#指定对应的配置组 +spring.cloud.nacos.config.group=prod + +#配置多个配置集 +spring.cloud.nacos.config.ext-config[0].data-id=common.yml +spring.cloud.nacos.config.ext-config[0].group=prod +spring.cloud.nacos.config.ext-config[0].refresh=false + +spring.cloud.nacos.config.ext-config[1].data-id=routers.yml +spring.cloud.nacos.config.ext-config[1].group=prod +spring.cloud.nacos.config.ext-config[1].refresh=false diff --git a/mall-member/pom.xml b/mall-member/pom.xml index eb6e351..77bbc5e 100644 --- a/mall-member/pom.xml +++ b/mall-member/pom.xml @@ -3,10 +3,59 @@ 4.0.0 - + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + com.carl.mall mall-member 1.0-SNAPSHOT + + 1.8 + 2020.0.1 + + + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/mall-member/src/main/java/com/carl/mall/member/MallMemberApplication.java b/mall-member/src/main/java/com/carl/mall/member/MallMemberApplication.java new file mode 100644 index 0000000..b25bbee --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/MallMemberApplication.java @@ -0,0 +1,18 @@ +package com.carl.mall.member; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +// 指定Mapper接口对应的路径 +@MapperScan("com.carl.mall.member.dao") +@EnableDiscoveryClient +public class MallMemberApplication { + + public static void main(String[] args) { + SpringApplication.run(MallMemberApplication.class,args); + } +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/GrowthChangeHistoryController.java b/mall-member/src/main/java/com/carl/mall/member/controller/GrowthChangeHistoryController.java new file mode 100644 index 0000000..53051a5 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/GrowthChangeHistoryController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.GrowthChangeHistoryEntity; +import com.carl.mall.member.service.GrowthChangeHistoryService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 成长值变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/growthchangehistory") +public class GrowthChangeHistoryController { + @Autowired + private GrowthChangeHistoryService growthChangeHistoryService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:growthchangehistory:list") + public R list(@RequestParam Map params){ + PageUtils page = growthChangeHistoryService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:growthchangehistory:info") + public R info(@PathVariable("id") Long id){ + GrowthChangeHistoryEntity growthChangeHistory = growthChangeHistoryService.getById(id); + + return R.ok().put("growthChangeHistory", growthChangeHistory); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:growthchangehistory:save") + public R save(@RequestBody GrowthChangeHistoryEntity growthChangeHistory){ + growthChangeHistoryService.save(growthChangeHistory); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:growthchangehistory:update") + public R update(@RequestBody GrowthChangeHistoryEntity growthChangeHistory){ + growthChangeHistoryService.updateById(growthChangeHistory); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:growthchangehistory:delete") + public R delete(@RequestBody Long[] ids){ + growthChangeHistoryService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/IntegrationChangeHistoryController.java b/mall-member/src/main/java/com/carl/mall/member/controller/IntegrationChangeHistoryController.java new file mode 100644 index 0000000..9009706 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/IntegrationChangeHistoryController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.IntegrationChangeHistoryEntity; +import com.carl.mall.member.service.IntegrationChangeHistoryService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 积分变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/integrationchangehistory") +public class IntegrationChangeHistoryController { + @Autowired + private IntegrationChangeHistoryService integrationChangeHistoryService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:integrationchangehistory:list") + public R list(@RequestParam Map params){ + PageUtils page = integrationChangeHistoryService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:integrationchangehistory:info") + public R info(@PathVariable("id") Long id){ + IntegrationChangeHistoryEntity integrationChangeHistory = integrationChangeHistoryService.getById(id); + + return R.ok().put("integrationChangeHistory", integrationChangeHistory); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:integrationchangehistory:save") + public R save(@RequestBody IntegrationChangeHistoryEntity integrationChangeHistory){ + integrationChangeHistoryService.save(integrationChangeHistory); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:integrationchangehistory:update") + public R update(@RequestBody IntegrationChangeHistoryEntity integrationChangeHistory){ + integrationChangeHistoryService.updateById(integrationChangeHistory); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:integrationchangehistory:delete") + public R delete(@RequestBody Long[] ids){ + integrationChangeHistoryService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSpuController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSpuController.java new file mode 100644 index 0000000..199ce10 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSpuController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberCollectSpuEntity; +import com.carl.mall.member.service.MemberCollectSpuService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员收藏的商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/membercollectspu") +public class MemberCollectSpuController { + @Autowired + private MemberCollectSpuService memberCollectSpuService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:membercollectspu:list") + public R list(@RequestParam Map params){ + PageUtils page = memberCollectSpuService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:membercollectspu:info") + public R info(@PathVariable("id") Long id){ + MemberCollectSpuEntity memberCollectSpu = memberCollectSpuService.getById(id); + + return R.ok().put("memberCollectSpu", memberCollectSpu); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:membercollectspu:save") + public R save(@RequestBody MemberCollectSpuEntity memberCollectSpu){ + memberCollectSpuService.save(memberCollectSpu); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:membercollectspu:update") + public R update(@RequestBody MemberCollectSpuEntity memberCollectSpu){ + memberCollectSpuService.updateById(memberCollectSpu); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:membercollectspu:delete") + public R delete(@RequestBody Long[] ids){ + memberCollectSpuService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSubjectController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSubjectController.java new file mode 100644 index 0000000..013186c --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberCollectSubjectController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberCollectSubjectEntity; +import com.carl.mall.member.service.MemberCollectSubjectService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员收藏的专题活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/membercollectsubject") +public class MemberCollectSubjectController { + @Autowired + private MemberCollectSubjectService memberCollectSubjectService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:membercollectsubject:list") + public R list(@RequestParam Map params){ + PageUtils page = memberCollectSubjectService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:membercollectsubject:info") + public R info(@PathVariable("id") Long id){ + MemberCollectSubjectEntity memberCollectSubject = memberCollectSubjectService.getById(id); + + return R.ok().put("memberCollectSubject", memberCollectSubject); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:membercollectsubject:save") + public R save(@RequestBody MemberCollectSubjectEntity memberCollectSubject){ + memberCollectSubjectService.save(memberCollectSubject); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:membercollectsubject:update") + public R update(@RequestBody MemberCollectSubjectEntity memberCollectSubject){ + memberCollectSubjectService.updateById(memberCollectSubject); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:membercollectsubject:delete") + public R delete(@RequestBody Long[] ids){ + memberCollectSubjectService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberController.java new file mode 100644 index 0000000..cf786f5 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberEntity; +import com.carl.mall.member.service.MemberService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/member") +public class MemberController { + @Autowired + private MemberService memberService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:member:list") + public R list(@RequestParam Map params){ + PageUtils page = memberService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:member:info") + public R info(@PathVariable("id") Long id){ + MemberEntity member = memberService.getById(id); + + return R.ok().put("member", member); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:member:save") + public R save(@RequestBody MemberEntity member){ + memberService.save(member); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:member:update") + public R update(@RequestBody MemberEntity member){ + memberService.updateById(member); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:member:delete") + public R delete(@RequestBody Long[] ids){ + memberService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberLevelController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberLevelController.java new file mode 100644 index 0000000..fd5e4ed --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberLevelController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberLevelEntity; +import com.carl.mall.member.service.MemberLevelService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员等级 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/memberlevel") +public class MemberLevelController { + @Autowired + private MemberLevelService memberLevelService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:memberlevel:list") + public R list(@RequestParam Map params){ + PageUtils page = memberLevelService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:memberlevel:info") + public R info(@PathVariable("id") Long id){ + MemberLevelEntity memberLevel = memberLevelService.getById(id); + + return R.ok().put("memberLevel", memberLevel); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:memberlevel:save") + public R save(@RequestBody MemberLevelEntity memberLevel){ + memberLevelService.save(memberLevel); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:memberlevel:update") + public R update(@RequestBody MemberLevelEntity memberLevel){ + memberLevelService.updateById(memberLevel); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:memberlevel:delete") + public R delete(@RequestBody Long[] ids){ + memberLevelService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberLoginLogController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberLoginLogController.java new file mode 100644 index 0000000..ef9435e --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberLoginLogController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberLoginLogEntity; +import com.carl.mall.member.service.MemberLoginLogService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员登录记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/memberloginlog") +public class MemberLoginLogController { + @Autowired + private MemberLoginLogService memberLoginLogService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:memberloginlog:list") + public R list(@RequestParam Map params){ + PageUtils page = memberLoginLogService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:memberloginlog:info") + public R info(@PathVariable("id") Long id){ + MemberLoginLogEntity memberLoginLog = memberLoginLogService.getById(id); + + return R.ok().put("memberLoginLog", memberLoginLog); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:memberloginlog:save") + public R save(@RequestBody MemberLoginLogEntity memberLoginLog){ + memberLoginLogService.save(memberLoginLog); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:memberloginlog:update") + public R update(@RequestBody MemberLoginLogEntity memberLoginLog){ + memberLoginLogService.updateById(memberLoginLog); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:memberloginlog:delete") + public R delete(@RequestBody Long[] ids){ + memberLoginLogService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberReceiveAddressController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberReceiveAddressController.java new file mode 100644 index 0000000..76c548e --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberReceiveAddressController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberReceiveAddressEntity; +import com.carl.mall.member.service.MemberReceiveAddressService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员收货地址 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/memberreceiveaddress") +public class MemberReceiveAddressController { + @Autowired + private MemberReceiveAddressService memberReceiveAddressService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:memberreceiveaddress:list") + public R list(@RequestParam Map params){ + PageUtils page = memberReceiveAddressService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:memberreceiveaddress:info") + public R info(@PathVariable("id") Long id){ + MemberReceiveAddressEntity memberReceiveAddress = memberReceiveAddressService.getById(id); + + return R.ok().put("memberReceiveAddress", memberReceiveAddress); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:memberreceiveaddress:save") + public R save(@RequestBody MemberReceiveAddressEntity memberReceiveAddress){ + memberReceiveAddressService.save(memberReceiveAddress); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:memberreceiveaddress:update") + public R update(@RequestBody MemberReceiveAddressEntity memberReceiveAddress){ + memberReceiveAddressService.updateById(memberReceiveAddress); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:memberreceiveaddress:delete") + public R delete(@RequestBody Long[] ids){ + memberReceiveAddressService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/controller/MemberStatisticsInfoController.java b/mall-member/src/main/java/com/carl/mall/member/controller/MemberStatisticsInfoController.java new file mode 100644 index 0000000..1394680 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/controller/MemberStatisticsInfoController.java @@ -0,0 +1,90 @@ +package com.carl.mall.member.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.member.entity.MemberStatisticsInfoEntity; +import com.carl.mall.member.service.MemberStatisticsInfoService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 会员统计信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@RestController +@RequestMapping("member/memberstatisticsinfo") +public class MemberStatisticsInfoController { + @Autowired + private MemberStatisticsInfoService memberStatisticsInfoService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("member:memberstatisticsinfo:list") + public R list(@RequestParam Map params){ + PageUtils page = memberStatisticsInfoService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("member:memberstatisticsinfo:info") + public R info(@PathVariable("id") Long id){ + MemberStatisticsInfoEntity memberStatisticsInfo = memberStatisticsInfoService.getById(id); + + return R.ok().put("memberStatisticsInfo", memberStatisticsInfo); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("member:memberstatisticsinfo:save") + public R save(@RequestBody MemberStatisticsInfoEntity memberStatisticsInfo){ + memberStatisticsInfoService.save(memberStatisticsInfo); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("member:memberstatisticsinfo:update") + public R update(@RequestBody MemberStatisticsInfoEntity memberStatisticsInfo){ + memberStatisticsInfoService.updateById(memberStatisticsInfo); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("member:memberstatisticsinfo:delete") + public R delete(@RequestBody Long[] ids){ + memberStatisticsInfoService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/GrowthChangeHistoryDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/GrowthChangeHistoryDao.java new file mode 100644 index 0000000..a8cbe2c --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/GrowthChangeHistoryDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.GrowthChangeHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 成长值变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface GrowthChangeHistoryDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/IntegrationChangeHistoryDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/IntegrationChangeHistoryDao.java new file mode 100644 index 0000000..d2f39a3 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/IntegrationChangeHistoryDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.IntegrationChangeHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface IntegrationChangeHistoryDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSpuDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSpuDao.java new file mode 100644 index 0000000..3c3be31 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSpuDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberCollectSpuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收藏的商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberCollectSpuDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSubjectDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSubjectDao.java new file mode 100644 index 0000000..fe1c911 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberCollectSubjectDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberCollectSubjectEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收藏的专题活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberCollectSubjectDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberDao.java new file mode 100644 index 0000000..129a062 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberLevelDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberLevelDao.java new file mode 100644 index 0000000..d1ff7bc --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberLevelDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberLevelEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员等级 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberLevelDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberLoginLogDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberLoginLogDao.java new file mode 100644 index 0000000..ed902a5 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberLoginLogDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberLoginLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员登录记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberLoginLogDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberReceiveAddressDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberReceiveAddressDao.java new file mode 100644 index 0000000..5a92c42 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberReceiveAddressDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberReceiveAddressEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收货地址 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberReceiveAddressDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/dao/MemberStatisticsInfoDao.java b/mall-member/src/main/java/com/carl/mall/member/dao/MemberStatisticsInfoDao.java new file mode 100644 index 0000000..fb676e9 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/dao/MemberStatisticsInfoDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.member.dao; + +import com.carl.mall.member.entity.MemberStatisticsInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员统计信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Mapper +public interface MemberStatisticsInfoDao extends BaseMapper { + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/GrowthChangeHistoryEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/GrowthChangeHistoryEntity.java new file mode 100644 index 0000000..ae942a6 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/GrowthChangeHistoryEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 成长值变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_growth_change_history") +public class GrowthChangeHistoryEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * create_time + */ + private Date createTime; + /** + * 改变的值(正负计数) + */ + private Integer changeCount; + /** + * 备注 + */ + private String note; + /** + * 积分来源[0-购物,1-管理员修改] + */ + private Integer sourceType; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/IntegrationChangeHistoryEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/IntegrationChangeHistoryEntity.java new file mode 100644 index 0000000..38f4fa7 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/IntegrationChangeHistoryEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 积分变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_integration_change_history") +public class IntegrationChangeHistoryEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * create_time + */ + private Date createTime; + /** + * 变化的值 + */ + private Integer changeCount; + /** + * 备注 + */ + private String note; + /** + * 来源[0->购物;1->管理员修改;2->活动] + */ + private Integer sourceTyoe; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSpuEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSpuEntity.java new file mode 100644 index 0000000..043e5c0 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSpuEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员收藏的商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_collect_spu") +public class MemberCollectSpuEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 会员id + */ + private Long memberId; + /** + * spu_id + */ + private Long spuId; + /** + * spu_name + */ + private String spuName; + /** + * spu_img + */ + private String spuImg; + /** + * create_time + */ + private Date createTime; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSubjectEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSubjectEntity.java new file mode 100644 index 0000000..c55eb4b --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberCollectSubjectEntity.java @@ -0,0 +1,44 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员收藏的专题活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_collect_subject") +public class MemberCollectSubjectEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * subject_id + */ + private Long subjectId; + /** + * subject_name + */ + private String subjectName; + /** + * subject_img + */ + private String subjectImg; + /** + * 活动url + */ + private String subjectUrll; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberEntity.java new file mode 100644 index 0000000..82aa687 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberEntity.java @@ -0,0 +1,96 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member") +public class MemberEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 会员等级id + */ + private Long levelId; + /** + * 用户名 + */ + private String username; + /** + * 密码 + */ + private String password; + /** + * 昵称 + */ + private String nickname; + /** + * 手机号码 + */ + private String mobile; + /** + * 邮箱 + */ + private String email; + /** + * 头像 + */ + private String header; + /** + * 性别 + */ + private Integer gender; + /** + * 生日 + */ + private Date birth; + /** + * 所在城市 + */ + private String city; + /** + * 职业 + */ + private String job; + /** + * 个性签名 + */ + private String sign; + /** + * 用户来源 + */ + private Integer sourceType; + /** + * 积分 + */ + private Integer integration; + /** + * 成长值 + */ + private Integer growth; + /** + * 启用状态 + */ + private Integer status; + /** + * 注册时间 + */ + private Date createTime; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberLevelEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberLevelEntity.java new file mode 100644 index 0000000..72915e3 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberLevelEntity.java @@ -0,0 +1,65 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员等级 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_level") +public class MemberLevelEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 等级名称 + */ + private String name; + /** + * 等级需要的成长值 + */ + private Integer growthPoint; + /** + * 是否为默认等级[0->不是;1->是] + */ + private Integer defaultStatus; + /** + * 免运费标准 + */ + private BigDecimal freeFreightPoint; + /** + * 每次评价获取的成长值 + */ + private Integer commentGrowthPoint; + /** + * 是否有免邮特权 + */ + private Integer priviledgeFreeFreight; + /** + * 是否有会员价格特权 + */ + private Integer priviledgeMemberPrice; + /** + * 是否有生日特权 + */ + private Integer priviledgeBirthday; + /** + * 备注 + */ + private String note; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberLoginLogEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberLoginLogEntity.java new file mode 100644 index 0000000..9453e19 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberLoginLogEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员登录记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_login_log") +public class MemberLoginLogEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * 创建时间 + */ + private Date createTime; + /** + * ip + */ + private String ip; + /** + * city + */ + private String city; + /** + * 登录类型[1-web,2-app] + */ + private Integer loginType; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberReceiveAddressEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberReceiveAddressEntity.java new file mode 100644 index 0000000..16c6f2b --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberReceiveAddressEntity.java @@ -0,0 +1,68 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员收货地址 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_receive_address") +public class MemberReceiveAddressEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * 收货人姓名 + */ + private String name; + /** + * 电话 + */ + private String phone; + /** + * 邮政编码 + */ + private String postCode; + /** + * 省份/直辖市 + */ + private String province; + /** + * 城市 + */ + private String city; + /** + * 区 + */ + private String region; + /** + * 详细地址(街道) + */ + private String detailAddress; + /** + * 省市区代码 + */ + private String areacode; + /** + * 是否默认 + */ + private Integer defaultStatus; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/entity/MemberStatisticsInfoEntity.java b/mall-member/src/main/java/com/carl/mall/member/entity/MemberStatisticsInfoEntity.java new file mode 100644 index 0000000..d8855df --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/entity/MemberStatisticsInfoEntity.java @@ -0,0 +1,85 @@ +package com.carl.mall.member.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 会员统计信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +@Data +@TableName("ums_member_statistics_info") +public class MemberStatisticsInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 会员id + */ + private Long memberId; + /** + * 累计消费金额 + */ + private BigDecimal consumeAmount; + /** + * 累计优惠金额 + */ + private BigDecimal couponAmount; + /** + * 订单数量 + */ + private Integer orderCount; + /** + * 优惠券数量 + */ + private Integer couponCount; + /** + * 评价数 + */ + private Integer commentCount; + /** + * 退货数量 + */ + private Integer returnOrderCount; + /** + * 登录次数 + */ + private Integer loginCount; + /** + * 关注数量 + */ + private Integer attendCount; + /** + * 粉丝数量 + */ + private Integer fansCount; + /** + * 收藏的商品数量 + */ + private Integer collectProductCount; + /** + * 收藏的专题活动数量 + */ + private Integer collectSubjectCount; + /** + * 收藏的评论数量 + */ + private Integer collectCommentCount; + /** + * 邀请的朋友数量 + */ + private Integer inviteFriendCount; + +} diff --git a/mall-member/src/main/java/com/carl/mall/member/service/GrowthChangeHistoryService.java b/mall-member/src/main/java/com/carl/mall/member/service/GrowthChangeHistoryService.java new file mode 100644 index 0000000..0229bf4 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/GrowthChangeHistoryService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.GrowthChangeHistoryEntity; + +import java.util.Map; + +/** + * 成长值变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface GrowthChangeHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/IntegrationChangeHistoryService.java b/mall-member/src/main/java/com/carl/mall/member/service/IntegrationChangeHistoryService.java new file mode 100644 index 0000000..9da7ad4 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/IntegrationChangeHistoryService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.IntegrationChangeHistoryEntity; + +import java.util.Map; + +/** + * 积分变化历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface IntegrationChangeHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSpuService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSpuService.java new file mode 100644 index 0000000..bb64a4c --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSpuService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberCollectSpuEntity; + +import java.util.Map; + +/** + * 会员收藏的商品 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberCollectSpuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSubjectService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSubjectService.java new file mode 100644 index 0000000..c826926 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberCollectSubjectService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberCollectSubjectEntity; + +import java.util.Map; + +/** + * 会员收藏的专题活动 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberCollectSubjectService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberLevelService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberLevelService.java new file mode 100644 index 0000000..00712b3 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberLevelService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberLevelEntity; + +import java.util.Map; + +/** + * 会员等级 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberLevelService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberLoginLogService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberLoginLogService.java new file mode 100644 index 0000000..5c30ed7 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberLoginLogService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberLoginLogEntity; + +import java.util.Map; + +/** + * 会员登录记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberLoginLogService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberReceiveAddressService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberReceiveAddressService.java new file mode 100644 index 0000000..a877c15 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberReceiveAddressService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberReceiveAddressEntity; + +import java.util.Map; + +/** + * 会员收货地址 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberReceiveAddressService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberService.java new file mode 100644 index 0000000..f4498e9 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberEntity; + +import java.util.Map; + +/** + * 会员 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/MemberStatisticsInfoService.java b/mall-member/src/main/java/com/carl/mall/member/service/MemberStatisticsInfoService.java new file mode 100644 index 0000000..0386fe5 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/MemberStatisticsInfoService.java @@ -0,0 +1,20 @@ +package com.carl.mall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.member.entity.MemberStatisticsInfoEntity; + +import java.util.Map; + +/** + * 会员统计信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:29:01 + */ +public interface MemberStatisticsInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/GrowthChangeHistoryServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/GrowthChangeHistoryServiceImpl.java new file mode 100644 index 0000000..ae8ebfa --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/GrowthChangeHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.GrowthChangeHistoryDao; +import com.carl.mall.member.entity.GrowthChangeHistoryEntity; +import com.carl.mall.member.service.GrowthChangeHistoryService; + + +@Service("growthChangeHistoryService") +public class GrowthChangeHistoryServiceImpl extends ServiceImpl implements GrowthChangeHistoryService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/IntegrationChangeHistoryServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/IntegrationChangeHistoryServiceImpl.java new file mode 100644 index 0000000..1ea810b --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/IntegrationChangeHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.IntegrationChangeHistoryDao; +import com.carl.mall.member.entity.IntegrationChangeHistoryEntity; +import com.carl.mall.member.service.IntegrationChangeHistoryService; + + +@Service("integrationChangeHistoryService") +public class IntegrationChangeHistoryServiceImpl extends ServiceImpl implements IntegrationChangeHistoryService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSpuServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSpuServiceImpl.java new file mode 100644 index 0000000..e0a56b9 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSpuServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberCollectSpuDao; +import com.carl.mall.member.entity.MemberCollectSpuEntity; +import com.carl.mall.member.service.MemberCollectSpuService; + + +@Service("memberCollectSpuService") +public class MemberCollectSpuServiceImpl extends ServiceImpl implements MemberCollectSpuService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSubjectServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSubjectServiceImpl.java new file mode 100644 index 0000000..5ff16b6 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberCollectSubjectServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberCollectSubjectDao; +import com.carl.mall.member.entity.MemberCollectSubjectEntity; +import com.carl.mall.member.service.MemberCollectSubjectService; + + +@Service("memberCollectSubjectService") +public class MemberCollectSubjectServiceImpl extends ServiceImpl implements MemberCollectSubjectService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLevelServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLevelServiceImpl.java new file mode 100644 index 0000000..c6dfcf9 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLevelServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberLevelDao; +import com.carl.mall.member.entity.MemberLevelEntity; +import com.carl.mall.member.service.MemberLevelService; + + +@Service("memberLevelService") +public class MemberLevelServiceImpl extends ServiceImpl implements MemberLevelService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLoginLogServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLoginLogServiceImpl.java new file mode 100644 index 0000000..71d3ee9 --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberLoginLogServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberLoginLogDao; +import com.carl.mall.member.entity.MemberLoginLogEntity; +import com.carl.mall.member.service.MemberLoginLogService; + + +@Service("memberLoginLogService") +public class MemberLoginLogServiceImpl extends ServiceImpl implements MemberLoginLogService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberReceiveAddressServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberReceiveAddressServiceImpl.java new file mode 100644 index 0000000..aed692d --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberReceiveAddressServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberReceiveAddressDao; +import com.carl.mall.member.entity.MemberReceiveAddressEntity; +import com.carl.mall.member.service.MemberReceiveAddressService; + + +@Service("memberReceiveAddressService") +public class MemberReceiveAddressServiceImpl extends ServiceImpl implements MemberReceiveAddressService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberServiceImpl.java new file mode 100644 index 0000000..24a8b7f --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberDao; +import com.carl.mall.member.entity.MemberEntity; +import com.carl.mall.member.service.MemberService; + + +@Service("memberService") +public class MemberServiceImpl extends ServiceImpl implements MemberService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberStatisticsInfoServiceImpl.java b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberStatisticsInfoServiceImpl.java new file mode 100644 index 0000000..d5674ed --- /dev/null +++ b/mall-member/src/main/java/com/carl/mall/member/service/impl/MemberStatisticsInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.member.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.member.dao.MemberStatisticsInfoDao; +import com.carl.mall.member.entity.MemberStatisticsInfoEntity; +import com.carl.mall.member.service.MemberStatisticsInfoService; + + +@Service("memberStatisticsInfoService") +public class MemberStatisticsInfoServiceImpl extends ServiceImpl implements MemberStatisticsInfoService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-member/src/main/resources/application.yml b/mall-member/src/main/resources/application.yml new file mode 100644 index 0000000..3fec578 --- /dev/null +++ b/mall-member/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 9002 +# 数据库的连接新 +spring: + datasource: + username: root + password: 123456 + url: jdbc:mysql://192.168.73.130:12345/mall-ums + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 192.168.73.130:8848 + application: + name: mall-member + + +#mybatis-plus 配置 +mybatis-plus: + mapper-locations: classpath*:/mapper/**/*.xml + global-config: + db-config: + id-type: auto # 主键自增 \ No newline at end of file diff --git a/mall-member/src/main/resources/bootstrap.properties b/mall-member/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..61352dc --- /dev/null +++ b/mall-member/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +#nacos config +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 +spring.application.name= mall-member \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml b/mall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml new file mode 100644 index 0000000..c0f6ad1 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml b/mall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml new file mode 100644 index 0000000..6de22d4 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml b/mall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml new file mode 100644 index 0000000..a8d78be --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml b/mall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml new file mode 100644 index 0000000..2c97f89 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberDao.xml b/mall-member/src/main/resources/mapper/member/MemberDao.xml new file mode 100644 index 0000000..d70591f --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberDao.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberLevelDao.xml b/mall-member/src/main/resources/mapper/member/MemberLevelDao.xml new file mode 100644 index 0000000..e915eaf --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberLevelDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml b/mall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml new file mode 100644 index 0000000..36d5265 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml b/mall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml new file mode 100644 index 0000000..eae8b84 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml b/mall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml new file mode 100644 index 0000000..7350899 --- /dev/null +++ b/mall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/pom.xml b/mall-order/pom.xml index 772c105..3d20c58 100644 --- a/mall-order/pom.xml +++ b/mall-order/pom.xml @@ -3,9 +3,64 @@ 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + com.carl.mall mall-order 1.0-SNAPSHOT + + 1.8 + 2020.0.1 + + + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/mall-order/src/main/java/com/carl/mall/order/MallOrderApplication.java b/mall-order/src/main/java/com/carl/mall/order/MallOrderApplication.java new file mode 100644 index 0000000..0022733 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/MallOrderApplication.java @@ -0,0 +1,20 @@ +package com.carl.mall.order; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@SpringBootApplication +// 指定Mapper接口对应的路径 +@MapperScan("com.carl.mall.order.dao") +@EnableDiscoveryClient +@EnableFeignClients("com.carl.mall.order.feign") //feign远程调用 +public class MallOrderApplication { + + public static void main(String[] args) { + SpringApplication.run(MallOrderApplication.class,args); + } +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderController.java new file mode 100644 index 0000000..0b62a8f --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderController.java @@ -0,0 +1,101 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import com.carl.mall.order.feign.ProductService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.web.bind.annotation.*; + +import com.carl.mall.order.entity.OrderEntity; +import com.carl.mall.order.service.OrderService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 订单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/order") +@RefreshScope +public class OrderController { + @Autowired + private OrderService orderService; + + @Autowired + private ProductService productService; + + /** + * 测试调用product中的查询brand服务 + */ + @GetMapping("/products") + public R queryProduct(){ + //openfeign 远程调用服务 + return R.ok().put("products",productService.queryAllBrand()); + } + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:order:list") + public R list(@RequestParam Map params){ + PageUtils page = orderService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:order:info") + public R info(@PathVariable("id") Long id){ + OrderEntity order = orderService.getById(id); + + return R.ok().put("order", order); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:order:save") + public R save(@RequestBody OrderEntity order){ + orderService.save(order); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:order:update") + public R update(@RequestBody OrderEntity order){ + orderService.updateById(order); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:order:delete") + public R delete(@RequestBody Long[] ids){ + orderService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderItemController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderItemController.java new file mode 100644 index 0000000..fa370d3 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderItemController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.OrderItemEntity; +import com.carl.mall.order.service.OrderItemService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 订单项信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/orderitem") +public class OrderItemController { + @Autowired + private OrderItemService orderItemService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:orderitem:list") + public R list(@RequestParam Map params){ + PageUtils page = orderItemService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:orderitem:info") + public R info(@PathVariable("id") Long id){ + OrderItemEntity orderItem = orderItemService.getById(id); + + return R.ok().put("orderItem", orderItem); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:orderitem:save") + public R save(@RequestBody OrderItemEntity orderItem){ + orderItemService.save(orderItem); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:orderitem:update") + public R update(@RequestBody OrderItemEntity orderItem){ + orderItemService.updateById(orderItem); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:orderitem:delete") + public R delete(@RequestBody Long[] ids){ + orderItemService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderOperateHistoryController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderOperateHistoryController.java new file mode 100644 index 0000000..8413635 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderOperateHistoryController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.OrderOperateHistoryEntity; +import com.carl.mall.order.service.OrderOperateHistoryService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 订单操作历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/orderoperatehistory") +public class OrderOperateHistoryController { + @Autowired + private OrderOperateHistoryService orderOperateHistoryService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:orderoperatehistory:list") + public R list(@RequestParam Map params){ + PageUtils page = orderOperateHistoryService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:orderoperatehistory:info") + public R info(@PathVariable("id") Long id){ + OrderOperateHistoryEntity orderOperateHistory = orderOperateHistoryService.getById(id); + + return R.ok().put("orderOperateHistory", orderOperateHistory); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:orderoperatehistory:save") + public R save(@RequestBody OrderOperateHistoryEntity orderOperateHistory){ + orderOperateHistoryService.save(orderOperateHistory); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:orderoperatehistory:update") + public R update(@RequestBody OrderOperateHistoryEntity orderOperateHistory){ + orderOperateHistoryService.updateById(orderOperateHistory); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:orderoperatehistory:delete") + public R delete(@RequestBody Long[] ids){ + orderOperateHistoryService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnApplyController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnApplyController.java new file mode 100644 index 0000000..711e52e --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnApplyController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.OrderReturnApplyEntity; +import com.carl.mall.order.service.OrderReturnApplyService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 订单退货申请 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/orderreturnapply") +public class OrderReturnApplyController { + @Autowired + private OrderReturnApplyService orderReturnApplyService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:orderreturnapply:list") + public R list(@RequestParam Map params){ + PageUtils page = orderReturnApplyService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:orderreturnapply:info") + public R info(@PathVariable("id") Long id){ + OrderReturnApplyEntity orderReturnApply = orderReturnApplyService.getById(id); + + return R.ok().put("orderReturnApply", orderReturnApply); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:orderreturnapply:save") + public R save(@RequestBody OrderReturnApplyEntity orderReturnApply){ + orderReturnApplyService.save(orderReturnApply); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:orderreturnapply:update") + public R update(@RequestBody OrderReturnApplyEntity orderReturnApply){ + orderReturnApplyService.updateById(orderReturnApply); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:orderreturnapply:delete") + public R delete(@RequestBody Long[] ids){ + orderReturnApplyService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnReasonController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnReasonController.java new file mode 100644 index 0000000..74bfbd3 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderReturnReasonController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.OrderReturnReasonEntity; +import com.carl.mall.order.service.OrderReturnReasonService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 退货原因 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/orderreturnreason") +public class OrderReturnReasonController { + @Autowired + private OrderReturnReasonService orderReturnReasonService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:orderreturnreason:list") + public R list(@RequestParam Map params){ + PageUtils page = orderReturnReasonService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:orderreturnreason:info") + public R info(@PathVariable("id") Long id){ + OrderReturnReasonEntity orderReturnReason = orderReturnReasonService.getById(id); + + return R.ok().put("orderReturnReason", orderReturnReason); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:orderreturnreason:save") + public R save(@RequestBody OrderReturnReasonEntity orderReturnReason){ + orderReturnReasonService.save(orderReturnReason); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:orderreturnreason:update") + public R update(@RequestBody OrderReturnReasonEntity orderReturnReason){ + orderReturnReasonService.updateById(orderReturnReason); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:orderreturnreason:delete") + public R delete(@RequestBody Long[] ids){ + orderReturnReasonService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/OrderSettingController.java b/mall-order/src/main/java/com/carl/mall/order/controller/OrderSettingController.java new file mode 100644 index 0000000..52ea044 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/OrderSettingController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.OrderSettingEntity; +import com.carl.mall.order.service.OrderSettingService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 订单配置信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/ordersetting") +public class OrderSettingController { + @Autowired + private OrderSettingService orderSettingService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:ordersetting:list") + public R list(@RequestParam Map params){ + PageUtils page = orderSettingService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:ordersetting:info") + public R info(@PathVariable("id") Long id){ + OrderSettingEntity orderSetting = orderSettingService.getById(id); + + return R.ok().put("orderSetting", orderSetting); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:ordersetting:save") + public R save(@RequestBody OrderSettingEntity orderSetting){ + orderSettingService.save(orderSetting); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:ordersetting:update") + public R update(@RequestBody OrderSettingEntity orderSetting){ + orderSettingService.updateById(orderSetting); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:ordersetting:delete") + public R delete(@RequestBody Long[] ids){ + orderSettingService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/PaymentInfoController.java b/mall-order/src/main/java/com/carl/mall/order/controller/PaymentInfoController.java new file mode 100644 index 0000000..755f714 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/PaymentInfoController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.PaymentInfoEntity; +import com.carl.mall.order.service.PaymentInfoService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 支付信息表 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/paymentinfo") +public class PaymentInfoController { + @Autowired + private PaymentInfoService paymentInfoService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:paymentinfo:list") + public R list(@RequestParam Map params){ + PageUtils page = paymentInfoService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:paymentinfo:info") + public R info(@PathVariable("id") Long id){ + PaymentInfoEntity paymentInfo = paymentInfoService.getById(id); + + return R.ok().put("paymentInfo", paymentInfo); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:paymentinfo:save") + public R save(@RequestBody PaymentInfoEntity paymentInfo){ + paymentInfoService.save(paymentInfo); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:paymentinfo:update") + public R update(@RequestBody PaymentInfoEntity paymentInfo){ + paymentInfoService.updateById(paymentInfo); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:paymentinfo:delete") + public R delete(@RequestBody Long[] ids){ + paymentInfoService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/controller/RefundInfoController.java b/mall-order/src/main/java/com/carl/mall/order/controller/RefundInfoController.java new file mode 100644 index 0000000..5b8b48d --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/controller/RefundInfoController.java @@ -0,0 +1,90 @@ +package com.carl.mall.order.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.order.entity.RefundInfoEntity; +import com.carl.mall.order.service.RefundInfoService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 退款信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@RestController +@RequestMapping("order/refundinfo") +public class RefundInfoController { + @Autowired + private RefundInfoService refundInfoService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("order:refundinfo:list") + public R list(@RequestParam Map params){ + PageUtils page = refundInfoService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("order:refundinfo:info") + public R info(@PathVariable("id") Long id){ + RefundInfoEntity refundInfo = refundInfoService.getById(id); + + return R.ok().put("refundInfo", refundInfo); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("order:refundinfo:save") + public R save(@RequestBody RefundInfoEntity refundInfo){ + refundInfoService.save(refundInfo); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("order:refundinfo:update") + public R update(@RequestBody RefundInfoEntity refundInfo){ + refundInfoService.updateById(refundInfo); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("order:refundinfo:delete") + public R delete(@RequestBody Long[] ids){ + refundInfoService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderDao.java new file mode 100644 index 0000000..79a36a8 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderItemDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderItemDao.java new file mode 100644 index 0000000..fc45b1a --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderItemDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderItemEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单项信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderItemDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderOperateHistoryDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderOperateHistoryDao.java new file mode 100644 index 0000000..1a33a05 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderOperateHistoryDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderOperateHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单操作历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderOperateHistoryDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnApplyDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnApplyDao.java new file mode 100644 index 0000000..573b111 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnApplyDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderReturnApplyEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单退货申请 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderReturnApplyDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnReasonDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnReasonDao.java new file mode 100644 index 0000000..e35403b --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderReturnReasonDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderReturnReasonEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 退货原因 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderReturnReasonDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/OrderSettingDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/OrderSettingDao.java new file mode 100644 index 0000000..f16aefc --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/OrderSettingDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.OrderSettingEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单配置信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface OrderSettingDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/PaymentInfoDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/PaymentInfoDao.java new file mode 100644 index 0000000..89aeac1 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/PaymentInfoDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.PaymentInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 支付信息表 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface PaymentInfoDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/dao/RefundInfoDao.java b/mall-order/src/main/java/com/carl/mall/order/dao/RefundInfoDao.java new file mode 100644 index 0000000..a86777b --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/dao/RefundInfoDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.order.dao; + +import com.carl.mall.order.entity.RefundInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 退款信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Mapper +public interface RefundInfoDao extends BaseMapper { + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderEntity.java new file mode 100644 index 0000000..d6ed8a2 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderEntity.java @@ -0,0 +1,193 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 订单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order") +public class OrderEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * member_id + */ + private Long memberId; + /** + * 订单号 + */ + private String orderSn; + /** + * 使用的优惠券 + */ + private Long couponId; + /** + * create_time + */ + private Date createTime; + /** + * 用户名 + */ + private String memberUsername; + /** + * 订单总额 + */ + private BigDecimal totalAmount; + /** + * 应付总额 + */ + private BigDecimal payAmount; + /** + * 运费金额 + */ + private BigDecimal freightAmount; + /** + * 促销优化金额(促销价、满减、阶梯价) + */ + private BigDecimal promotionAmount; + /** + * 积分抵扣金额 + */ + private BigDecimal integrationAmount; + /** + * 优惠券抵扣金额 + */ + private BigDecimal couponAmount; + /** + * 后台调整订单使用的折扣金额 + */ + private BigDecimal discountAmount; + /** + * 支付方式【1->支付宝;2->微信;3->银联; 4->货到付款;】 + */ + private Integer payType; + /** + * 订单来源[0->PC订单;1->app订单] + */ + private Integer sourceType; + /** + * 订单状态【0->待付款;1->待发货;2->已发货;3->已完成;4->已关闭;5->无效订单】 + */ + private Integer status; + /** + * 物流公司(配送方式) + */ + private String deliveryCompany; + /** + * 物流单号 + */ + private String deliverySn; + /** + * 自动确认时间(天) + */ + private Integer autoConfirmDay; + /** + * 可以获得的积分 + */ + private Integer integration; + /** + * 可以获得的成长值 + */ + private Integer growth; + /** + * 发票类型[0->不开发票;1->电子发票;2->纸质发票] + */ + private Integer billType; + /** + * 发票抬头 + */ + private String billHeader; + /** + * 发票内容 + */ + private String billContent; + /** + * 收票人电话 + */ + private String billReceiverPhone; + /** + * 收票人邮箱 + */ + private String billReceiverEmail; + /** + * 收货人姓名 + */ + private String receiverName; + /** + * 收货人电话 + */ + private String receiverPhone; + /** + * 收货人邮编 + */ + private String receiverPostCode; + /** + * 省份/直辖市 + */ + private String receiverProvince; + /** + * 城市 + */ + private String receiverCity; + /** + * 区 + */ + private String receiverRegion; + /** + * 详细地址 + */ + private String receiverDetailAddress; + /** + * 订单备注 + */ + private String note; + /** + * 确认收货状态[0->未确认;1->已确认] + */ + private Integer confirmStatus; + /** + * 删除状态【0->未删除;1->已删除】 + */ + private Integer deleteStatus; + /** + * 下单时使用的积分 + */ + private Integer useIntegration; + /** + * 支付时间 + */ + private Date paymentTime; + /** + * 发货时间 + */ + private Date deliveryTime; + /** + * 确认收货时间 + */ + private Date receiveTime; + /** + * 评价时间 + */ + private Date commentTime; + /** + * 修改时间 + */ + private Date modifyTime; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderItemEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderItemEntity.java new file mode 100644 index 0000000..d39a84d --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderItemEntity.java @@ -0,0 +1,105 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 订单项信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order_item") +public class OrderItemEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * order_id + */ + private Long orderId; + /** + * order_sn + */ + private String orderSn; + /** + * spu_id + */ + private Long spuId; + /** + * spu_name + */ + private String spuName; + /** + * spu_pic + */ + private String spuPic; + /** + * 品牌 + */ + private String spuBrand; + /** + * 商品分类id + */ + private Long categoryId; + /** + * 商品sku编号 + */ + private Long skuId; + /** + * 商品sku名字 + */ + private String skuName; + /** + * 商品sku图片 + */ + private String skuPic; + /** + * 商品sku价格 + */ + private BigDecimal skuPrice; + /** + * 商品购买的数量 + */ + private Integer skuQuantity; + /** + * 商品销售属性组合(JSON) + */ + private String skuAttrsVals; + /** + * 商品促销分解金额 + */ + private BigDecimal promotionAmount; + /** + * 优惠券优惠分解金额 + */ + private BigDecimal couponAmount; + /** + * 积分优惠分解金额 + */ + private BigDecimal integrationAmount; + /** + * 该商品经过优惠后的分解金额 + */ + private BigDecimal realAmount; + /** + * 赠送积分 + */ + private Integer giftIntegration; + /** + * 赠送成长值 + */ + private Integer giftGrowth; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderOperateHistoryEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderOperateHistoryEntity.java new file mode 100644 index 0000000..5ee31ac --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderOperateHistoryEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 订单操作历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order_operate_history") +public class OrderOperateHistoryEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 订单id + */ + private Long orderId; + /** + * 操作人[用户;系统;后台管理员] + */ + private String operateMan; + /** + * 操作时间 + */ + private Date createTime; + /** + * 订单状态【0->待付款;1->待发货;2->已发货;3->已完成;4->已关闭;5->无效订单】 + */ + private Integer orderStatus; + /** + * 备注 + */ + private String note; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnApplyEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnApplyEntity.java new file mode 100644 index 0000000..390bf3f --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnApplyEntity.java @@ -0,0 +1,137 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 订单退货申请 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order_return_apply") +public class OrderReturnApplyEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * order_id + */ + private Long orderId; + /** + * 退货商品id + */ + private Long skuId; + /** + * 订单编号 + */ + private String orderSn; + /** + * 申请时间 + */ + private Date createTime; + /** + * 会员用户名 + */ + private String memberUsername; + /** + * 退款金额 + */ + private BigDecimal returnAmount; + /** + * 退货人姓名 + */ + private String returnName; + /** + * 退货人电话 + */ + private String returnPhone; + /** + * 申请状态[0->待处理;1->退货中;2->已完成;3->已拒绝] + */ + private Integer status; + /** + * 处理时间 + */ + private Date handleTime; + /** + * 商品图片 + */ + private String skuImg; + /** + * 商品名称 + */ + private String skuName; + /** + * 商品品牌 + */ + private String skuBrand; + /** + * 商品销售属性(JSON) + */ + private String skuAttrsVals; + /** + * 退货数量 + */ + private Integer skuCount; + /** + * 商品单价 + */ + private BigDecimal skuPrice; + /** + * 商品实际支付单价 + */ + private BigDecimal skuRealPrice; + /** + * 原因 + */ + private String reason; + /** + * 描述 + */ + private String description述; + /** + * 凭证图片,以逗号隔开 + */ + private String descPics; + /** + * 处理备注 + */ + private String handleNote; + /** + * 处理人员 + */ + private String handleMan; + /** + * 收货人 + */ + private String receiveMan; + /** + * 收货时间 + */ + private Date receiveTime; + /** + * 收货备注 + */ + private String receiveNote; + /** + * 收货电话 + */ + private String receivePhone; + /** + * 公司收货地址 + */ + private String companyAddress; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnReasonEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnReasonEntity.java new file mode 100644 index 0000000..f5a7371 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderReturnReasonEntity.java @@ -0,0 +1,44 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 退货原因 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order_return_reason") +public class OrderReturnReasonEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 退货原因名 + */ + private String name; + /** + * 排序 + */ + private Integer sort; + /** + * 启用状态 + */ + private Integer status; + /** + * create_time + */ + private Date createTime; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/OrderSettingEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/OrderSettingEntity.java new file mode 100644 index 0000000..1753c42 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/OrderSettingEntity.java @@ -0,0 +1,52 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 订单配置信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_order_setting") +public class OrderSettingEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 秒杀订单超时关闭时间(分) + */ + private Integer flashOrderOvertime; + /** + * 正常订单超时时间(分) + */ + private Integer normalOrderOvertime; + /** + * 发货后自动确认收货时间(天) + */ + private Integer confirmOvertime; + /** + * 自动完成交易时间,不能申请退货(天) + */ + private Integer finishOvertime; + /** + * 订单完成后自动好评时间(天) + */ + private Integer commentOvertime; + /** + * 会员等级【0-不限会员等级,全部通用;其他-对应的其他会员等级】 + */ + private Integer memberLevel; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/PaymentInfoEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/PaymentInfoEntity.java new file mode 100644 index 0000000..2f55cde --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/PaymentInfoEntity.java @@ -0,0 +1,69 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 支付信息表 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_payment_info") +public class PaymentInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 订单号(对外业务号) + */ + private String orderSn; + /** + * 订单id + */ + private Long orderId; + /** + * 支付宝交易流水号 + */ + private String alipayTradeNo; + /** + * 支付总金额 + */ + private BigDecimal totalAmount; + /** + * 交易内容 + */ + private String subject; + /** + * 支付状态 + */ + private String paymentStatus; + /** + * 创建时间 + */ + private Date createTime; + /** + * 确认时间 + */ + private Date confirmTime; + /** + * 回调内容 + */ + private String callbackContent; + /** + * 回调时间 + */ + private Date callbackTime; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/entity/RefundInfoEntity.java b/mall-order/src/main/java/com/carl/mall/order/entity/RefundInfoEntity.java new file mode 100644 index 0000000..3136d56 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/entity/RefundInfoEntity.java @@ -0,0 +1,53 @@ +package com.carl.mall.order.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 退款信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +@Data +@TableName("oms_refund_info") +public class RefundInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 退款的订单 + */ + private Long orderReturnId; + /** + * 退款金额 + */ + private BigDecimal refund; + /** + * 退款交易流水号 + */ + private String refundSn; + /** + * 退款状态 + */ + private Integer refundStatus; + /** + * 退款渠道[1-支付宝,2-微信,3-银联,4-汇款] + */ + private Integer refundChannel; + /** + * + */ + private String refundContent; + +} diff --git a/mall-order/src/main/java/com/carl/mall/order/feign/ProductService.java b/mall-order/src/main/java/com/carl/mall/order/feign/ProductService.java new file mode 100644 index 0000000..14e36fd --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/feign/ProductService.java @@ -0,0 +1,13 @@ +package com.carl.mall.order.feign; + + +import com.carl.common.utils.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +@FeignClient(name = "mall-product")//目标服务名 +public interface ProductService { + + @GetMapping("/product/brand/all") + public R queryAllBrand(); +} diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderItemService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderItemService.java new file mode 100644 index 0000000..34ffe9a --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderItemService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderItemEntity; + +import java.util.Map; + +/** + * 订单项信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderItemService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderOperateHistoryService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderOperateHistoryService.java new file mode 100644 index 0000000..a6c10ed --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderOperateHistoryService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderOperateHistoryEntity; + +import java.util.Map; + +/** + * 订单操作历史记录 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderOperateHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnApplyService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnApplyService.java new file mode 100644 index 0000000..baeec19 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnApplyService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderReturnApplyEntity; + +import java.util.Map; + +/** + * 订单退货申请 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderReturnApplyService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnReasonService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnReasonService.java new file mode 100644 index 0000000..f6c618d --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderReturnReasonService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderReturnReasonEntity; + +import java.util.Map; + +/** + * 退货原因 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderReturnReasonService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderService.java new file mode 100644 index 0000000..d7cdc68 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderEntity; + +import java.util.Map; + +/** + * 订单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/OrderSettingService.java b/mall-order/src/main/java/com/carl/mall/order/service/OrderSettingService.java new file mode 100644 index 0000000..c449022 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/OrderSettingService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.OrderSettingEntity; + +import java.util.Map; + +/** + * 订单配置信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface OrderSettingService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/PaymentInfoService.java b/mall-order/src/main/java/com/carl/mall/order/service/PaymentInfoService.java new file mode 100644 index 0000000..ce61cb9 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/PaymentInfoService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.PaymentInfoEntity; + +import java.util.Map; + +/** + * 支付信息表 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface PaymentInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/RefundInfoService.java b/mall-order/src/main/java/com/carl/mall/order/service/RefundInfoService.java new file mode 100644 index 0000000..e2240ca --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/RefundInfoService.java @@ -0,0 +1,20 @@ +package com.carl.mall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.order.entity.RefundInfoEntity; + +import java.util.Map; + +/** + * 退款信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:01:38 + */ +public interface RefundInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderItemServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderItemServiceImpl.java new file mode 100644 index 0000000..a80926e --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderItemServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderItemDao; +import com.carl.mall.order.entity.OrderItemEntity; +import com.carl.mall.order.service.OrderItemService; + + +@Service("orderItemService") +public class OrderItemServiceImpl extends ServiceImpl implements OrderItemService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderOperateHistoryServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderOperateHistoryServiceImpl.java new file mode 100644 index 0000000..a717c68 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderOperateHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderOperateHistoryDao; +import com.carl.mall.order.entity.OrderOperateHistoryEntity; +import com.carl.mall.order.service.OrderOperateHistoryService; + + +@Service("orderOperateHistoryService") +public class OrderOperateHistoryServiceImpl extends ServiceImpl implements OrderOperateHistoryService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnApplyServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnApplyServiceImpl.java new file mode 100644 index 0000000..cc83072 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnApplyServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderReturnApplyDao; +import com.carl.mall.order.entity.OrderReturnApplyEntity; +import com.carl.mall.order.service.OrderReturnApplyService; + + +@Service("orderReturnApplyService") +public class OrderReturnApplyServiceImpl extends ServiceImpl implements OrderReturnApplyService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnReasonServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnReasonServiceImpl.java new file mode 100644 index 0000000..243aee9 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderReturnReasonServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderReturnReasonDao; +import com.carl.mall.order.entity.OrderReturnReasonEntity; +import com.carl.mall.order.service.OrderReturnReasonService; + + +@Service("orderReturnReasonService") +public class OrderReturnReasonServiceImpl extends ServiceImpl implements OrderReturnReasonService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderServiceImpl.java new file mode 100644 index 0000000..50b9345 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderDao; +import com.carl.mall.order.entity.OrderEntity; +import com.carl.mall.order.service.OrderService; + + +@Service("orderService") +public class OrderServiceImpl extends ServiceImpl implements OrderService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderSettingServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderSettingServiceImpl.java new file mode 100644 index 0000000..deb0e18 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/OrderSettingServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.OrderSettingDao; +import com.carl.mall.order.entity.OrderSettingEntity; +import com.carl.mall.order.service.OrderSettingService; + + +@Service("orderSettingService") +public class OrderSettingServiceImpl extends ServiceImpl implements OrderSettingService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/PaymentInfoServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/PaymentInfoServiceImpl.java new file mode 100644 index 0000000..c5ab803 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/PaymentInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.PaymentInfoDao; +import com.carl.mall.order.entity.PaymentInfoEntity; +import com.carl.mall.order.service.PaymentInfoService; + + +@Service("paymentInfoService") +public class PaymentInfoServiceImpl extends ServiceImpl implements PaymentInfoService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/java/com/carl/mall/order/service/impl/RefundInfoServiceImpl.java b/mall-order/src/main/java/com/carl/mall/order/service/impl/RefundInfoServiceImpl.java new file mode 100644 index 0000000..960b803 --- /dev/null +++ b/mall-order/src/main/java/com/carl/mall/order/service/impl/RefundInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.order.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.order.dao.RefundInfoDao; +import com.carl.mall.order.entity.RefundInfoEntity; +import com.carl.mall.order.service.RefundInfoService; + + +@Service("refundInfoService") +public class RefundInfoServiceImpl extends ServiceImpl implements RefundInfoService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-order/src/main/resources/application.yml b/mall-order/src/main/resources/application.yml new file mode 100644 index 0000000..7f775bc --- /dev/null +++ b/mall-order/src/main/resources/application.yml @@ -0,0 +1,23 @@ +#server: +# port: 9003 +## 数据库的连接新 +#spring: +# datasource: +# username: root +# password: 123456 +# url: jdbc:mysql://192.168.73.130:12345/mall-oms +# driver-class-name: com.mysql.cj.jdbc.Driver +# cloud: +# nacos: +# discovery: +# server-addr: 192.168.73.130:8848 +# application: +# name: mall-order +# +# +##mybatis-plus 配置 +#mybatis-plus: +# mapper-locations: classpath*:/mapper/**/*.xml +# global-config: +# db-config: +# id-type: auto # 主键自增 \ No newline at end of file diff --git a/mall-order/src/main/resources/bootstrap.properties b/mall-order/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..a49740c --- /dev/null +++ b/mall-order/src/main/resources/bootstrap.properties @@ -0,0 +1,22 @@ +#nacos config +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 +spring.application.name= mall-order + +#指定使用的命名空间 +spring.cloud.nacos.config.namespace=3aa1aff7-0b93-44da-847b-55b605319686 + +#指定对应的配置组 +spring.cloud.nacos.config.group=prod + +#配置多个配置集 +spring.cloud.nacos.config.ext-config[0].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[0].group=prod +spring.cloud.nacos.config.ext-config[0].refresh=false + +spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[1].group=prod +spring.cloud.nacos.config.ext-config[1].refresh=false + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=prod +spring.cloud.nacos.config.ext-config[2].refresh=false \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderDao.xml b/mall-order/src/main/resources/mapper/order/OrderDao.xml new file mode 100644 index 0000000..f2a62aa --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderItemDao.xml b/mall-order/src/main/resources/mapper/order/OrderItemDao.xml new file mode 100644 index 0000000..ea2303c --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderItemDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml b/mall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml new file mode 100644 index 0000000..2c10674 --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml b/mall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml new file mode 100644 index 0000000..3dd88d1 --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml b/mall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml new file mode 100644 index 0000000..7fd06b0 --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/OrderSettingDao.xml b/mall-order/src/main/resources/mapper/order/OrderSettingDao.xml new file mode 100644 index 0000000..6955de7 --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/OrderSettingDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/PaymentInfoDao.xml b/mall-order/src/main/resources/mapper/order/PaymentInfoDao.xml new file mode 100644 index 0000000..edeed7b --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/PaymentInfoDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/main/resources/mapper/order/RefundInfoDao.xml b/mall-order/src/main/resources/mapper/order/RefundInfoDao.xml new file mode 100644 index 0000000..36eb8e6 --- /dev/null +++ b/mall-order/src/main/resources/mapper/order/RefundInfoDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/src/site/apt/format.apt b/mall-order/src/site/apt/format.apt deleted file mode 100644 index 39bb340..0000000 --- a/mall-order/src/site/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - The APT format - ----- - The Maven Team - ----- - ----- - -The APT format -~~~~~~~~~~~~~~ - - In the following section, boxes containing text in typewriter-like font are - examples of APT source. - -* Document structure -~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionally be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-order/src/site/apt/index.apt b/mall-order/src/site/apt/index.apt deleted file mode 100644 index 985ddeb..0000000 --- a/mall-order/src/site/apt/index.apt +++ /dev/null @@ -1,16 +0,0 @@ - ----- - The Site - ----- - The Maven Team - ----- - -Maven Site for your project - - Congratulations! If you are looking at this page then you have successfully generated a - template site employing the site archetype and you have run: - -+-----+ - -mvn site - -+-----+ diff --git a/mall-order/src/site/fml/faq.fml b/mall-order/src/site/fml/faq.fml deleted file mode 100644 index ba39c83..0000000 --- a/mall-order/src/site/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Where did Maven come from? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Why is Maven so wildly popular? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-order/src/site/fr/apt/format.apt b/mall-order/src/site/fr/apt/format.apt deleted file mode 100644 index eed0961..0000000 --- a/mall-order/src/site/fr/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - Le format APT - ----- - L'équipe Maven - ----- - ----- - -Le format APT -~~~~~~~~~~~~~ - - Dans la section suivante, les boîtes contenant du texte dans la police - de type machine à écrire sont des exemples de source APT. - -* Structure du document -~~~~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionaly be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-order/src/site/fr/apt/index.apt b/mall-order/src/site/fr/apt/index.apt deleted file mode 100644 index dde1c9f..0000000 --- a/mall-order/src/site/fr/apt/index.apt +++ /dev/null @@ -1,17 +0,0 @@ - ----- - Le Site - ----- - L'équipe Maven - ----- - -Site Maven pour votre projet - - Félicitations! Si vous regardez cette page alors vous avez - généré avec succès un modèle de site en utilisant l'archétype - de site et vous avez lancé : - -+-----+ - -mvn site - -+-----+ diff --git a/mall-order/src/site/fr/fml/faq.fml b/mall-order/src/site/fr/fml/faq.fml deleted file mode 100644 index 22ab255..0000000 --- a/mall-order/src/site/fr/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - D'où vient Maven ? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Pourquoi Maven est-il si populaire ? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-order/src/site/fr/markdown/markdown-velocity.md.vm b/mall-order/src/site/fr/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-order/src/site/fr/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-order/src/site/fr/markdown/markdown.md b/mall-order/src/site/fr/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-order/src/site/fr/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-order/src/site/fr/xdoc/xdoc.xml b/mall-order/src/site/fr/xdoc/xdoc.xml deleted file mode 100644 index 49e79bb..0000000 --- a/mall-order/src/site/fr/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Bienvenue - The Maven Team - - - -
-

- Ceci est du texte pour le fichier xdoc. -

-
- -
- diff --git a/mall-order/src/site/markdown/markdown-velocity.md.vm b/mall-order/src/site/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-order/src/site/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-order/src/site/markdown/markdown.md b/mall-order/src/site/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-order/src/site/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-order/src/site/site.xml b/mall-order/src/site/site.xml deleted file mode 100644 index 1cc2973..0000000 --- a/mall-order/src/site/site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-order/src/site/site_fr.xml b/mall-order/src/site/site_fr.xml deleted file mode 100644 index 17035ef..0000000 --- a/mall-order/src/site/site_fr.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-order/src/site/xdoc/xdoc.xml b/mall-order/src/site/xdoc/xdoc.xml deleted file mode 100644 index 557034e..0000000 --- a/mall-order/src/site/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Welcome - The Maven Team - - - -
-

- This is some text for the xdoc file. -

-
- -
- diff --git a/mall-product/pom.xml b/mall-product/pom.xml index 304542f..dbc24f7 100644 --- a/mall-product/pom.xml +++ b/mall-product/pom.xml @@ -3,10 +3,63 @@ 4.0.0 - + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + com.carl.mall mall-product 1.0-SNAPSHOT + + 1.8 + 2020.0.1 + + + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/mall-product/src/main/java/com/carl/mall/product/MallProductApplication.java b/mall-product/src/main/java/com/carl/mall/product/MallProductApplication.java new file mode 100644 index 0000000..74c737d --- /dev/null +++ b/mall-product/src/main/java/com/carl/mall/product/MallProductApplication.java @@ -0,0 +1,18 @@ +package com.carl.mall.product; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +// 指定Mapper接口对应的路径 +@MapperScan("com.carl.mall.product.dao") +@EnableDiscoveryClient +public class MallProductApplication { + + public static void main(String[] args) { + SpringApplication.run(MallProductApplication.class,args); + } +} diff --git a/mall-product/src/main/resources/application.yml b/mall-product/src/main/resources/application.yml new file mode 100644 index 0000000..0c08a6f --- /dev/null +++ b/mall-product/src/main/resources/application.yml @@ -0,0 +1,23 @@ +#server: +# port: 9004 +## 数据库的连接新 +#spring: +# datasource: +# username: root +# password: 123456 +# url: jdbc:mysql://192.168.73.130:12345/mall-pms +# driver-class-name: com.mysql.cj.jdbc.Driver +# application: +# name: mall-product +# cloud: +# nacos: +# discovery: +# server-addr: 192.168.73.130:8848 +# +# +##mybatis-plus 配置 +#mybatis-plus: +# mapper-locations: classpath*:/mapper/**/*.xml +# global-config: +# db-config: +# id-type: auto # 主键自增 \ No newline at end of file diff --git a/mall-product/src/main/resources/bootstrap.properties b/mall-product/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..72e9136 --- /dev/null +++ b/mall-product/src/main/resources/bootstrap.properties @@ -0,0 +1,22 @@ +#nacos config +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 +spring.application.name= mall-product + +#指定使用的命名空间 +spring.cloud.nacos.config.namespace=5d5b0c9c-9926-4901-825c-e87682a11539 + +#指定对应的配置组 +spring.cloud.nacos.config.group=prod + +#配置多个配置集 +spring.cloud.nacos.config.ext-config[0].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[0].group=prod +spring.cloud.nacos.config.ext-config[0].refresh=false + +spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[1].group=prod +spring.cloud.nacos.config.ext-config[1].refresh=false + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=prod +spring.cloud.nacos.config.ext-config[2].refresh=false \ No newline at end of file diff --git a/mall-product/src/test/java/com/carl/mall/product/MallProductApplicationTest.java b/mall-product/src/test/java/com/carl/mall/product/MallProductApplicationTest.java new file mode 100644 index 0000000..f691748 --- /dev/null +++ b/mall-product/src/test/java/com/carl/mall/product/MallProductApplicationTest.java @@ -0,0 +1,51 @@ +package com.carl.mall.product; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.carl.mall.product.entity.BrandEntity; +import com.carl.mall.product.service.BrandService; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.List; + +@SpringBootTest(classes = MallProductApplication.class) +public class MallProductApplicationTest { + + @Autowired + BrandService brandService; + + @Test + void contextLoads(){ + + BrandEntity entity = new BrandEntity(); + entity.setName("魅族"); + brandService.save(entity); + + } + + @Test + void selectAll() { + List list = brandService.list(); + for (BrandEntity entity : list) { + System.out.println(entity); + } + } + + + @Test + void selectById() { + List list = brandService + .list(new QueryWrapper().eq("brand_id",2)); + for (BrandEntity entity : list) { + System.out.println(entity); + } + } + +} + + + + + diff --git a/mall-ware/pom.xml b/mall-ware/pom.xml index 049ec71..1380369 100644 --- a/mall-ware/pom.xml +++ b/mall-ware/pom.xml @@ -4,10 +4,59 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + org.springframework.boot + spring-boot-starter-parent + 2.4.12 + + com.carl.mall mall-ware 1.0-SNAPSHOT + + 1.8 + 2020.0.1 + + + + + com.carl.mall + mall-commons + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/MallWareApplication.java b/mall-ware/src/main/java/com/carl/mall/ware/MallWareApplication.java new file mode 100644 index 0000000..b5dca9e --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/MallWareApplication.java @@ -0,0 +1,18 @@ +package com.carl.mall.ware; + + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +@SpringBootApplication +// 指定Mapper接口对应的路径 +@MapperScan("com.carl.mall.ware.dao") +@EnableDiscoveryClient +public class MallWareApplication { + + public static void main(String[] args) { + SpringApplication.run(MallWareApplication.class,args); + } +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseController.java new file mode 100644 index 0000000..d5f359e --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.PurchaseEntity; +import com.carl.mall.ware.service.PurchaseService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 采购信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/purchase") +public class PurchaseController { + @Autowired + private PurchaseService purchaseService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:purchase:list") + public R list(@RequestParam Map params){ + PageUtils page = purchaseService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:purchase:info") + public R info(@PathVariable("id") Long id){ + PurchaseEntity purchase = purchaseService.getById(id); + + return R.ok().put("purchase", purchase); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:purchase:save") + public R save(@RequestBody PurchaseEntity purchase){ + purchaseService.save(purchase); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:purchase:update") + public R update(@RequestBody PurchaseEntity purchase){ + purchaseService.updateById(purchase); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:purchase:delete") + public R delete(@RequestBody Long[] ids){ + purchaseService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseDetailController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseDetailController.java new file mode 100644 index 0000000..74a3f09 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/PurchaseDetailController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.PurchaseDetailEntity; +import com.carl.mall.ware.service.PurchaseDetailService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/purchasedetail") +public class PurchaseDetailController { + @Autowired + private PurchaseDetailService purchaseDetailService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:purchasedetail:list") + public R list(@RequestParam Map params){ + PageUtils page = purchaseDetailService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:purchasedetail:info") + public R info(@PathVariable("id") Long id){ + PurchaseDetailEntity purchaseDetail = purchaseDetailService.getById(id); + + return R.ok().put("purchaseDetail", purchaseDetail); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:purchasedetail:save") + public R save(@RequestBody PurchaseDetailEntity purchaseDetail){ + purchaseDetailService.save(purchaseDetail); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:purchasedetail:update") + public R update(@RequestBody PurchaseDetailEntity purchaseDetail){ + purchaseDetailService.updateById(purchaseDetail); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:purchasedetail:delete") + public R delete(@RequestBody Long[] ids){ + purchaseDetailService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/WareInfoController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareInfoController.java new file mode 100644 index 0000000..df25bd0 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareInfoController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.WareInfoEntity; +import com.carl.mall.ware.service.WareInfoService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 仓库信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/wareinfo") +public class WareInfoController { + @Autowired + private WareInfoService wareInfoService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:wareinfo:list") + public R list(@RequestParam Map params){ + PageUtils page = wareInfoService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:wareinfo:info") + public R info(@PathVariable("id") Long id){ + WareInfoEntity wareInfo = wareInfoService.getById(id); + + return R.ok().put("wareInfo", wareInfo); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:wareinfo:save") + public R save(@RequestBody WareInfoEntity wareInfo){ + wareInfoService.save(wareInfo); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:wareinfo:update") + public R update(@RequestBody WareInfoEntity wareInfo){ + wareInfoService.updateById(wareInfo); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:wareinfo:delete") + public R delete(@RequestBody Long[] ids){ + wareInfoService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskController.java new file mode 100644 index 0000000..6945530 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.WareOrderTaskEntity; +import com.carl.mall.ware.service.WareOrderTaskService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/wareordertask") +public class WareOrderTaskController { + @Autowired + private WareOrderTaskService wareOrderTaskService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:wareordertask:list") + public R list(@RequestParam Map params){ + PageUtils page = wareOrderTaskService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:wareordertask:info") + public R info(@PathVariable("id") Long id){ + WareOrderTaskEntity wareOrderTask = wareOrderTaskService.getById(id); + + return R.ok().put("wareOrderTask", wareOrderTask); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:wareordertask:save") + public R save(@RequestBody WareOrderTaskEntity wareOrderTask){ + wareOrderTaskService.save(wareOrderTask); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:wareordertask:update") + public R update(@RequestBody WareOrderTaskEntity wareOrderTask){ + wareOrderTaskService.updateById(wareOrderTask); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:wareordertask:delete") + public R delete(@RequestBody Long[] ids){ + wareOrderTaskService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskDetailController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskDetailController.java new file mode 100644 index 0000000..ffc4818 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareOrderTaskDetailController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.WareOrderTaskDetailEntity; +import com.carl.mall.ware.service.WareOrderTaskDetailService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/wareordertaskdetail") +public class WareOrderTaskDetailController { + @Autowired + private WareOrderTaskDetailService wareOrderTaskDetailService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:wareordertaskdetail:list") + public R list(@RequestParam Map params){ + PageUtils page = wareOrderTaskDetailService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:wareordertaskdetail:info") + public R info(@PathVariable("id") Long id){ + WareOrderTaskDetailEntity wareOrderTaskDetail = wareOrderTaskDetailService.getById(id); + + return R.ok().put("wareOrderTaskDetail", wareOrderTaskDetail); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:wareordertaskdetail:save") + public R save(@RequestBody WareOrderTaskDetailEntity wareOrderTaskDetail){ + wareOrderTaskDetailService.save(wareOrderTaskDetail); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:wareordertaskdetail:update") + public R update(@RequestBody WareOrderTaskDetailEntity wareOrderTaskDetail){ + wareOrderTaskDetailService.updateById(wareOrderTaskDetail); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:wareordertaskdetail:delete") + public R delete(@RequestBody Long[] ids){ + wareOrderTaskDetailService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/controller/WareSkuController.java b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareSkuController.java new file mode 100644 index 0000000..8b8d3cc --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/controller/WareSkuController.java @@ -0,0 +1,90 @@ +package com.carl.mall.ware.controller; + +import java.util.Arrays; +import java.util.Map; + +//import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.carl.mall.ware.entity.WareSkuEntity; +import com.carl.mall.ware.service.WareSkuService; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.R; + + + +/** + * 商品库存 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@RestController +@RequestMapping("ware/waresku") +public class WareSkuController { + @Autowired + private WareSkuService wareSkuService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:waresku:list") + public R list(@RequestParam Map params){ + PageUtils page = wareSkuService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:waresku:info") + public R info(@PathVariable("id") Long id){ + WareSkuEntity wareSku = wareSkuService.getById(id); + + return R.ok().put("wareSku", wareSku); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:waresku:save") + public R save(@RequestBody WareSkuEntity wareSku){ + wareSkuService.save(wareSku); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:waresku:update") + public R update(@RequestBody WareSkuEntity wareSku){ + wareSkuService.updateById(wareSku); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:waresku:delete") + public R delete(@RequestBody Long[] ids){ + wareSkuService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDao.java new file mode 100644 index 0000000..15ca78b --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.PurchaseEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 采购信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface PurchaseDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDetailDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDetailDao.java new file mode 100644 index 0000000..ca23c9c --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/PurchaseDetailDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.PurchaseDetailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface PurchaseDetailDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/WareInfoDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareInfoDao.java new file mode 100644 index 0000000..736ae8b --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareInfoDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.WareInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface WareInfoDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDao.java new file mode 100644 index 0000000..203b9b0 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.WareOrderTaskEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface WareOrderTaskDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDetailDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDetailDao.java new file mode 100644 index 0000000..f60cc03 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareOrderTaskDetailDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.WareOrderTaskDetailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface WareOrderTaskDetailDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/dao/WareSkuDao.java b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareSkuDao.java new file mode 100644 index 0000000..faa887b --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/dao/WareSkuDao.java @@ -0,0 +1,17 @@ +package com.carl.mall.ware.dao; + +import com.carl.mall.ware.entity.WareSkuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品库存 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Mapper +public interface WareSkuDao extends BaseMapper { + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseDetailEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseDetailEntity.java new file mode 100644 index 0000000..2273b65 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseDetailEntity.java @@ -0,0 +1,53 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_purchase_detail") +public class PurchaseDetailEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId + private Long id; + /** + * 采购单id + */ + private Long purchaseId; + /** + * 采购商品id + */ + private Long skuId; + /** + * 采购数量 + */ + private Integer skuNum; + /** + * 采购金额 + */ + private BigDecimal skuPrice; + /** + * 仓库id + */ + private Long wareId; + /** + * 状态[0新建,1已分配,2正在采购,3已完成,4采购失败] + */ + private Integer status; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseEntity.java new file mode 100644 index 0000000..acd42b4 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/PurchaseEntity.java @@ -0,0 +1,65 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.math.BigDecimal; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 采购信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_purchase") +public class PurchaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 采购单id + */ + @TableId + private Long id; + /** + * 采购人id + */ + private Long assigneeId; + /** + * 采购人名 + */ + private String assigneeName; + /** + * 联系方式 + */ + private String phone; + /** + * 优先级 + */ + private Integer priority; + /** + * 状态 + */ + private Integer status; + /** + * 仓库id + */ + private Long wareId; + /** + * 总金额 + */ + private BigDecimal amount; + /** + * 创建日期 + */ + private Date createTime; + /** + * 更新日期 + */ + private Date updateTime; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/WareInfoEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareInfoEntity.java new file mode 100644 index 0000000..3ae5382 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareInfoEntity.java @@ -0,0 +1,40 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 仓库信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_ware_info") +public class WareInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * 仓库名 + */ + private String name; + /** + * 仓库地址 + */ + private String address; + /** + * 区域编码 + */ + private String areacode; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskDetailEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskDetailEntity.java new file mode 100644 index 0000000..709647f --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskDetailEntity.java @@ -0,0 +1,44 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_ware_order_task_detail") +public class WareOrderTaskDetailEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * sku_id + */ + private Long skuId; + /** + * sku_name + */ + private String skuName; + /** + * 购买个数 + */ + private Integer skuNum; + /** + * 工作单id + */ + private Long taskId; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskEntity.java new file mode 100644 index 0000000..a373ef1 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareOrderTaskEntity.java @@ -0,0 +1,80 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_ware_order_task") +public class WareOrderTaskEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * order_id + */ + private Long orderId; + /** + * order_sn + */ + private String orderSn; + /** + * 收货人 + */ + private String consignee; + /** + * 收货人电话 + */ + private String consigneeTel; + /** + * 配送地址 + */ + private String deliveryAddress; + /** + * 订单备注 + */ + private String orderComment; + /** + * 付款方式【 1:在线付款 2:货到付款】 + */ + private Integer paymentWay; + /** + * 任务状态 + */ + private Integer taskStatus; + /** + * 订单描述 + */ + private String orderBody; + /** + * 物流单号 + */ + private String trackingNo; + /** + * create_time + */ + private Date createTime; + /** + * 仓库id + */ + private Long wareId; + /** + * 工作单备注 + */ + private String taskComment; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/entity/WareSkuEntity.java b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareSkuEntity.java new file mode 100644 index 0000000..ade2d49 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/entity/WareSkuEntity.java @@ -0,0 +1,48 @@ +package com.carl.mall.ware.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 商品库存 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +@Data +@TableName("wms_ware_sku") +public class WareSkuEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId + private Long id; + /** + * sku_id + */ + private Long skuId; + /** + * 仓库id + */ + private Long wareId; + /** + * 库存数 + */ + private Integer stock; + /** + * sku_name + */ + private String skuName; + /** + * 锁定库存 + */ + private Integer stockLocked; + +} diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseDetailService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseDetailService.java new file mode 100644 index 0000000..dd5ab7f --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseDetailService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.PurchaseDetailEntity; + +import java.util.Map; + +/** + * + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface PurchaseDetailService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseService.java new file mode 100644 index 0000000..bd01db2 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/PurchaseService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.PurchaseEntity; + +import java.util.Map; + +/** + * 采购信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface PurchaseService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/WareInfoService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/WareInfoService.java new file mode 100644 index 0000000..a39beb0 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/WareInfoService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.WareInfoEntity; + +import java.util.Map; + +/** + * 仓库信息 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface WareInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskDetailService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskDetailService.java new file mode 100644 index 0000000..e6f6b10 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskDetailService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.WareOrderTaskDetailEntity; + +import java.util.Map; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface WareOrderTaskDetailService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskService.java new file mode 100644 index 0000000..f98e178 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/WareOrderTaskService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.WareOrderTaskEntity; + +import java.util.Map; + +/** + * 库存工作单 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface WareOrderTaskService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/WareSkuService.java b/mall-ware/src/main/java/com/carl/mall/ware/service/WareSkuService.java new file mode 100644 index 0000000..eda8039 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/WareSkuService.java @@ -0,0 +1,20 @@ +package com.carl.mall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.carl.common.utils.PageUtils; +import com.carl.mall.ware.entity.WareSkuEntity; + +import java.util.Map; + +/** + * 商品库存 + * + * @author carl + * @email 541020344@qq.com + * @date 2024-03-10 23:34:07 + */ +public interface WareSkuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseDetailServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseDetailServiceImpl.java new file mode 100644 index 0000000..bb4184c --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseDetailServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.PurchaseDetailDao; +import com.carl.mall.ware.entity.PurchaseDetailEntity; +import com.carl.mall.ware.service.PurchaseDetailService; + + +@Service("purchaseDetailService") +public class PurchaseDetailServiceImpl extends ServiceImpl implements PurchaseDetailService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseServiceImpl.java new file mode 100644 index 0000000..d8ad952 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/PurchaseServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.PurchaseDao; +import com.carl.mall.ware.entity.PurchaseEntity; +import com.carl.mall.ware.service.PurchaseService; + + +@Service("purchaseService") +public class PurchaseServiceImpl extends ServiceImpl implements PurchaseService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareInfoServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareInfoServiceImpl.java new file mode 100644 index 0000000..4d58491 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.WareInfoDao; +import com.carl.mall.ware.entity.WareInfoEntity; +import com.carl.mall.ware.service.WareInfoService; + + +@Service("wareInfoService") +public class WareInfoServiceImpl extends ServiceImpl implements WareInfoService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskDetailServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskDetailServiceImpl.java new file mode 100644 index 0000000..774e1b0 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskDetailServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.WareOrderTaskDetailDao; +import com.carl.mall.ware.entity.WareOrderTaskDetailEntity; +import com.carl.mall.ware.service.WareOrderTaskDetailService; + + +@Service("wareOrderTaskDetailService") +public class WareOrderTaskDetailServiceImpl extends ServiceImpl implements WareOrderTaskDetailService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskServiceImpl.java new file mode 100644 index 0000000..cf55b8c --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareOrderTaskServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.WareOrderTaskDao; +import com.carl.mall.ware.entity.WareOrderTaskEntity; +import com.carl.mall.ware.service.WareOrderTaskService; + + +@Service("wareOrderTaskService") +public class WareOrderTaskServiceImpl extends ServiceImpl implements WareOrderTaskService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareSkuServiceImpl.java b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareSkuServiceImpl.java new file mode 100644 index 0000000..43bcdc1 --- /dev/null +++ b/mall-ware/src/main/java/com/carl/mall/ware/service/impl/WareSkuServiceImpl.java @@ -0,0 +1,29 @@ +package com.carl.mall.ware.service.impl; + +import org.springframework.stereotype.Service; +import java.util.Map; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.carl.common.utils.PageUtils; +import com.carl.common.utils.Query; + +import com.carl.mall.ware.dao.WareSkuDao; +import com.carl.mall.ware.entity.WareSkuEntity; +import com.carl.mall.ware.service.WareSkuService; + + +@Service("wareSkuService") +public class WareSkuServiceImpl extends ServiceImpl implements WareSkuService { + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/mall-ware/src/main/resources/application.yml b/mall-ware/src/main/resources/application.yml new file mode 100644 index 0000000..e442d09 --- /dev/null +++ b/mall-ware/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 9005 +# 数据库的连接新 +spring: + datasource: + username: root + password: 123456 + url: jdbc:mysql://192.168.73.130:12345/mall-wms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 192.168.73.130:8848 + application: + name: mall-ware + + +#mybatis-plus 配置 +mybatis-plus: + mapper-locations: classpath*:/mapper/**/*.xml + global-config: + db-config: + id-type: auto # 主键自增 \ No newline at end of file diff --git a/mall-ware/src/main/resources/bootstrap.properties b/mall-ware/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..06a0dd9 --- /dev/null +++ b/mall-ware/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +#nacos config +spring.cloud.nacos.config.server-addr=192.168.73.130:8848 +spring.application.name= mall-ware \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/PurchaseDao.xml b/mall-ware/src/main/resources/mapper/ware/PurchaseDao.xml new file mode 100644 index 0000000..6ce0d92 --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/PurchaseDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml b/mall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml new file mode 100644 index 0000000..7607a95 --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/WareInfoDao.xml b/mall-ware/src/main/resources/mapper/ware/WareInfoDao.xml new file mode 100644 index 0000000..8161e81 --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/WareInfoDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml b/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml new file mode 100644 index 0000000..3bb4a3d --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml b/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml new file mode 100644 index 0000000..126a932 --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/main/resources/mapper/ware/WareSkuDao.xml b/mall-ware/src/main/resources/mapper/ware/WareSkuDao.xml new file mode 100644 index 0000000..69197e0 --- /dev/null +++ b/mall-ware/src/main/resources/mapper/ware/WareSkuDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-ware/src/site/apt/format.apt b/mall-ware/src/site/apt/format.apt deleted file mode 100644 index 39bb340..0000000 --- a/mall-ware/src/site/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - The APT format - ----- - The Maven Team - ----- - ----- - -The APT format -~~~~~~~~~~~~~~ - - In the following section, boxes containing text in typewriter-like font are - examples of APT source. - -* Document structure -~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionally be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-ware/src/site/apt/index.apt b/mall-ware/src/site/apt/index.apt deleted file mode 100644 index 985ddeb..0000000 --- a/mall-ware/src/site/apt/index.apt +++ /dev/null @@ -1,16 +0,0 @@ - ----- - The Site - ----- - The Maven Team - ----- - -Maven Site for your project - - Congratulations! If you are looking at this page then you have successfully generated a - template site employing the site archetype and you have run: - -+-----+ - -mvn site - -+-----+ diff --git a/mall-ware/src/site/fml/faq.fml b/mall-ware/src/site/fml/faq.fml deleted file mode 100644 index ba39c83..0000000 --- a/mall-ware/src/site/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Where did Maven come from? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Why is Maven so wildly popular? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-ware/src/site/fr/apt/format.apt b/mall-ware/src/site/fr/apt/format.apt deleted file mode 100644 index eed0961..0000000 --- a/mall-ware/src/site/fr/apt/format.apt +++ /dev/null @@ -1,602 +0,0 @@ - ----- - Le format APT - ----- - L'équipe Maven - ----- - ----- - -Le format APT -~~~~~~~~~~~~~ - - Dans la section suivante, les boîtes contenant du texte dans la police - de type machine à écrire sont des exemples de source APT. - -* Structure du document -~~~~~~~~~~~~~~~~~~~~~~~ - - A short APT document is contained in a single text file. A longer document - may be contained in a ordered list of text files. For instance, first text - file contains section 1, second text file contains section 2, and so on. - - [Note:] Splitting the APT document in several text files on a section - boundary is not mandatory. The split may occur anywhere. - However doing so is recommended because a text file containing a - section is by itself a valid APT document. - - A file contains a sequence of paragraphs and ``displays'' (non paragraphs - such as tables) separated by open lines. - - A paragraph is simply a sequence of consecutive text lines. - -+------------------------------------------------------------------------+ - First line of first paragraph. - Second line of first paragraph. - Third line of first paragraph. - - Line 1 of paragraph 2 (separated from first paragraph by an open line). - Line 2 of paragraph 2. -+------------------------------------------------------------------------+ - - The indentation of the first line of a paragraph is the main method used by - an APT processor to recognize the type of the paragraph. For example, a - section title must not be indented at all. - - A ``plain'' paragraph must be indented by a certain amount of space. For - example, a plain paragraph which is not contained in a list may be indented - by two spaces. - -+-------------------------------------------------+ -My section title (not indented). - - My paragraph first line (indented by 2 spaces). -+-------------------------------------------------+ - - Indentation is not rigid. Any amount of space will do. You don't even need - to use a consistent indentation all over your document. What really matters - for an APT processor is whether the paragraph is not indented at all or, - when inside a list, whether a paragraph is more or less indented than the - first item of the list (more about this later). - -+-------------------------------------------------------+ - First paragraph has its first line indented by four -spaces. Then the author did even bother to indent the -other lines of the paragraph. - - Second paragraph contains several lines which are all - indented by two spaces. This style is much nicer than - the one used for the previous paragraph. -+-------------------------------------------------------+ - - Note that tabs are expanded with a tab width set to 8. - -* Document elements -~~~~~~~~~~~~~~~~~~~ - -** Block level elements -~~~~~~~~~~~~~~~~~~~~~~~ - -*** Title -~~~~~~~~~~ - - A title is optional. If used, it must appear as the first block of the - document. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - Author - ------ - Date -+----------------------------------------------------------------------------+ - - A title block is indented (centering it is nicer). It begins with a line - containing at least 3 dashes (<<<--->>>). - - After the first <<<--->>> line, one or several consecutive lines of text - (implicit line break after each line) specify the title of the document. - - This text may immediately be followed by another <<<--->>> line and one or - several consecutive lines of text which specifies the author of the - document. - - The author sub-block may optionaly be followed by a date sub-block using the - same syntax. - - The following example is used for a document with an title and a date but - with no declared author. - -+----------------------------------------------------------------------------+ - ------ - Title - ------ - ------ - Date - ------ -+----------------------------------------------------------------------------+ - - The last line is ignored. It is just there to make the block nicer. - -*** Paragraph -~~~~~~~~~~~~~ - - Paragraphs other than the title block may appear before the first section. - -+----------------------+ - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. -+----------------------+ - - Paragraphs are indented. They have already been described in the {{Document - structure}} section. - -*** Section -~~~~~~~~~~~ - - Sections are created by inserting section titles into the document. Simple - documents need not contain sections. - -+-----------------------------------+ -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title -+-----------------------------------+ - - Section titles are not indented. A sub-section title begins with one - asterisk (<<<*>>>), a sub-sub-section title begins with two asterisks - (<<<**>>>), and so forth up to four sub-section levels. - -*** List -~~~~~~~~ - -+---------------------------------------+ - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. -+---------------------------------------+ - - List items are indented and begin with a asterisk (<<<*>>>). - - Plain paragraphs more indented than the first list item are nested in that - list. Displays such as tables (not indented) are always nested in the - current list. - - To nest a list inside a list, indent its first item more than its parent - list. To end a list, add a paragraph or list item less indented than the - current list. - - Section titles always end a list. Displays cannot end a list but the - <<<[]>>> pseudo-element may be used to force the end of a list. - -+------------------------------------+ - * List item 3. - Force end of list: - - [] - --------------------------------------------- -Verbatim text not contained in list item 3 --------------------------------------------- -+------------------------------------+ - - In the previous example, without the <<<[]>>>, the verbatim text (not - indented as all displays) would have been contained in list item 3. - - A single <<<[]>>> may be used to end several nested lists at the same - time. The indentation of <<<[]>>> may be used to specify exactly which - lists should be ended. Example: - -+------------------------------------+ - * List item 1. - - * List item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - [] - -------------------------------------------------------------------- -Verbatim text contained in list item 2, but not in sub-list item 2 -------------------------------------------------------------------- -+------------------------------------+ - - There are three kind of lists, the bulleted lists we have already described, - the numbered lists and the definition lists. - -+-----------------------------------------+ - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. -+-----------------------------------------+ - - A numbered list item begins with a label beetween two square brackets. The - label of the first item establishes the numbering scheme for the whole list: - - [<<<[[1\]\]>>>] Decimal numbering: 1, 2, 3, 4, etc. - - [<<<[[a\]\]>>>] Lower-alpha numbering: a, b, c, d, etc. - - [<<<[[A\]\]>>>] Upper-alpha numbering: A, B, C, D, etc. - - [<<<[[i\]\]>>>] Lower-roman numbering: i, ii, iii, iv, etc. - - [<<<[[I\]\]>>>] Upper-roman numbering: I, II, III, IV, etc. - - The labels of the items other than the first one are ignored. It is - recommended to take the time to type the correct label for each item in - order to keep the APT source document readable. - -+-------------------------------------------+ - [Defined term 1] of definition list 2. - - [Defined term 2] of definition list 2. -+-------------------------------------------+ - - A definition list item begins with a defined term: text between square - brackets. - -*** Verbatim text -~~~~~~~~~~~~~~~~~ - -+----------------------------------------+ ----------------------------------------- -Verbatim - text, - preformatted, - escaped. ----------------------------------------- -+----------------------------------------+ - - A verbatim block is not indented. It begins with a non indented line - containing at least 3 dashes (<<<--->>>). It ends with a similar line. - - <<<+-->>> instead of <<<--->>> draws a box around verbatim text. - - Like in HTML, verbatim text is preformatted. Unlike HTML, verbatim text is - escaped: inside a verbatim display, markup is not interpreted by the APT - processor. - -*** Figure -~~~~~~~~~~ - -+---------------------------+ -[Figure name] Figure caption -+---------------------------+ - - A figure block is not indented. It begins with the figure name between - square brackets. The figure name is optionally followed by some text: the - figure caption. - - The figure name is the pathname of the file containing the figure but - without an extension. Example: if your figure is contained in - <<>>, the figure name is - <<>>. - - If the figure name comes from a relative pathname (recommended practice) - rather than from an absolute pathname, this relative pathname is taken to be - relative to the directory of the current APT document (a la HTML) - rather than relative to the current working directory. - - Why not leave the file extension in the figure name? This is better - explained by an example. You need to convert an APT document to PostScript - and your figure name is <<>>. A APT processor will - first try to load <<>>. When the desired format - is not found, a APT processor tries to convert one of the existing - formats. In our example, the APT processor tries to convert - <<>> to encapsulated PostScript. - -*** Table -~~~~~~~~~ - - A table block is not indented. It begins with a non indented line containing - an asterisk and at least 2 dashes (<<<*-->>>). It ends with a - similar line. - - The first line is not only used to recognize a table but also to specify - column justification. In the following example, - - * the second asterisk (<<<*>>>) is used to specify that column 1 is - centered, - - * the plus sign (<<<+>>>) specifies that column 2 is left aligned, - - * the colon (<<<:>>>) specifies that column 3 is right aligned. - - [] - -+---------------------------------------------+ -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption -+---------------------------------------------+ - - Rows are separated by a non indented line beginning with <<<*-->>>. - - An optional table caption (non indented text) may immediately follow the - table. - - Rows may contain single line or multiple line cells. Each line of cell text - is separated from the adjacent cell by the pipe character (<<<|>>>). - (<<<|>>> may be used in the cell text if quoted: <<<\\|>>>.) - - The last <<<|>>> is only used to make the table nicer. The first <<<|>>> is - not only used to make the table nicer, but also to specify that a grid is to - be drawn around table cells. - - The following example shows a simple table with no grid and no caption. - -+---------------+ -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* -+---------------+ - -*** Horizontal rule -~~~~~~~~~~~~~~~~~~~ - -+---------------------+ -===================== -+---------------------+ - - A non indented line containing at least 3 equal signs (<<<===>>>). - -*** Page break -~~~~~~~~~~~~~~ - -+---+ -^L -+---+ - - A non indented line containing a single form feed character (Control-L). - -** Text level elements -~~~~~~~~~~~~~~~~~~~~~~ - -*** Font -~~~~~~~~ - -+-----------------------------------------------------+ - font. <> font. <<>> font. -+-----------------------------------------------------+ - - Text between \< and > must be rendered in italic. Text between \<\< and >> - must be rendered in bold. Text between \<\<\< and >>> must be rendered using - a monospaced, typewriter-like font. - - Font elements may appear anywhere except inside other font elements. - - It is not recommended to use font elements inside titles, section titles, - links and defined terms because a APT processor automatically applies - appropriate font styles to these elements. - -*** Anchor and link -~~~~~~~~~~~~~~~~~~~ - -+-----------------------------------------------------------------+ - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. -+-----------------------------------------------------------------+ - - Text between curly braces (<<<\{}>>>) specifies an anchor. Text between - double curly braces (<<<\{\{}}>>>) specifies a link. - - It is an error to create a link element that does not refer to an anchor of - the same name. The name of an anchor/link is its text with all non - alphanumeric characters stripped. - - This rule does not apply to links to anchors. Text beginning - with <<>>, <<>>, <<>>, <<>>, <<>>, - <<<../>>>, <<<./>>> (<<<..\\>>> and <<<.\\>>> on Windows) is recognized as - an external anchor name. - - When the construct <<\{\{\{>><<}>><<}}>> is used, the link text - may differ from the link name . - - Anchor/link elements may appear anywhere except inside other anchor/link - elements. - - Section titles are implicitly defined anchors. - -*** Line break -~~~~~~~~~~~~~~ - -+-------------+ - Force line\ - break. -+-------------+ - - A backslash character (<<<\\>>>) followed by a newline character. - - Line breaks must not be used inside titles and tables (which are line - oriented blocks with implicit line breaks). - -*** Non breaking space -~~~~~~~~~~~~~~~~~~~~~~ - -+----------------------+ - Non\ breaking\ space. -+----------------------+ - - A backslash character (<<<\\>>>) followed by a space character. - -*** Special character -~~~~~~~~~~~~~~~~~~~~~ - -+---------------------------------------------------------------------------+ - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. -+---------------------------------------------------------------------------+ - - In certain contexts, these characters have a special meaning and therefore - must be escaped if needed as is. They are escaped by adding a backslash in - front of them. The backslash may itself be escaped by adding another - backslash in front of it. - - Note that an asterisk, for example, needs to be escaped only if its begins a - paragraph. (<<<*>>> has no special meaning in the middle of a paragraph.) - -+--------------------------------------+ - Copyright symbol: \251, \xA9, \u00a9. -+--------------------------------------+ - - Latin-1 characters (whatever is the encoding of the APT document) may be - specified by their codes using a backslash followed by one to three octal - digits or by using the <<<\x>>> notation, where are two hexadecimal - digits. - - Unicode characters may be specified by their codes using the <<<\u>>> - notation, where are four hexadecimal digits. - -*** Comment -~~~~~~~~~~~ - -+---------------+ -~~Commented out. -+---------------+ - - Text found after two tildes (<<<\~~>>>) is ignored up to the end of line. - - A line of <<<~>>> is often used to ``underline'' section titles in order to - make them stand out of other paragraphs. - - -* The APT format at a glance -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------------------------------------------------------------- - ------ - Title - ------ - Author - ------ - Date - - Paragraph 1, line 1. - Paragraph 1, line 2. - - Paragraph 2, line 1. - Paragraph 2, line 2. - -Section title - -* Sub-section title - -** Sub-sub-section title - -*** Sub-sub-sub-section title - -**** Sub-sub-sub-sub-section title - - * List item 1. - - * List item 2. - - Paragraph contained in list item 2. - - * Sub-list item 1. - - * Sub-list item 2. - - * List item 3. - Force end of list: - - [] - -+------------------------------------------+ -Verbatim text not contained in list item 3 -+------------------------------------------+ - - [[1]] Numbered item 1. - - [[A]] Numbered item A. - - [[B]] Numbered item B. - - [[2]] Numbered item 2. - - List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. - - [Defined term 1] of definition list. - - [Defined term 2] of definition list. - -+-------------------------------+ -Verbatim text - in a box -+-------------------------------+ - - --- instead of +-- suppresses the box around verbatim text. - -[Figure name] Figure caption - -*----------*--------------+----------------: -| Centered | Left-aligned | Right-aligned | -| cell 1,1 | cell 1,2 | cell 1,3 | -*----------*--------------+----------------: -| cell 2,1 | cell 2,2 | cell 2,3 | -*----------*--------------+----------------: -Table caption - - No grid, no caption: - -*-----*------* - cell | cell -*-----*------* - cell | cell -*-----*------* - - Horizontal line: - -======================================================================= - -^L - New page. - - font. <> font. <<>> font. - - {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. - Link to {{{anchor}showing alternate text}}. - Link to {{{http://www.pixware.fr}Pixware home page}}. - - Force line\ - break. - - Non\ breaking\ space. - - Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. - - Copyright symbol: \251, \xA9, \u00a9. - -~~Commented out. - ------------------------------------------------------------------------------- - diff --git a/mall-ware/src/site/fr/apt/index.apt b/mall-ware/src/site/fr/apt/index.apt deleted file mode 100644 index dde1c9f..0000000 --- a/mall-ware/src/site/fr/apt/index.apt +++ /dev/null @@ -1,17 +0,0 @@ - ----- - Le Site - ----- - L'équipe Maven - ----- - -Site Maven pour votre projet - - Félicitations! Si vous regardez cette page alors vous avez - généré avec succès un modèle de site en utilisant l'archétype - de site et vous avez lancé : - -+-----+ - -mvn site - -+-----+ diff --git a/mall-ware/src/site/fr/fml/faq.fml b/mall-ware/src/site/fr/fml/faq.fml deleted file mode 100644 index 22ab255..0000000 --- a/mall-ware/src/site/fr/fml/faq.fml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - D'où vient Maven ? - -

- Maven was created by a group of software developers who were tired - of wasting their time fiddling around with builds and wanted to get - down to brass tacks and actually develop software! -

-
-
- - Pourquoi Maven est-il si populaire ? - -

- Maven saves you so much time in your software development efforts that - you will have time to learn a second language, relax ten hours a - day, and train for that marathon you've always wanted to run! -

-
-
-
-
diff --git a/mall-ware/src/site/fr/markdown/markdown-velocity.md.vm b/mall-ware/src/site/fr/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-ware/src/site/fr/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-ware/src/site/fr/markdown/markdown.md b/mall-ware/src/site/fr/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-ware/src/site/fr/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-ware/src/site/fr/xdoc/xdoc.xml b/mall-ware/src/site/fr/xdoc/xdoc.xml deleted file mode 100644 index 49e79bb..0000000 --- a/mall-ware/src/site/fr/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Bienvenue - The Maven Team - - - -
-

- Ceci est du texte pour le fichier xdoc. -

-
- -
- diff --git a/mall-ware/src/site/markdown/markdown-velocity.md.vm b/mall-ware/src/site/markdown/markdown-velocity.md.vm deleted file mode 100644 index f9b8def..0000000 --- a/mall-ware/src/site/markdown/markdown-velocity.md.vm +++ /dev/null @@ -1,13 +0,0 @@ -Markdown Format with Velocity works ---------------- - -#[[###]]# But Markdown conflicts with Velocity on `${esc.h}${esc.h}` syntax - -Since `${esc.h}${esc.h}` denotes a -[single line comment](http://velocity.apache.org/engine/1.7/vtl-reference.html#single-line-comments) in Velocity, -Markdown headers using this syntax are suppressed from generated content. - -You can use [unparsed content syntax](http://velocity.apache.org/engine/1.7/vtl-reference.html#unparsed-content) -`${esc.h}[[#[[##]]#]]${esc.h}` or -[escape tool](http://velocity.apache.org/tools/2.0/apidocs/org/apache/velocity/tools/generic/EscapeTool.html) -like `${esc.d}{esc.h}${esc.d}{esc.h}`. diff --git a/mall-ware/src/site/markdown/markdown.md b/mall-ware/src/site/markdown/markdown.md deleted file mode 100644 index f7a466b..0000000 --- a/mall-ware/src/site/markdown/markdown.md +++ /dev/null @@ -1,11 +0,0 @@ -Markdown Format works ---------------- - -You can write your documentation in Markdown... - - - -### Subsection - -If you want to filter content with Velocity (files ending in `.vm`), please have a look at -explanations on [Markdown conflict with Velocity on `##` syntax](./markdown-velocity.html). \ No newline at end of file diff --git a/mall-ware/src/site/site.xml b/mall-ware/src/site/site.xml deleted file mode 100644 index 1cc2973..0000000 --- a/mall-ware/src/site/site.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-ware/src/site/site_fr.xml b/mall-ware/src/site/site_fr.xml deleted file mode 100644 index 17035ef..0000000 --- a/mall-ware/src/site/site_fr.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ${artifactId} - https://maven.apache.org/images/apache-maven-project.png - https://www.apache.org/ - - - - https://maven.apache.org/images/maven-logo-black-on-white.png - https://maven.apache.org/ - - - - org.apache.maven.skins - maven-fluido-skin - 1.7 - - - - - - - - - - - - - - - - - - - diff --git a/mall-ware/src/site/xdoc/xdoc.xml b/mall-ware/src/site/xdoc/xdoc.xml deleted file mode 100644 index 557034e..0000000 --- a/mall-ware/src/site/xdoc/xdoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Welcome - The Maven Team - - - -
-

- This is some text for the xdoc file. -

-
- -
- diff --git a/pom.xml b/pom.xml index 9d37538..0d5db92 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,9 @@ mall-order mall-product renren-fast + renren-generator-master + mall-commons + mall-gateway diff --git a/renren-fast/pom.xml b/renren-fast/pom.xml index ce9bcdb..9d4350e 100644 --- a/renren-fast/pom.xml +++ b/renren-fast/pom.xml @@ -11,7 +11,8 @@ org.springframework.boot spring-boot-starter-parent - 2.6.6 + 2.4.12 + @@ -81,11 +82,11 @@ spring-boot-configuration-processor true - - - - - + + org.springframework.boot + spring-boot-devtools + true + com.baomidou mybatis-plus-boot-starter @@ -247,68 +248,67 @@ 2.8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.codehaus.mojo + wagon-maven-plugin + 1.0 + + target/${pack-name} + + + + kill -9 `ps -ef |grep ${project.artifactId}.jar|grep -v "grep" |awk '{print $2}'` + + ${service-path}/renren.log 2>&1 & ]]> + + + + + true + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + 0.4.14 + + + + + + + + + + renren/fast + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + -- Gitee