From 3fd2b80a3f74f3c9deda222c6eb27e9f0cd947dd Mon Sep 17 00:00:00 2001 From: miaowei <2608957980@qq.com> Date: Wed, 11 Nov 2020 19:52:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=BA=E5=99=A8=E4=BA=BA=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gulimall/product/GulimallProductApplication.java | 2 ++ gulimall-product/src/main/resources/application.yml | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/gulimall-product/src/main/java/com/forth/gulimall/product/GulimallProductApplication.java b/gulimall-product/src/main/java/com/forth/gulimall/product/GulimallProductApplication.java index 41b5b4c..dbcee2e 100644 --- a/gulimall-product/src/main/java/com/forth/gulimall/product/GulimallProductApplication.java +++ b/gulimall-product/src/main/java/com/forth/gulimall/product/GulimallProductApplication.java @@ -3,7 +3,9 @@ package com.forth.gulimall.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; +@EnableDiscoveryClient @MapperScan("com.forth.gulimall.product.dao") @SpringBootApplication public class GulimallProductApplication { diff --git a/gulimall-product/src/main/resources/application.yml b/gulimall-product/src/main/resources/application.yml index 50ab217..fcee8ad 100644 --- a/gulimall-product/src/main/resources/application.yml +++ b/gulimall-product/src/main/resources/application.yml @@ -1,11 +1,21 @@ +server: + port: 4001 spring: datasource: username: root password: root url: jdbc:mysql://39.97.249.66:3306/gulimall_pms driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: product mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: db-config: id-type: auto + + -- Gitee From 4f561abf92855346f2b856c9be2015614bce3ed8 Mon Sep 17 00:00:00 2001 From: miaowei <2608957980@qq.com> Date: Thu, 12 Nov 2020 08:58:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?member=E7=9A=84yml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 gulimall-member/src/main/resources/application.yml diff --git a/gulimall-member/src/main/resources/application.yml b/gulimall-member/src/main/resources/application.yml new file mode 100644 index 0000000..e5bb83d --- /dev/null +++ b/gulimall-member/src/main/resources/application.yml @@ -0,0 +1,23 @@ +server: + port: 4002 + +spring: + datasource: + username: root + password: root + url: jdbc:mysql://39.97.249.66:3306/gulimall_pms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: member + +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + global-config: + db-config: + id-type: auto + + -- Gitee From a5ffda1ef0b78000b8e6dab78218ab3431fbde6d Mon Sep 17 00:00:00 2001 From: miaowei <2608957980@qq.com> Date: Thu, 12 Nov 2020 09:01:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?member=E7=9A=84yml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulimall-member/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulimall-member/src/main/resources/application.yml b/gulimall-member/src/main/resources/application.yml index e5bb83d..fbf75c2 100644 --- a/gulimall-member/src/main/resources/application.yml +++ b/gulimall-member/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: datasource: username: root password: root - url: jdbc:mysql://39.97.249.66:3306/gulimall_pms + url: jdbc:mysql://39.97.249.66:3306/gulimall_ums driver-class-name: com.mysql.cj.jdbc.Driver cloud: nacos: -- Gitee From 18c7173452501a507a5201404580fef7c622e5b2 Mon Sep 17 00:00:00 2001 From: miaowei <2608957980@qq.com> Date: Thu, 12 Nov 2020 10:37:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E5=85=A5=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulimall-coupon/pom.xml | 4 +- .../coupon/GulimallCouponApplication.java | 6 +- .../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 ++++ .../forth/gulimall/coupon/dao/CouponDao.java | 17 + .../gulimall/coupon/dao/CouponHistoryDao.java | 17 + .../dao/CouponSpuCategoryRelationDao.java | 17 + .../coupon/dao/CouponSpuRelationDao.java | 17 + .../forth/gulimall/coupon/dao/HomeAdvDao.java | 17 + .../gulimall/coupon/dao/HomeSubjectDao.java | 17 + .../coupon/dao/HomeSubjectSpuDao.java | 17 + .../gulimall/coupon/dao/MemberPriceDao.java | 17 + .../coupon/dao/SeckillPromotionDao.java | 17 + .../coupon/dao/SeckillSessionDao.java | 17 + .../coupon/dao/SeckillSkuNoticeDao.java | 17 + .../coupon/dao/SeckillSkuRelationDao.java | 17 + .../coupon/dao/SkuFullReductionDao.java | 17 + .../gulimall/coupon/dao/SkuLadderDao.java | 17 + .../gulimall/coupon/dao/SpuBoundsDao.java | 17 + .../gulimall/coupon/entity/CouponEntity.java | 105 +++++ .../coupon/entity/CouponHistoryEntity.java | 64 +++ .../CouponSpuCategoryRelationEntity.java | 40 ++ .../entity/CouponSpuRelationEntity.java | 40 ++ .../gulimall/coupon/entity/HomeAdvEntity.java | 72 +++ .../coupon/entity/HomeSubjectEntity.java | 56 +++ .../coupon/entity/HomeSubjectSpuEntity.java | 44 ++ .../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 ++ .../coupon/entity/SkuLadderEntity.java | 49 ++ .../coupon/entity/SpuBoundsEntity.java | 45 ++ .../coupon/service/CouponHistoryService.java | 20 + .../coupon/service/CouponService.java | 20 + .../CouponSpuCategoryRelationService.java | 20 + .../service/CouponSpuRelationService.java | 20 + .../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 + .../coupon/service/SkuLadderService.java | 20 + .../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.properties | 1 - .../src/main/resources/application.yml | 21 + .../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 + .../modules/coupon/coupon-add-or-update.vue | 246 ++++++++++ .../src/views/modules/coupon/coupon.vue | 271 +++++++++++ .../coupon/couponhistory-add-or-update.vue | 156 ++++++ .../views/modules/coupon/couponhistory.vue | 211 +++++++++ ...ouponspucategoryrelation-add-or-update.vue | 102 ++++ .../coupon/couponspucategoryrelation.vue | 175 +++++++ .../couponspurelation-add-or-update.vue | 102 ++++ .../modules/coupon/couponspurelation.vue | 175 +++++++ .../modules/coupon/homeadv-add-or-update.vue | 174 +++++++ .../src/views/modules/coupon/homeadv.vue | 223 +++++++++ .../coupon/homesubject-add-or-update.vue | 138 ++++++ .../src/views/modules/coupon/homesubject.vue | 199 ++++++++ .../coupon/homesubjectspu-add-or-update.vue | 111 +++++ .../views/modules/coupon/homesubjectspu.vue | 181 +++++++ .../coupon/memberprice-add-or-update.vue | 120 +++++ .../src/views/modules/coupon/memberprice.vue | 187 ++++++++ .../coupon/seckillpromotion-add-or-update.vue | 129 +++++ .../views/modules/coupon/seckillpromotion.vue | 193 ++++++++ .../coupon/seckillsession-add-or-update.vue | 120 +++++ .../views/modules/coupon/seckillsession.vue | 187 ++++++++ .../coupon/seckillskunotice-add-or-update.vue | 129 +++++ .../views/modules/coupon/seckillskunotice.vue | 193 ++++++++ .../seckillskurelation-add-or-update.vue | 138 ++++++ .../modules/coupon/seckillskurelation.vue | 199 ++++++++ .../coupon/skufullreduction-add-or-update.vue | 111 +++++ .../views/modules/coupon/skufullreduction.vue | 181 +++++++ .../coupon/skuladder-add-or-update.vue | 120 +++++ .../src/views/modules/coupon/skuladder.vue | 187 ++++++++ .../coupon/spubounds-add-or-update.vue | 111 +++++ .../src/views/modules/coupon/spubounds.vue | 181 +++++++ .../GulimallCouponApplicationTests.java | 13 - .../GulimallCouponApplicationTests.java | 23 + gulimall-member/pom.xml | 4 +- .../member/GulimallMemberApplication.java | 6 +- .../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 + .../member/dao/MemberCollectSpuDao.java | 17 + .../member/dao/MemberCollectSubjectDao.java | 17 + .../forth/gulimall/member/dao/MemberDao.java | 17 + .../gulimall/member/dao/MemberLevelDao.java | 17 + .../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 ++ .../gulimall/member/entity/MemberEntity.java | 96 ++++ .../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 + .../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.properties | 1 - .../src/main/resources/application.yml | 2 - .../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 + .../growthchangehistory-add-or-update.vue | 120 +++++ .../modules/member/growthchangehistory.vue | 187 ++++++++ ...integrationchangehistory-add-or-update.vue | 120 +++++ .../member/integrationchangehistory.vue | 187 ++++++++ .../modules/member/member-add-or-update.vue | 228 +++++++++ .../src/views/modules/member/member.vue | 259 ++++++++++ .../member/membercollectspu-add-or-update.vue | 120 +++++ .../views/modules/member/membercollectspu.vue | 187 ++++++++ .../membercollectsubject-add-or-update.vue | 111 +++++ .../modules/member/membercollectsubject.vue | 181 +++++++ .../member/memberlevel-add-or-update.vue | 156 ++++++ .../src/views/modules/member/memberlevel.vue | 211 +++++++++ .../member/memberloginlog-add-or-update.vue | 120 +++++ .../views/modules/member/memberloginlog.vue | 187 ++++++++ .../memberreceiveaddress-add-or-update.vue | 165 +++++++ .../modules/member/memberreceiveaddress.vue | 217 +++++++++ .../memberstatisticsinfo-add-or-update.vue | 201 ++++++++ .../modules/member/memberstatisticsinfo.vue | 241 ++++++++++ .../GulimallMemberApplicationTests.java | 23 + .../GulimallMemberApplicationTests.java | 13 - gulimall-order/pom.xml | 7 +- .../order/GulimallOrderApplication.java | 4 + .../order/controller/OrderController.java | 90 ++++ .../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 ++++ .../forth/gulimall/order/dao/OrderDao.java | 17 + .../gulimall/order/dao/OrderItemDao.java | 17 + .../order/dao/OrderOperateHistoryDao.java | 17 + .../order/dao/OrderReturnApplyDao.java | 17 + .../order/dao/OrderReturnReasonDao.java | 17 + .../gulimall/order/dao/OrderSettingDao.java | 17 + .../gulimall/order/dao/PaymentInfoDao.java | 17 + .../gulimall/order/dao/RefundInfoDao.java | 17 + .../gulimall/order/entity/OrderEntity.java | 193 ++++++++ .../order/entity/OrderItemEntity.java | 105 +++++ .../entity/OrderOperateHistoryEntity.java | 48 ++ .../order/entity/OrderReturnApplyEntity.java | 137 ++++++ .../order/entity/OrderReturnReasonEntity.java | 44 ++ .../order/entity/OrderSettingEntity.java | 52 ++ .../order/entity/PaymentInfoEntity.java | 69 +++ .../order/entity/RefundInfoEntity.java | 53 +++ .../order/service/OrderItemService.java | 20 + .../service/OrderOperateHistoryService.java | 20 + .../service/OrderReturnApplyService.java | 20 + .../service/OrderReturnReasonService.java | 20 + .../gulimall/order/service/OrderService.java | 20 + .../order/service/OrderSettingService.java | 20 + .../order/service/PaymentInfoService.java | 20 + .../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 ++ .../src/main/resources/application.properties | 1 - .../src/main/resources/application.yml | 19 + .../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 + .../modules/order/order-add-or-update.vue | 444 ++++++++++++++++++ .../src/views/modules/order/order.vue | 403 ++++++++++++++++ .../modules/order/orderitem-add-or-update.vue | 246 ++++++++++ .../src/views/modules/order/orderitem.vue | 271 +++++++++++ .../orderoperatehistory-add-or-update.vue | 120 +++++ .../modules/order/orderoperatehistory.vue | 187 ++++++++ .../order/orderreturnapply-add-or-update.vue | 318 +++++++++++++ .../views/modules/order/orderreturnapply.vue | 319 +++++++++++++ .../order/orderreturnreason-add-or-update.vue | 111 +++++ .../views/modules/order/orderreturnreason.vue | 181 +++++++ .../order/ordersetting-add-or-update.vue | 129 +++++ .../src/views/modules/order/ordersetting.vue | 193 ++++++++ .../order/paymentinfo-add-or-update.vue | 165 +++++++ .../src/views/modules/order/paymentinfo.vue | 217 +++++++++ .../order/refundinfo-add-or-update.vue | 129 +++++ .../src/views/modules/order/refundinfo.vue | 193 ++++++++ .../order/GulimallOrderApplicationTests.java | 12 + gulimall-ware/pom.xml | 4 +- .../GulimallWareApplication.java | 6 +- .../ware/controller/PurchaseController.java | 90 ++++ .../controller/PurchaseDetailController.java | 90 ++++ .../ware/controller/UndoLogController.java | 90 ++++ .../ware/controller/WareInfoController.java | 90 ++++ .../controller/WareOrderTaskController.java | 90 ++++ .../WareOrderTaskDetailController.java | 90 ++++ .../ware/controller/WareSkuController.java | 90 ++++ .../forth/gulimall/ware/dao/PurchaseDao.java | 17 + .../gulimall/ware/dao/PurchaseDetailDao.java | 17 + .../forth/gulimall/ware/dao/UndoLogDao.java | 17 + .../forth/gulimall/ware/dao/WareInfoDao.java | 17 + .../gulimall/ware/dao/WareOrderTaskDao.java | 17 + .../ware/dao/WareOrderTaskDetailDao.java | 17 + .../forth/gulimall/ware/dao/WareSkuDao.java | 17 + .../ware/entity/PurchaseDetailEntity.java | 53 +++ .../gulimall/ware/entity/PurchaseEntity.java | 65 +++ .../gulimall/ware/entity/UndoLogEntity.java | 60 +++ .../gulimall/ware/entity/WareInfoEntity.java | 40 ++ .../entity/WareOrderTaskDetailEntity.java | 52 ++ .../ware/entity/WareOrderTaskEntity.java | 80 ++++ .../gulimall/ware/entity/WareSkuEntity.java | 48 ++ .../ware/service/PurchaseDetailService.java | 20 + .../ware/service/PurchaseService.java | 20 + .../gulimall/ware/service/UndoLogService.java | 20 + .../ware/service/WareInfoService.java | 20 + .../service/WareOrderTaskDetailService.java | 20 + .../ware/service/WareOrderTaskService.java | 20 + .../gulimall/ware/service/WareSkuService.java | 20 + .../impl/PurchaseDetailServiceImpl.java | 29 ++ .../service/impl/PurchaseServiceImpl.java | 29 ++ .../ware/service/impl/UndoLogServiceImpl.java | 29 ++ .../service/impl/WareInfoServiceImpl.java | 29 ++ .../impl/WareOrderTaskDetailServiceImpl.java | 29 ++ .../impl/WareOrderTaskServiceImpl.java | 29 ++ .../ware/service/impl/WareSkuServiceImpl.java | 29 ++ .../src/main/resources/application.properties | 1 - .../src/main/resources/application.yml | 21 + .../resources/mapper/ware/PurchaseDao.xml | 21 + .../mapper/ware/PurchaseDetailDao.xml | 18 + .../main/resources/mapper/ware/UndoLogDao.xml | 20 + .../resources/mapper/ware/WareInfoDao.xml | 15 + .../mapper/ware/WareOrderTaskDao.xml | 25 + .../mapper/ware/WareOrderTaskDetailDao.xml | 18 + .../main/resources/mapper/ware/WareSkuDao.xml | 17 + .../modules/ware/purchase-add-or-update.vue | 156 ++++++ .../src/views/modules/ware/purchase.vue | 211 +++++++++ .../ware/purchasedetail-add-or-update.vue | 129 +++++ .../src/views/modules/ware/purchasedetail.vue | 193 ++++++++ .../modules/ware/undolog-add-or-update.vue | 147 ++++++ .../src/views/modules/ware/undolog.vue | 205 ++++++++ .../modules/ware/wareinfo-add-or-update.vue | 102 ++++ .../src/views/modules/ware/wareinfo.vue | 175 +++++++ .../ware/wareordertask-add-or-update.vue | 192 ++++++++ .../src/views/modules/ware/wareordertask.vue | 235 +++++++++ .../wareordertaskdetail-add-or-update.vue | 129 +++++ .../modules/ware/wareordertaskdetail.vue | 193 ++++++++ .../modules/ware/waresku-add-or-update.vue | 120 +++++ .../src/views/modules/ware/waresku.vue | 187 ++++++++ .../GulimallWareApplicationTests.java | 13 - .../ware/GulimallWareApplicationTests.java | 23 + .../src/main/resources/application.yml | 2 +- .../src/main/resources/generator.properties | 4 +- 337 files changed, 23683 insertions(+), 58 deletions(-) rename gulimall-coupon/src/main/java/com/{coupon => forth}/gulimall/coupon/GulimallCouponApplication.java (57%) create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponHistoryServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuRelationServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeAdvServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectSpuServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/MemberPriceServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillPromotionServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuFullReductionServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuLadderServiceImpl.java create mode 100644 gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SpuBoundsServiceImpl.java delete mode 100644 gulimall-coupon/src/main/resources/application.properties create mode 100644 gulimall-coupon/src/main/resources/application.yml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/CouponDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml create mode 100644 gulimall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds-add-or-update.vue create mode 100644 gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds.vue delete mode 100644 gulimall-coupon/src/test/java/com/coupon/gulimall/coupon/GulimallCouponApplicationTests.java create mode 100644 gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java rename gulimall-member/src/main/java/com/forth/{member => gulimall}/member/GulimallMemberApplication.java (57%) create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/GrowthChangeHistoryController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/IntegrationChangeHistoryController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSpuController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSubjectController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLevelController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLoginLogController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberReceiveAddressController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberStatisticsInfoController.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/GrowthChangeHistoryDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/IntegrationChangeHistoryDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSpuDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSubjectDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLevelDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLoginLogDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberReceiveAddressDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberStatisticsInfoDao.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/GrowthChangeHistoryEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/IntegrationChangeHistoryEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSpuEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSubjectEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLevelEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLoginLogEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberReceiveAddressEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberStatisticsInfoEntity.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/GrowthChangeHistoryService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/IntegrationChangeHistoryService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSpuService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSubjectService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLevelService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLoginLogService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberReceiveAddressService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberStatisticsInfoService.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/GrowthChangeHistoryServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/IntegrationChangeHistoryServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSpuServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSubjectServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLevelServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLoginLogServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberReceiveAddressServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberServiceImpl.java create mode 100644 gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberStatisticsInfoServiceImpl.java delete mode 100644 gulimall-member/src/main/resources/application.properties create mode 100644 gulimall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberLevelDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml create mode 100644 gulimall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/member-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/member.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/membercollectspu-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/membercollectspu.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberlevel-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberlevel.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberloginlog-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberloginlog.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo-add-or-update.vue create mode 100644 gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo.vue create mode 100644 gulimall-member/src/test/java/com/forth/gulimall/member/GulimallMemberApplicationTests.java delete mode 100644 gulimall-member/src/test/java/com/forth/member/member/GulimallMemberApplicationTests.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderItemController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderOperateHistoryController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnApplyController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnReasonController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderSettingController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/PaymentInfoController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/controller/RefundInfoController.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderItemDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderOperateHistoryDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnApplyDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnReasonDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderSettingDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/PaymentInfoDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/dao/RefundInfoDao.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderItemEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderOperateHistoryEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnApplyEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnReasonEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderSettingEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/PaymentInfoEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/entity/RefundInfoEntity.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderItemService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderOperateHistoryService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnApplyService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnReasonService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderSettingService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/PaymentInfoService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/RefundInfoService.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderItemServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderOperateHistoryServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnApplyServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnReasonServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderSettingServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/PaymentInfoServiceImpl.java create mode 100644 gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/RefundInfoServiceImpl.java delete mode 100644 gulimall-order/src/main/resources/application.properties create mode 100644 gulimall-order/src/main/resources/application.yml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderItemDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/OrderSettingDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/PaymentInfoDao.xml create mode 100644 gulimall-order/src/main/resources/mapper/order/RefundInfoDao.xml create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/order-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/order.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderitem-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderitem.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/ordersetting-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/ordersetting.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/paymentinfo-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/paymentinfo.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/refundinfo-add-or-update.vue create mode 100644 gulimall-order/src/main/resources/src/views/modules/order/refundinfo.vue rename gulimall-ware/src/main/java/com/forth/gulimall/{gulimallware => ware}/GulimallWareApplication.java (57%) create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseDetailController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/UndoLogController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareInfoController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskDetailController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareSkuController.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDetailDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/UndoLogDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareInfoDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDetailDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareSkuDao.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseDetailEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/UndoLogEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareInfoEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskDetailEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareSkuEntity.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseDetailService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/UndoLogService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareInfoService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskDetailService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareSkuService.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseDetailServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/UndoLogServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareInfoServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskDetailServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskServiceImpl.java create mode 100644 gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareSkuServiceImpl.java delete mode 100644 gulimall-ware/src/main/resources/application.properties create mode 100644 gulimall-ware/src/main/resources/application.yml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/PurchaseDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/UndoLogDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/WareInfoDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml create mode 100644 gulimall-ware/src/main/resources/mapper/ware/WareSkuDao.xml create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/purchase-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/purchase.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/undolog-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/undolog.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/waresku-add-or-update.vue create mode 100644 gulimall-ware/src/main/resources/src/views/modules/ware/waresku.vue delete mode 100644 gulimall-ware/src/test/java/com/forth/gulimall/gulimallware/GulimallWareApplicationTests.java create mode 100644 gulimall-ware/src/test/java/com/forth/gulimall/ware/GulimallWareApplicationTests.java diff --git a/gulimall-coupon/pom.xml b/gulimall-coupon/pom.xml index 5193f06..ea01519 100644 --- a/gulimall-coupon/pom.xml +++ b/gulimall-coupon/pom.xml @@ -8,7 +8,7 @@ 2.3.5.RELEASE - com.coupon.gulimall + com.forth.gulimall gulimall-coupon 0.0.1-SNAPSHOT gulimall-coupon @@ -16,7 +16,7 @@ 1.8 - Hoxton.SR9 + Hoxton.SR8 diff --git a/gulimall-coupon/src/main/java/com/coupon/gulimall/coupon/GulimallCouponApplication.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java similarity index 57% rename from gulimall-coupon/src/main/java/com/coupon/gulimall/coupon/GulimallCouponApplication.java rename to gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java index b5e9f5d..b19ce61 100644 --- a/gulimall-coupon/src/main/java/com/coupon/gulimall/coupon/GulimallCouponApplication.java +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java @@ -1,8 +1,12 @@ -package com.coupon.gulimall.coupon; +package com.forth.gulimall.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; +@EnableDiscoveryClient +@MapperScan("com.forth.gulimall.coupon.dao") @SpringBootApplication public class GulimallCouponApplication { diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java new file mode 100644 index 0000000..39f10f8 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.CouponEntity; +import com.forth.gulimall.coupon.service.CouponService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 优惠券信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java new file mode 100644 index 0000000..aff008e --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.CouponHistoryEntity; +import com.forth.gulimall.coupon.service.CouponHistoryService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 优惠券领取历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java new file mode 100644 index 0000000..db23403 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.forth.gulimall.coupon.service.CouponSpuCategoryRelationService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 优惠券分类关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java new file mode 100644 index 0000000..654c54c --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.CouponSpuRelationEntity; +import com.forth.gulimall.coupon.service.CouponSpuRelationService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 优惠券与产品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:51 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java new file mode 100644 index 0000000..b0db7b9 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.HomeAdvEntity; +import com.forth.gulimall.coupon.service.HomeAdvService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 首页轮播广告 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java new file mode 100644 index 0000000..ac797e2 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.HomeSubjectEntity; +import com.forth.gulimall.coupon.service.HomeSubjectService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java new file mode 100644 index 0000000..cc99980 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.HomeSubjectSpuEntity; +import com.forth.gulimall.coupon.service.HomeSubjectSpuService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 专题商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java new file mode 100644 index 0000000..ab427d3 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.MemberPriceEntity; +import com.forth.gulimall.coupon.service.MemberPriceService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 商品会员价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java new file mode 100644 index 0000000..7a76e2e --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SeckillPromotionEntity; +import com.forth.gulimall.coupon.service.SeckillPromotionService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 秒杀活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java new file mode 100644 index 0000000..0582bf2 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SeckillSessionEntity; +import com.forth.gulimall.coupon.service.SeckillSessionService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 秒杀活动场次 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java new file mode 100644 index 0000000..aa507f6 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SeckillSkuNoticeEntity; +import com.forth.gulimall.coupon.service.SeckillSkuNoticeService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 秒杀商品通知订阅 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java new file mode 100644 index 0000000..fc1d24b --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SeckillSkuRelationEntity; +import com.forth.gulimall.coupon.service.SeckillSkuRelationService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 秒杀活动商品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java new file mode 100644 index 0000000..9b480ad --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SkuFullReductionEntity; +import com.forth.gulimall.coupon.service.SkuFullReductionService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 商品满减信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java new file mode 100644 index 0000000..4d17624 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SkuLadderEntity; +import com.forth.gulimall.coupon.service.SkuLadderService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 商品阶梯价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java new file mode 100644 index 0000000..d47402e --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.coupon.entity.SpuBoundsEntity; +import com.forth.gulimall.coupon.service.SpuBoundsService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 商品spu积分设置 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java new file mode 100644 index 0000000..93fba9b --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.CouponEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface CouponDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java new file mode 100644 index 0000000..6f0ef7c --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.CouponHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券领取历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface CouponHistoryDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java new file mode 100644 index 0000000..8045f61 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券分类关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface CouponSpuCategoryRelationDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java new file mode 100644 index 0000000..ef1dd0e --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.CouponSpuRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 优惠券与产品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:51 + */ +@Mapper +public interface CouponSpuRelationDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java new file mode 100644 index 0000000..e264135 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.HomeAdvEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 首页轮播广告 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface HomeAdvDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java new file mode 100644 index 0000000..19ca2db --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.HomeSubjectEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface HomeSubjectDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java new file mode 100644 index 0000000..efe2ed6 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.HomeSubjectSpuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 专题商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface HomeSubjectSpuDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java new file mode 100644 index 0000000..09ff4e4 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.MemberPriceEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品会员价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface MemberPriceDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java new file mode 100644 index 0000000..953ea52 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SeckillPromotionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface SeckillPromotionDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java new file mode 100644 index 0000000..e0ed817 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SeckillSessionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动场次 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface SeckillSessionDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java new file mode 100644 index 0000000..6de09d6 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SeckillSkuNoticeEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀商品通知订阅 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface SeckillSkuNoticeDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java new file mode 100644 index 0000000..e8faed1 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SeckillSkuRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 秒杀活动商品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface SeckillSkuRelationDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java new file mode 100644 index 0000000..15ad9a0 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SkuFullReductionEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品满减信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@Mapper +public interface SkuFullReductionDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java new file mode 100644 index 0000000..0bea2c2 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SkuLadderEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品阶梯价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface SkuLadderDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java new file mode 100644 index 0000000..9ef61ff --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.coupon.dao; + +import com.forth.gulimall.coupon.entity.SpuBoundsEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品spu积分设置 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@Mapper +public interface SpuBoundsDao extends BaseMapper { + +} diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java new file mode 100644 index 0000000..2dddfdf --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java @@ -0,0 +1,105 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java new file mode 100644 index 0000000..d4ce9b8 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java @@ -0,0 +1,64 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java new file mode 100644 index 0000000..1f8606d --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java @@ -0,0 +1,40 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java new file mode 100644 index 0000000..4d097c0 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java @@ -0,0 +1,40 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:51 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java new file mode 100644 index 0000000..2b61bf7 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java @@ -0,0 +1,72 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java new file mode 100644 index 0000000..bf172cb --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java @@ -0,0 +1,56 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java new file mode 100644 index 0000000..9736f0b --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java @@ -0,0 +1,44 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java new file mode 100644 index 0000000..24c965a --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java @@ -0,0 +1,49 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java new file mode 100644 index 0000000..0defa64 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java @@ -0,0 +1,52 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java new file mode 100644 index 0000000..7267d05 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java new file mode 100644 index 0000000..5a5af19 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java @@ -0,0 +1,52 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java new file mode 100644 index 0000000..58a82a1 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java @@ -0,0 +1,57 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java new file mode 100644 index 0000000..dc51b39 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java @@ -0,0 +1,45 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java new file mode 100644 index 0000000..9058347 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java @@ -0,0 +1,49 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java new file mode 100644 index 0000000..1e2ebb9 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java @@ -0,0 +1,45 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +@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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java new file mode 100644 index 0000000..53c710d --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.CouponHistoryEntity; + +import java.util.Map; + +/** + * 优惠券领取历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface CouponHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java new file mode 100644 index 0000000..edad5a2 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.CouponEntity; + +import java.util.Map; + +/** + * 优惠券信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface CouponService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java new file mode 100644 index 0000000..f654bc1 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.CouponSpuCategoryRelationEntity; + +import java.util.Map; + +/** + * 优惠券分类关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface CouponSpuCategoryRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java new file mode 100644 index 0000000..43d46fc --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.CouponSpuRelationEntity; + +import java.util.Map; + +/** + * 优惠券与产品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:51 + */ +public interface CouponSpuRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java new file mode 100644 index 0000000..e450522 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.HomeAdvEntity; + +import java.util.Map; + +/** + * 首页轮播广告 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface HomeAdvService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java new file mode 100644 index 0000000..f03e643 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.HomeSubjectEntity; + +import java.util.Map; + +/** + * 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface HomeSubjectService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java new file mode 100644 index 0000000..c027768 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.HomeSubjectSpuEntity; + +import java.util.Map; + +/** + * 专题商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface HomeSubjectSpuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java new file mode 100644 index 0000000..ecc73a9 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.MemberPriceEntity; + +import java.util.Map; + +/** + * 商品会员价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface MemberPriceService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java new file mode 100644 index 0000000..678b0f9 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SeckillPromotionEntity; + +import java.util.Map; + +/** + * 秒杀活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface SeckillPromotionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java new file mode 100644 index 0000000..50e2989 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SeckillSessionEntity; + +import java.util.Map; + +/** + * 秒杀活动场次 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface SeckillSessionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java new file mode 100644 index 0000000..e007f51 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SeckillSkuNoticeEntity; + +import java.util.Map; + +/** + * 秒杀商品通知订阅 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface SeckillSkuNoticeService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java new file mode 100644 index 0000000..366c7fb --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SeckillSkuRelationEntity; + +import java.util.Map; + +/** + * 秒杀活动商品关联 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface SeckillSkuRelationService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java new file mode 100644 index 0000000..24041ad --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SkuFullReductionEntity; + +import java.util.Map; + +/** + * 商品满减信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:49 + */ +public interface SkuFullReductionService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java new file mode 100644 index 0000000..36b5765 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SkuLadderEntity; + +import java.util.Map; + +/** + * 商品阶梯价格 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface SkuLadderService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java new file mode 100644 index 0000000..4c697ad --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.coupon.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.coupon.entity.SpuBoundsEntity; + +import java.util.Map; + +/** + * 商品spu积分设置 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 10:16:50 + */ +public interface SpuBoundsService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponHistoryServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponHistoryServiceImpl.java new file mode 100644 index 0000000..e9f6f63 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.CouponHistoryDao; +import com.forth.gulimall.coupon.entity.CouponHistoryEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponServiceImpl.java new file mode 100644 index 0000000..fba7ec9 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.CouponDao; +import com.forth.gulimall.coupon.entity.CouponEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java new file mode 100644 index 0000000..f879c8b --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuCategoryRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.CouponSpuCategoryRelationDao; +import com.forth.gulimall.coupon.entity.CouponSpuCategoryRelationEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuRelationServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuRelationServiceImpl.java new file mode 100644 index 0000000..0e5e636 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/CouponSpuRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.CouponSpuRelationDao; +import com.forth.gulimall.coupon.entity.CouponSpuRelationEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeAdvServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeAdvServiceImpl.java new file mode 100644 index 0000000..64007bc --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeAdvServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.HomeAdvDao; +import com.forth.gulimall.coupon.entity.HomeAdvEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectServiceImpl.java new file mode 100644 index 0000000..f2f4f8f --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.HomeSubjectDao; +import com.forth.gulimall.coupon.entity.HomeSubjectEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectSpuServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectSpuServiceImpl.java new file mode 100644 index 0000000..ba6b4bf --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/HomeSubjectSpuServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.HomeSubjectSpuDao; +import com.forth.gulimall.coupon.entity.HomeSubjectSpuEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/MemberPriceServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/MemberPriceServiceImpl.java new file mode 100644 index 0000000..85bb7ea --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/MemberPriceServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.MemberPriceDao; +import com.forth.gulimall.coupon.entity.MemberPriceEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillPromotionServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillPromotionServiceImpl.java new file mode 100644 index 0000000..1beca37 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillPromotionServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SeckillPromotionDao; +import com.forth.gulimall.coupon.entity.SeckillPromotionEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java new file mode 100644 index 0000000..af0ba9f --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SeckillSessionDao; +import com.forth.gulimall.coupon.entity.SeckillSessionEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java new file mode 100644 index 0000000..a04bc8d --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuNoticeServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SeckillSkuNoticeDao; +import com.forth.gulimall.coupon.entity.SeckillSkuNoticeEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java new file mode 100644 index 0000000..b1926df --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SeckillSkuRelationDao; +import com.forth.gulimall.coupon.entity.SeckillSkuRelationEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuFullReductionServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuFullReductionServiceImpl.java new file mode 100644 index 0000000..4d3e4b0 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuFullReductionServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SkuFullReductionDao; +import com.forth.gulimall.coupon.entity.SkuFullReductionEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuLadderServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuLadderServiceImpl.java new file mode 100644 index 0000000..2ad7032 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SkuLadderServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SkuLadderDao; +import com.forth.gulimall.coupon.entity.SkuLadderEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SpuBoundsServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SpuBoundsServiceImpl.java new file mode 100644 index 0000000..27f2ef7 --- /dev/null +++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SpuBoundsServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.coupon.dao.SpuBoundsDao; +import com.forth.gulimall.coupon.entity.SpuBoundsEntity; +import com.forth.gulimall.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/gulimall-coupon/src/main/resources/application.properties b/gulimall-coupon/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/gulimall-coupon/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gulimall-coupon/src/main/resources/application.yml b/gulimall-coupon/src/main/resources/application.yml new file mode 100644 index 0000000..1707390 --- /dev/null +++ b/gulimall-coupon/src/main/resources/application.yml @@ -0,0 +1,21 @@ +server: + port: 4005 +spring: + datasource: + username: root + password: root + url: jdbc:mysql://39.97.249.66:3306/gulimall_sms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: coupon +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + global-config: + db-config: + id-type: auto + + diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/CouponDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/CouponDao.xml new file mode 100644 index 0000000..79b43ab --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/CouponDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml new file mode 100644 index 0000000..ab1d450 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/CouponHistoryDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml new file mode 100644 index 0000000..ed45b22 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuCategoryRelationDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml new file mode 100644 index 0000000..da44ee2 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/CouponSpuRelationDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml new file mode 100644 index 0000000..883e431 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/HomeAdvDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml new file mode 100644 index 0000000..f7cc2b1 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml new file mode 100644 index 0000000..0b9d35e --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/HomeSubjectSpuDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml new file mode 100644 index 0000000..2e44518 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/MemberPriceDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml new file mode 100644 index 0000000..1c0e832 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillPromotionDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml new file mode 100644 index 0000000..97a9b71 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSessionDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml new file mode 100644 index 0000000..6ad46c0 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuNoticeDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml new file mode 100644 index 0000000..590fe19 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SeckillSkuRelationDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml new file mode 100644 index 0000000..ee00341 --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SkuFullReductionDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml new file mode 100644 index 0000000..f7c47cc --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SkuLadderDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml b/gulimall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml new file mode 100644 index 0000000..81482ac --- /dev/null +++ b/gulimall-coupon/src/main/resources/mapper/coupon/SpuBoundsDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon-add-or-update.vue new file mode 100644 index 0000000..8a1af99 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon-add-or-update.vue @@ -0,0 +1,246 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon.vue new file mode 100644 index 0000000..8aeadb4 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/coupon.vue @@ -0,0 +1,271 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory-add-or-update.vue new file mode 100644 index 0000000..f05d4f1 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory-add-or-update.vue @@ -0,0 +1,156 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory.vue new file mode 100644 index 0000000..1576a54 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponhistory.vue @@ -0,0 +1,211 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation-add-or-update.vue new file mode 100644 index 0000000..6a1be43 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation-add-or-update.vue @@ -0,0 +1,102 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation.vue new file mode 100644 index 0000000..c8ef56b --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspucategoryrelation.vue @@ -0,0 +1,175 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation-add-or-update.vue new file mode 100644 index 0000000..b60c293 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation-add-or-update.vue @@ -0,0 +1,102 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation.vue new file mode 100644 index 0000000..60f64b9 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/couponspurelation.vue @@ -0,0 +1,175 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv-add-or-update.vue new file mode 100644 index 0000000..301ad84 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv-add-or-update.vue @@ -0,0 +1,174 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv.vue new file mode 100644 index 0000000..611f495 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homeadv.vue @@ -0,0 +1,223 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject-add-or-update.vue new file mode 100644 index 0000000..a143b61 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject-add-or-update.vue @@ -0,0 +1,138 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject.vue new file mode 100644 index 0000000..45c9dcd --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubject.vue @@ -0,0 +1,199 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu-add-or-update.vue new file mode 100644 index 0000000..5403bbf --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu.vue new file mode 100644 index 0000000..8502733 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/homesubjectspu.vue @@ -0,0 +1,181 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice-add-or-update.vue new file mode 100644 index 0000000..1911800 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice.vue new file mode 100644 index 0000000..7a7554b --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/memberprice.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion-add-or-update.vue new file mode 100644 index 0000000..6d3004f --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion.vue new file mode 100644 index 0000000..abe0409 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillpromotion.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession-add-or-update.vue new file mode 100644 index 0000000..35e3c8f --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession.vue new file mode 100644 index 0000000..502aa14 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillsession.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice-add-or-update.vue new file mode 100644 index 0000000..ff57a48 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice.vue new file mode 100644 index 0000000..d802abd --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskunotice.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation-add-or-update.vue new file mode 100644 index 0000000..358fbac --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation-add-or-update.vue @@ -0,0 +1,138 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation.vue new file mode 100644 index 0000000..9f0cf09 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/seckillskurelation.vue @@ -0,0 +1,199 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction-add-or-update.vue new file mode 100644 index 0000000..021c0f7 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction.vue new file mode 100644 index 0000000..f03cb23 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skufullreduction.vue @@ -0,0 +1,181 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder-add-or-update.vue new file mode 100644 index 0000000..7ee79d9 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder.vue new file mode 100644 index 0000000..3aa0c70 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/skuladder.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds-add-or-update.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds-add-or-update.vue new file mode 100644 index 0000000..cdedb51 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds.vue b/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds.vue new file mode 100644 index 0000000..75930a5 --- /dev/null +++ b/gulimall-coupon/src/main/resources/src/views/modules/coupon/spubounds.vue @@ -0,0 +1,181 @@ + + + diff --git a/gulimall-coupon/src/test/java/com/coupon/gulimall/coupon/GulimallCouponApplicationTests.java b/gulimall-coupon/src/test/java/com/coupon/gulimall/coupon/GulimallCouponApplicationTests.java deleted file mode 100644 index aa7dd7a..0000000 --- a/gulimall-coupon/src/test/java/com/coupon/gulimall/coupon/GulimallCouponApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.coupon.gulimall.coupon; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class GulimallCouponApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java b/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java new file mode 100644 index 0000000..1fef888 --- /dev/null +++ b/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java @@ -0,0 +1,23 @@ +package com.forth.gulimall.coupon; + +import com.forth.gulimall.coupon.entity.CouponEntity; +import com.forth.gulimall.coupon.service.CouponService; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GulimallCouponApplicationTests { + + @Autowired + CouponService couponService; + + @Test + void contextLoads() { + CouponEntity couponEntity = new CouponEntity(); + couponEntity.setCode("123456"); + couponService.save(couponEntity); + System.out.println("success"); + } + +} diff --git a/gulimall-member/pom.xml b/gulimall-member/pom.xml index 7628078..0677a46 100644 --- a/gulimall-member/pom.xml +++ b/gulimall-member/pom.xml @@ -8,7 +8,7 @@ 2.3.5.RELEASE - com.forth.member + com.forth.gulimall gulimall-member 0.0.1-SNAPSHOT gulimall-member @@ -16,7 +16,7 @@ 1.8 - Hoxton.SR9 + Hoxton.SR8 diff --git a/gulimall-member/src/main/java/com/forth/member/member/GulimallMemberApplication.java b/gulimall-member/src/main/java/com/forth/gulimall/member/GulimallMemberApplication.java similarity index 57% rename from gulimall-member/src/main/java/com/forth/member/member/GulimallMemberApplication.java rename to gulimall-member/src/main/java/com/forth/gulimall/member/GulimallMemberApplication.java index a7cf01c..e9b6929 100644 --- a/gulimall-member/src/main/java/com/forth/member/member/GulimallMemberApplication.java +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/GulimallMemberApplication.java @@ -1,8 +1,12 @@ -package com.forth.member.member; +package com.forth.gulimall.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; +@EnableDiscoveryClient +@MapperScan("com.forth.gulimall.member.dao") @SpringBootApplication public class GulimallMemberApplication { diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/controller/GrowthChangeHistoryController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/GrowthChangeHistoryController.java new file mode 100644 index 0000000..535a2c9 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/GrowthChangeHistoryController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.GrowthChangeHistoryEntity; +import com.forth.gulimall.member.service.GrowthChangeHistoryService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 成长值变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/IntegrationChangeHistoryController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/IntegrationChangeHistoryController.java new file mode 100644 index 0000000..61d5dc7 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/IntegrationChangeHistoryController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.IntegrationChangeHistoryEntity; +import com.forth.gulimall.member.service.IntegrationChangeHistoryService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 积分变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSpuController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSpuController.java new file mode 100644 index 0000000..1b691de --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSpuController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberCollectSpuEntity; +import com.forth.gulimall.member.service.MemberCollectSpuService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员收藏的商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSubjectController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSubjectController.java new file mode 100644 index 0000000..4153e65 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberCollectSubjectController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberCollectSubjectEntity; +import com.forth.gulimall.member.service.MemberCollectSubjectService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员收藏的专题活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberController.java new file mode 100644 index 0000000..50322f1 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberEntity; +import com.forth.gulimall.member.service.MemberService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLevelController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLevelController.java new file mode 100644 index 0000000..8fcaf78 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLevelController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberLevelEntity; +import com.forth.gulimall.member.service.MemberLevelService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员等级 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLoginLogController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLoginLogController.java new file mode 100644 index 0000000..3ed0ca3 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberLoginLogController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberLoginLogEntity; +import com.forth.gulimall.member.service.MemberLoginLogService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员登录记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberReceiveAddressController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberReceiveAddressController.java new file mode 100644 index 0000000..59db558 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberReceiveAddressController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberReceiveAddressEntity; +import com.forth.gulimall.member.service.MemberReceiveAddressService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员收货地址 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberStatisticsInfoController.java b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberStatisticsInfoController.java new file mode 100644 index 0000000..b8e472a --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/controller/MemberStatisticsInfoController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.member.entity.MemberStatisticsInfoEntity; +import com.forth.gulimall.member.service.MemberStatisticsInfoService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 会员统计信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/dao/GrowthChangeHistoryDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/GrowthChangeHistoryDao.java new file mode 100644 index 0000000..74b508c --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/GrowthChangeHistoryDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.GrowthChangeHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 成长值变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@Mapper +public interface GrowthChangeHistoryDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/IntegrationChangeHistoryDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/IntegrationChangeHistoryDao.java new file mode 100644 index 0000000..1420521 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/IntegrationChangeHistoryDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.IntegrationChangeHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@Mapper +public interface IntegrationChangeHistoryDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSpuDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSpuDao.java new file mode 100644 index 0000000..db098d8 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSpuDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberCollectSpuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收藏的商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@Mapper +public interface MemberCollectSpuDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSubjectDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSubjectDao.java new file mode 100644 index 0000000..ce029ec --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberCollectSubjectDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberCollectSubjectEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收藏的专题活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@Mapper +public interface MemberCollectSubjectDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberDao.java new file mode 100644 index 0000000..0939ee6 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@Mapper +public interface MemberDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLevelDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLevelDao.java new file mode 100644 index 0000000..5582c80 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLevelDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberLevelEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员等级 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@Mapper +public interface MemberLevelDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLoginLogDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLoginLogDao.java new file mode 100644 index 0000000..ad77f65 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberLoginLogDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberLoginLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员登录记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@Mapper +public interface MemberLoginLogDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberReceiveAddressDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberReceiveAddressDao.java new file mode 100644 index 0000000..338731f --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberReceiveAddressDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberReceiveAddressEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员收货地址 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@Mapper +public interface MemberReceiveAddressDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberStatisticsInfoDao.java b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberStatisticsInfoDao.java new file mode 100644 index 0000000..48ef757 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/dao/MemberStatisticsInfoDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.member.dao; + +import com.forth.gulimall.member.entity.MemberStatisticsInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 会员统计信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@Mapper +public interface MemberStatisticsInfoDao extends BaseMapper { + +} diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/entity/GrowthChangeHistoryEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/GrowthChangeHistoryEntity.java new file mode 100644 index 0000000..c8894e2 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/GrowthChangeHistoryEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/IntegrationChangeHistoryEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/IntegrationChangeHistoryEntity.java new file mode 100644 index 0000000..04c9cea --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/IntegrationChangeHistoryEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSpuEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSpuEntity.java new file mode 100644 index 0000000..6cfff75 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSpuEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSubjectEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSubjectEntity.java new file mode 100644 index 0000000..31ac0fe --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberCollectSubjectEntity.java @@ -0,0 +1,44 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberEntity.java new file mode 100644 index 0000000..0c1b9b2 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberEntity.java @@ -0,0 +1,96 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLevelEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLevelEntity.java new file mode 100644 index 0000000..8db3930 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLevelEntity.java @@ -0,0 +1,65 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLoginLogEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLoginLogEntity.java new file mode 100644 index 0000000..9e2e7b6 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberLoginLogEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberReceiveAddressEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberReceiveAddressEntity.java new file mode 100644 index 0000000..e4d6807 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberReceiveAddressEntity.java @@ -0,0 +1,68 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberStatisticsInfoEntity.java b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberStatisticsInfoEntity.java new file mode 100644 index 0000000..2bbebff --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/entity/MemberStatisticsInfoEntity.java @@ -0,0 +1,85 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +@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/gulimall-member/src/main/java/com/forth/gulimall/member/service/GrowthChangeHistoryService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/GrowthChangeHistoryService.java new file mode 100644 index 0000000..7ec60aa --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/GrowthChangeHistoryService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.GrowthChangeHistoryEntity; + +import java.util.Map; + +/** + * 成长值变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +public interface GrowthChangeHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/IntegrationChangeHistoryService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/IntegrationChangeHistoryService.java new file mode 100644 index 0000000..96b78a0 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/IntegrationChangeHistoryService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.IntegrationChangeHistoryEntity; + +import java.util.Map; + +/** + * 积分变化历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +public interface IntegrationChangeHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSpuService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSpuService.java new file mode 100644 index 0000000..3d43ddc --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSpuService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberCollectSpuEntity; + +import java.util.Map; + +/** + * 会员收藏的商品 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +public interface MemberCollectSpuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSubjectService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSubjectService.java new file mode 100644 index 0000000..29158ac --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberCollectSubjectService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberCollectSubjectEntity; + +import java.util.Map; + +/** + * 会员收藏的专题活动 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +public interface MemberCollectSubjectService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLevelService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLevelService.java new file mode 100644 index 0000000..ba695b4 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLevelService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberLevelEntity; + +import java.util.Map; + +/** + * 会员等级 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +public interface MemberLevelService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLoginLogService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLoginLogService.java new file mode 100644 index 0000000..c9feddd --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberLoginLogService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberLoginLogEntity; + +import java.util.Map; + +/** + * 会员登录记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +public interface MemberLoginLogService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberReceiveAddressService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberReceiveAddressService.java new file mode 100644 index 0000000..131639f --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberReceiveAddressService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberReceiveAddressEntity; + +import java.util.Map; + +/** + * 会员收货地址 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:55 + */ +public interface MemberReceiveAddressService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberService.java new file mode 100644 index 0000000..1078cbd --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberEntity; + +import java.util.Map; + +/** + * 会员 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +public interface MemberService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberStatisticsInfoService.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberStatisticsInfoService.java new file mode 100644 index 0000000..57ea678 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/MemberStatisticsInfoService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.member.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.member.entity.MemberStatisticsInfoEntity; + +import java.util.Map; + +/** + * 会员统计信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:30:56 + */ +public interface MemberStatisticsInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/GrowthChangeHistoryServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/GrowthChangeHistoryServiceImpl.java new file mode 100644 index 0000000..cfb3cb5 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/GrowthChangeHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.GrowthChangeHistoryDao; +import com.forth.gulimall.member.entity.GrowthChangeHistoryEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/IntegrationChangeHistoryServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/IntegrationChangeHistoryServiceImpl.java new file mode 100644 index 0000000..1ee5eac --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/IntegrationChangeHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.IntegrationChangeHistoryDao; +import com.forth.gulimall.member.entity.IntegrationChangeHistoryEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSpuServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSpuServiceImpl.java new file mode 100644 index 0000000..a69646d --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSpuServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberCollectSpuDao; +import com.forth.gulimall.member.entity.MemberCollectSpuEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSubjectServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSubjectServiceImpl.java new file mode 100644 index 0000000..eacdedf --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberCollectSubjectServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberCollectSubjectDao; +import com.forth.gulimall.member.entity.MemberCollectSubjectEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLevelServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLevelServiceImpl.java new file mode 100644 index 0000000..579aad7 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLevelServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberLevelDao; +import com.forth.gulimall.member.entity.MemberLevelEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLoginLogServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLoginLogServiceImpl.java new file mode 100644 index 0000000..5035118 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberLoginLogServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberLoginLogDao; +import com.forth.gulimall.member.entity.MemberLoginLogEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberReceiveAddressServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberReceiveAddressServiceImpl.java new file mode 100644 index 0000000..e5a424e --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberReceiveAddressServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberReceiveAddressDao; +import com.forth.gulimall.member.entity.MemberReceiveAddressEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberServiceImpl.java new file mode 100644 index 0000000..e09cf66 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberDao; +import com.forth.gulimall.member.entity.MemberEntity; +import com.forth.gulimall.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/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberStatisticsInfoServiceImpl.java b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberStatisticsInfoServiceImpl.java new file mode 100644 index 0000000..26877a8 --- /dev/null +++ b/gulimall-member/src/main/java/com/forth/gulimall/member/service/impl/MemberStatisticsInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.member.dao.MemberStatisticsInfoDao; +import com.forth.gulimall.member.entity.MemberStatisticsInfoEntity; +import com.forth.gulimall.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/gulimall-member/src/main/resources/application.properties b/gulimall-member/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/gulimall-member/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gulimall-member/src/main/resources/application.yml b/gulimall-member/src/main/resources/application.yml index fbf75c2..d1f78e7 100644 --- a/gulimall-member/src/main/resources/application.yml +++ b/gulimall-member/src/main/resources/application.yml @@ -1,6 +1,5 @@ server: port: 4002 - spring: datasource: username: root @@ -13,7 +12,6 @@ spring: server-addr: 127.0.0.1:8848 application: name: member - mybatis-plus: mapper-locations: classpath:/mapper/**/*.xml global-config: diff --git a/gulimall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml b/gulimall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml new file mode 100644 index 0000000..5a2b262 --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/GrowthChangeHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml b/gulimall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml new file mode 100644 index 0000000..31295d3 --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/IntegrationChangeHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml new file mode 100644 index 0000000..c28711a --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberCollectSpuDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml new file mode 100644 index 0000000..48f3f4b --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberCollectSubjectDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberDao.xml new file mode 100644 index 0000000..8bcd99b --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberDao.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberLevelDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberLevelDao.xml new file mode 100644 index 0000000..c839527 --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberLevelDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml new file mode 100644 index 0000000..c87909f --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberLoginLogDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml new file mode 100644 index 0000000..cb120d6 --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberReceiveAddressDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml b/gulimall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml new file mode 100644 index 0000000..f52835e --- /dev/null +++ b/gulimall-member/src/main/resources/mapper/member/MemberStatisticsInfoDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory-add-or-update.vue new file mode 100644 index 0000000..38cf021 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory.vue b/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory.vue new file mode 100644 index 0000000..a23fd63 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/growthchangehistory.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory-add-or-update.vue new file mode 100644 index 0000000..d1a0870 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory.vue b/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory.vue new file mode 100644 index 0000000..e572f50 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/integrationchangehistory.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/member-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/member-add-or-update.vue new file mode 100644 index 0000000..e4983cc --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/member-add-or-update.vue @@ -0,0 +1,228 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/member.vue b/gulimall-member/src/main/resources/src/views/modules/member/member.vue new file mode 100644 index 0000000..62f7472 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/member.vue @@ -0,0 +1,259 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu-add-or-update.vue new file mode 100644 index 0000000..9197665 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu.vue b/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu.vue new file mode 100644 index 0000000..587c95f --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/membercollectspu.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject-add-or-update.vue new file mode 100644 index 0000000..f30455d --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject.vue b/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject.vue new file mode 100644 index 0000000..98bfccf --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/membercollectsubject.vue @@ -0,0 +1,181 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberlevel-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberlevel-add-or-update.vue new file mode 100644 index 0000000..962a28e --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberlevel-add-or-update.vue @@ -0,0 +1,156 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberlevel.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberlevel.vue new file mode 100644 index 0000000..0026796 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberlevel.vue @@ -0,0 +1,211 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog-add-or-update.vue new file mode 100644 index 0000000..eeeb059 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog.vue new file mode 100644 index 0000000..43a8074 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberloginlog.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress-add-or-update.vue new file mode 100644 index 0000000..77dda3b --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress-add-or-update.vue @@ -0,0 +1,165 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress.vue new file mode 100644 index 0000000..763e037 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberreceiveaddress.vue @@ -0,0 +1,217 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo-add-or-update.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo-add-or-update.vue new file mode 100644 index 0000000..dbfbbf3 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo-add-or-update.vue @@ -0,0 +1,201 @@ + + + diff --git a/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo.vue b/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo.vue new file mode 100644 index 0000000..8228149 --- /dev/null +++ b/gulimall-member/src/main/resources/src/views/modules/member/memberstatisticsinfo.vue @@ -0,0 +1,241 @@ + + + diff --git a/gulimall-member/src/test/java/com/forth/gulimall/member/GulimallMemberApplicationTests.java b/gulimall-member/src/test/java/com/forth/gulimall/member/GulimallMemberApplicationTests.java new file mode 100644 index 0000000..8775a06 --- /dev/null +++ b/gulimall-member/src/test/java/com/forth/gulimall/member/GulimallMemberApplicationTests.java @@ -0,0 +1,23 @@ +package com.forth.gulimall.member; + +import com.forth.gulimall.member.entity.MemberEntity; +import com.forth.gulimall.member.service.MemberService; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GulimallMemberApplicationTests { + + @Autowired + MemberService memberService; + + @Test + void contextLoads() { + MemberEntity memberEntity = new MemberEntity(); + memberEntity.setCity("新乡"); + memberService.save(memberEntity); + System.out.println("success"); + } + +} diff --git a/gulimall-member/src/test/java/com/forth/member/member/GulimallMemberApplicationTests.java b/gulimall-member/src/test/java/com/forth/member/member/GulimallMemberApplicationTests.java deleted file mode 100644 index f20b072..0000000 --- a/gulimall-member/src/test/java/com/forth/member/member/GulimallMemberApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.forth.member.member; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class GulimallMemberApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/gulimall-order/pom.xml b/gulimall-order/pom.xml index c23aac6..93a74b1 100644 --- a/gulimall-order/pom.xml +++ b/gulimall-order/pom.xml @@ -16,10 +16,15 @@ 1.8 - Hoxton.SR9 + Hoxton.SR8 + + com.forth.gulimall + gulimall-common + 0.0.1-SNAPSHOT + org.springframework.boot spring-boot-starter-web diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/GulimallOrderApplication.java b/gulimall-order/src/main/java/com/forth/gulimall/order/GulimallOrderApplication.java index 6aa646b..9d8be20 100644 --- a/gulimall-order/src/main/java/com/forth/gulimall/order/GulimallOrderApplication.java +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/GulimallOrderApplication.java @@ -1,8 +1,12 @@ package com.forth.gulimall.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; +@EnableDiscoveryClient +@MapperScan("com.forth.gulimall.order.dao") @SpringBootApplication public class GulimallOrderApplication { diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderController.java new file mode 100644 index 0000000..0a32486 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderEntity; +import com.forth.gulimall.order.service.OrderService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 订单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@RestController +@RequestMapping("order/order") +public class OrderController { + @Autowired + private OrderService orderService; + + /** + * 列表 + */ + @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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderItemController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderItemController.java new file mode 100644 index 0000000..f4fc822 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderItemController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderItemEntity; +import com.forth.gulimall.order.service.OrderItemService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 订单项信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderOperateHistoryController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderOperateHistoryController.java new file mode 100644 index 0000000..f919cff --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderOperateHistoryController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderOperateHistoryEntity; +import com.forth.gulimall.order.service.OrderOperateHistoryService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 订单操作历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnApplyController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnApplyController.java new file mode 100644 index 0000000..3fa15d4 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnApplyController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderReturnApplyEntity; +import com.forth.gulimall.order.service.OrderReturnApplyService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 订单退货申请 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnReasonController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnReasonController.java new file mode 100644 index 0000000..ea34175 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderReturnReasonController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderReturnReasonEntity; +import com.forth.gulimall.order.service.OrderReturnReasonService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 退货原因 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderSettingController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderSettingController.java new file mode 100644 index 0000000..e8adac7 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/OrderSettingController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.OrderSettingEntity; +import com.forth.gulimall.order.service.OrderSettingService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 订单配置信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/PaymentInfoController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/PaymentInfoController.java new file mode 100644 index 0000000..d43676a --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/PaymentInfoController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.PaymentInfoEntity; +import com.forth.gulimall.order.service.PaymentInfoService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 支付信息表 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/controller/RefundInfoController.java b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/RefundInfoController.java new file mode 100644 index 0000000..4b03d50 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/controller/RefundInfoController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.order.entity.RefundInfoEntity; +import com.forth.gulimall.order.service.RefundInfoService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 退款信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderDao.java new file mode 100644 index 0000000..6b654cc --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@Mapper +public interface OrderDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderItemDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderItemDao.java new file mode 100644 index 0000000..50d0321 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderItemDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderItemEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单项信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@Mapper +public interface OrderItemDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderOperateHistoryDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderOperateHistoryDao.java new file mode 100644 index 0000000..e2d0f45 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderOperateHistoryDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderOperateHistoryEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单操作历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface OrderOperateHistoryDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnApplyDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnApplyDao.java new file mode 100644 index 0000000..7f70d81 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnApplyDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderReturnApplyEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单退货申请 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface OrderReturnApplyDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnReasonDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnReasonDao.java new file mode 100644 index 0000000..a248fa1 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderReturnReasonDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderReturnReasonEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 退货原因 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface OrderReturnReasonDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderSettingDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderSettingDao.java new file mode 100644 index 0000000..c03e202 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/OrderSettingDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.OrderSettingEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 订单配置信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface OrderSettingDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/PaymentInfoDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/PaymentInfoDao.java new file mode 100644 index 0000000..9229a50 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/PaymentInfoDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.PaymentInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 支付信息表 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface PaymentInfoDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/dao/RefundInfoDao.java b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/RefundInfoDao.java new file mode 100644 index 0000000..27cc5ff --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/dao/RefundInfoDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.order.dao; + +import com.forth.gulimall.order.entity.RefundInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 退款信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@Mapper +public interface RefundInfoDao extends BaseMapper { + +} diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderEntity.java new file mode 100644 index 0000000..84d3247 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderEntity.java @@ -0,0 +1,193 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderItemEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderItemEntity.java new file mode 100644 index 0000000..29fc0fc --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderItemEntity.java @@ -0,0 +1,105 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderOperateHistoryEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderOperateHistoryEntity.java new file mode 100644 index 0000000..e963eba --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderOperateHistoryEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnApplyEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnApplyEntity.java new file mode 100644 index 0000000..f3af98d --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnApplyEntity.java @@ -0,0 +1,137 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnReasonEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnReasonEntity.java new file mode 100644 index 0000000..bf37ac0 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderReturnReasonEntity.java @@ -0,0 +1,44 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderSettingEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderSettingEntity.java new file mode 100644 index 0000000..4de168a --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/OrderSettingEntity.java @@ -0,0 +1,52 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/PaymentInfoEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/PaymentInfoEntity.java new file mode 100644 index 0000000..ea6cc09 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/PaymentInfoEntity.java @@ -0,0 +1,69 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/entity/RefundInfoEntity.java b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/RefundInfoEntity.java new file mode 100644 index 0000000..ab20ee7 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/entity/RefundInfoEntity.java @@ -0,0 +1,53 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +@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/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderItemService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderItemService.java new file mode 100644 index 0000000..d41d5ba --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderItemService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderItemEntity; + +import java.util.Map; + +/** + * 订单项信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +public interface OrderItemService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderOperateHistoryService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderOperateHistoryService.java new file mode 100644 index 0000000..a9e8d70 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderOperateHistoryService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderOperateHistoryEntity; + +import java.util.Map; + +/** + * 订单操作历史记录 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface OrderOperateHistoryService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnApplyService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnApplyService.java new file mode 100644 index 0000000..70e09ab --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnApplyService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderReturnApplyEntity; + +import java.util.Map; + +/** + * 订单退货申请 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface OrderReturnApplyService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnReasonService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnReasonService.java new file mode 100644 index 0000000..afb72ac --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderReturnReasonService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderReturnReasonEntity; + +import java.util.Map; + +/** + * 退货原因 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface OrderReturnReasonService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderService.java new file mode 100644 index 0000000..a9ce303 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderEntity; + +import java.util.Map; + +/** + * 订单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:19 + */ +public interface OrderService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderSettingService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderSettingService.java new file mode 100644 index 0000000..37dc348 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/OrderSettingService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.OrderSettingEntity; + +import java.util.Map; + +/** + * 订单配置信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface OrderSettingService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/PaymentInfoService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/PaymentInfoService.java new file mode 100644 index 0000000..f8ce4b0 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/PaymentInfoService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.PaymentInfoEntity; + +import java.util.Map; + +/** + * 支付信息表 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface PaymentInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/RefundInfoService.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/RefundInfoService.java new file mode 100644 index 0000000..46d1f0c --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/RefundInfoService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.order.entity.RefundInfoEntity; + +import java.util.Map; + +/** + * 退款信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:13:18 + */ +public interface RefundInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderItemServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderItemServiceImpl.java new file mode 100644 index 0000000..22ed3f8 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderItemServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderItemDao; +import com.forth.gulimall.order.entity.OrderItemEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderOperateHistoryServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderOperateHistoryServiceImpl.java new file mode 100644 index 0000000..1ab8a80 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderOperateHistoryServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderOperateHistoryDao; +import com.forth.gulimall.order.entity.OrderOperateHistoryEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnApplyServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnApplyServiceImpl.java new file mode 100644 index 0000000..b0d4ba7 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnApplyServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderReturnApplyDao; +import com.forth.gulimall.order.entity.OrderReturnApplyEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnReasonServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnReasonServiceImpl.java new file mode 100644 index 0000000..9804b5a --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderReturnReasonServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderReturnReasonDao; +import com.forth.gulimall.order.entity.OrderReturnReasonEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java new file mode 100644 index 0000000..14bf2f6 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderDao; +import com.forth.gulimall.order.entity.OrderEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderSettingServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderSettingServiceImpl.java new file mode 100644 index 0000000..d005c95 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/OrderSettingServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.OrderSettingDao; +import com.forth.gulimall.order.entity.OrderSettingEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/PaymentInfoServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/PaymentInfoServiceImpl.java new file mode 100644 index 0000000..d664125 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/PaymentInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.PaymentInfoDao; +import com.forth.gulimall.order.entity.PaymentInfoEntity; +import com.forth.gulimall.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/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/RefundInfoServiceImpl.java b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/RefundInfoServiceImpl.java new file mode 100644 index 0000000..5021a95 --- /dev/null +++ b/gulimall-order/src/main/java/com/forth/gulimall/order/service/impl/RefundInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.order.dao.RefundInfoDao; +import com.forth.gulimall.order.entity.RefundInfoEntity; +import com.forth.gulimall.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/gulimall-order/src/main/resources/application.properties b/gulimall-order/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/gulimall-order/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gulimall-order/src/main/resources/application.yml b/gulimall-order/src/main/resources/application.yml new file mode 100644 index 0000000..7b61523 --- /dev/null +++ b/gulimall-order/src/main/resources/application.yml @@ -0,0 +1,19 @@ +server: + port: 4003 +spring: + datasource: + username: root + password: root + url: jdbc:mysql://39.97.249.66:3306/gulimall_oms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: order +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + global-config: + db-config: + id-type: auto diff --git a/gulimall-order/src/main/resources/mapper/order/OrderDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderDao.xml new file mode 100644 index 0000000..60a9b90 --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderDao.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/OrderItemDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderItemDao.xml new file mode 100644 index 0000000..81f9579 --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderItemDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml new file mode 100644 index 0000000..791e50e --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderOperateHistoryDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml new file mode 100644 index 0000000..5b8f941 --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderReturnApplyDao.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml new file mode 100644 index 0000000..6faec7d --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderReturnReasonDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/OrderSettingDao.xml b/gulimall-order/src/main/resources/mapper/order/OrderSettingDao.xml new file mode 100644 index 0000000..b6a557c --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/OrderSettingDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/PaymentInfoDao.xml b/gulimall-order/src/main/resources/mapper/order/PaymentInfoDao.xml new file mode 100644 index 0000000..9dd828b --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/PaymentInfoDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/mapper/order/RefundInfoDao.xml b/gulimall-order/src/main/resources/mapper/order/RefundInfoDao.xml new file mode 100644 index 0000000..cf793d5 --- /dev/null +++ b/gulimall-order/src/main/resources/mapper/order/RefundInfoDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-order/src/main/resources/src/views/modules/order/order-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/order-add-or-update.vue new file mode 100644 index 0000000..30c6d1a --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/order-add-or-update.vue @@ -0,0 +1,444 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/order.vue b/gulimall-order/src/main/resources/src/views/modules/order/order.vue new file mode 100644 index 0000000..c2615f5 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/order.vue @@ -0,0 +1,403 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderitem-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderitem-add-or-update.vue new file mode 100644 index 0000000..230153c --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderitem-add-or-update.vue @@ -0,0 +1,246 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderitem.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderitem.vue new file mode 100644 index 0000000..da32e68 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderitem.vue @@ -0,0 +1,271 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory-add-or-update.vue new file mode 100644 index 0000000..6f77c46 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory.vue new file mode 100644 index 0000000..8fcca82 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderoperatehistory.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply-add-or-update.vue new file mode 100644 index 0000000..784e496 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply-add-or-update.vue @@ -0,0 +1,318 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply.vue new file mode 100644 index 0000000..97ffde6 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnapply.vue @@ -0,0 +1,319 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason-add-or-update.vue new file mode 100644 index 0000000..eb71508 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason.vue b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason.vue new file mode 100644 index 0000000..cace13e --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/orderreturnreason.vue @@ -0,0 +1,181 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/ordersetting-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/ordersetting-add-or-update.vue new file mode 100644 index 0000000..9cf5907 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/ordersetting-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/ordersetting.vue b/gulimall-order/src/main/resources/src/views/modules/order/ordersetting.vue new file mode 100644 index 0000000..531a648 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/ordersetting.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo-add-or-update.vue new file mode 100644 index 0000000..e66334f --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo-add-or-update.vue @@ -0,0 +1,165 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo.vue b/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo.vue new file mode 100644 index 0000000..8ddbc5b --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/paymentinfo.vue @@ -0,0 +1,217 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/refundinfo-add-or-update.vue b/gulimall-order/src/main/resources/src/views/modules/order/refundinfo-add-or-update.vue new file mode 100644 index 0000000..c76a044 --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/refundinfo-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-order/src/main/resources/src/views/modules/order/refundinfo.vue b/gulimall-order/src/main/resources/src/views/modules/order/refundinfo.vue new file mode 100644 index 0000000..87b422e --- /dev/null +++ b/gulimall-order/src/main/resources/src/views/modules/order/refundinfo.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-order/src/test/java/com/forth/gulimall/order/GulimallOrderApplicationTests.java b/gulimall-order/src/test/java/com/forth/gulimall/order/GulimallOrderApplicationTests.java index 85743ed..a607241 100644 --- a/gulimall-order/src/test/java/com/forth/gulimall/order/GulimallOrderApplicationTests.java +++ b/gulimall-order/src/test/java/com/forth/gulimall/order/GulimallOrderApplicationTests.java @@ -1,13 +1,25 @@ package com.forth.gulimall.order; +import com.forth.gulimall.order.entity.OrderEntity; +import com.forth.gulimall.order.service.OrderService; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import java.util.Date; + @SpringBootTest class GulimallOrderApplicationTests { + @Autowired + OrderService orderService; + @Test void contextLoads() { + OrderEntity orderEntity = new OrderEntity(); + orderEntity.setCreateTime(new Date()); + orderService.save(orderEntity); + System.out.println("success"); } } diff --git a/gulimall-ware/pom.xml b/gulimall-ware/pom.xml index c8ec3eb..8490084 100644 --- a/gulimall-ware/pom.xml +++ b/gulimall-ware/pom.xml @@ -12,11 +12,11 @@ gulimall-ware 0.0.1-SNAPSHOT gulimall-ware - 谷粒商城-存储服务 + 谷粒商城-仓储服务 1.8 - Hoxton.SR9 + Hoxton.SR8 diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/gulimallware/GulimallWareApplication.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/GulimallWareApplication.java similarity index 57% rename from gulimall-ware/src/main/java/com/forth/gulimall/gulimallware/GulimallWareApplication.java rename to gulimall-ware/src/main/java/com/forth/gulimall/ware/GulimallWareApplication.java index b79710c..ca897ad 100644 --- a/gulimall-ware/src/main/java/com/forth/gulimall/gulimallware/GulimallWareApplication.java +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/GulimallWareApplication.java @@ -1,8 +1,12 @@ -package com.forth.gulimall.gulimallware; +package com.forth.gulimall.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; +@EnableDiscoveryClient +@MapperScan("com.forth.gulimall.ware.dao") @SpringBootApplication public class GulimallWareApplication { diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseController.java new file mode 100644 index 0000000..202eddd --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.PurchaseEntity; +import com.forth.gulimall.ware.service.PurchaseService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 采购信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseDetailController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseDetailController.java new file mode 100644 index 0000000..e917beb --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/PurchaseDetailController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.PurchaseDetailEntity; +import com.forth.gulimall.ware.service.PurchaseDetailService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/UndoLogController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/UndoLogController.java new file mode 100644 index 0000000..e52e05c --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/UndoLogController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.UndoLogEntity; +import com.forth.gulimall.ware.service.UndoLogService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@RestController +@RequestMapping("ware/undolog") +public class UndoLogController { + @Autowired + private UndoLogService undoLogService; + + /** + * 列表 + */ + @RequestMapping("/list") + //@RequiresPermissions("ware:undolog:list") + public R list(@RequestParam Map params){ + PageUtils page = undoLogService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + //@RequiresPermissions("ware:undolog:info") + public R info(@PathVariable("id") Long id){ + UndoLogEntity undoLog = undoLogService.getById(id); + + return R.ok().put("undoLog", undoLog); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //@RequiresPermissions("ware:undolog:save") + public R save(@RequestBody UndoLogEntity undoLog){ + undoLogService.save(undoLog); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + //@RequiresPermissions("ware:undolog:update") + public R update(@RequestBody UndoLogEntity undoLog){ + undoLogService.updateById(undoLog); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + //@RequiresPermissions("ware:undolog:delete") + public R delete(@RequestBody Long[] ids){ + undoLogService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareInfoController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareInfoController.java new file mode 100644 index 0000000..94e22c2 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareInfoController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.WareInfoEntity; +import com.forth.gulimall.ware.service.WareInfoService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 仓库信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskController.java new file mode 100644 index 0000000..90614a1 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.WareOrderTaskEntity; +import com.forth.gulimall.ware.service.WareOrderTaskService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskDetailController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskDetailController.java new file mode 100644 index 0000000..e9271df --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareOrderTaskDetailController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.WareOrderTaskDetailEntity; +import com.forth.gulimall.ware.service.WareOrderTaskDetailService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareSkuController.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareSkuController.java new file mode 100644 index 0000000..a60ce5a --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/controller/WareSkuController.java @@ -0,0 +1,90 @@ +package com.forth.gulimall.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.forth.gulimall.ware.entity.WareSkuEntity; +import com.forth.gulimall.ware.service.WareSkuService; +import com.forth.common.utils.PageUtils; +import com.forth.common.utils.R; + + + +/** + * 商品库存 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:04 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDao.java new file mode 100644 index 0000000..5875cb9 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.PurchaseEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 采购信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface PurchaseDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDetailDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDetailDao.java new file mode 100644 index 0000000..062d5d5 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/PurchaseDetailDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.PurchaseDetailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface PurchaseDetailDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/UndoLogDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/UndoLogDao.java new file mode 100644 index 0000000..5cac502 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/UndoLogDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.UndoLogEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface UndoLogDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareInfoDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareInfoDao.java new file mode 100644 index 0000000..db85603 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareInfoDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.WareInfoEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface WareInfoDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDao.java new file mode 100644 index 0000000..f36187e --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.WareOrderTaskEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface WareOrderTaskDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDetailDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDetailDao.java new file mode 100644 index 0000000..4ce2c88 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareOrderTaskDetailDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.WareOrderTaskDetailEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Mapper +public interface WareOrderTaskDetailDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareSkuDao.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareSkuDao.java new file mode 100644 index 0000000..0a63796 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/dao/WareSkuDao.java @@ -0,0 +1,17 @@ +package com.forth.gulimall.ware.dao; + +import com.forth.gulimall.ware.entity.WareSkuEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * 商品库存 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:04 + */ +@Mapper +public interface WareSkuDao extends BaseMapper { + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseDetailEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseDetailEntity.java new file mode 100644 index 0000000..e338274 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseDetailEntity.java @@ -0,0 +1,53 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseEntity.java new file mode 100644 index 0000000..b85574d --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/PurchaseEntity.java @@ -0,0 +1,65 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Data +@TableName("wms_purchase") +public class PurchaseEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId + private Long id; + /** + * + */ + private Long assigneeId; + /** + * + */ + private String assigneeName; + /** + * + */ + private String phone; + /** + * + */ + private Integer priority; + /** + * + */ + private Integer status; + /** + * + */ + private Long wareId; + /** + * + */ + private BigDecimal amount; + /** + * + */ + private Date createTime; + /** + * + */ + private Date updateTime; + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/UndoLogEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/UndoLogEntity.java new file mode 100644 index 0000000..1cc82ef --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/UndoLogEntity.java @@ -0,0 +1,60 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@Data +@TableName("undo_log") +public class UndoLogEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId + private Long id; + /** + * + */ + private Long branchId; + /** + * + */ + private String xid; + /** + * + */ + private String context; + /** + * Longblob + */ + private Byte[] rollbackInfo; + /** + * + */ + private Integer logStatus; + /** + * + */ + private Date logCreated; + /** + * + */ + private Date logModified; + /** + * + */ + private String ext; + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareInfoEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareInfoEntity.java new file mode 100644 index 0000000..5b40eae --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareInfoEntity.java @@ -0,0 +1,40 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskDetailEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskDetailEntity.java new file mode 100644 index 0000000..f0a3905 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskDetailEntity.java @@ -0,0 +1,52 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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; + /** + * 仓库id + */ + private Long wareId; + /** + * 1-已锁定 2-已解锁 3-扣减 + */ + private Integer lockStatus; + +} diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskEntity.java new file mode 100644 index 0000000..691d3eb --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareOrderTaskEntity.java @@ -0,0 +1,80 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareSkuEntity.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareSkuEntity.java new file mode 100644 index 0000000..a3122d5 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/entity/WareSkuEntity.java @@ -0,0 +1,48 @@ +package com.forth.gulimall.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 fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:04 + */ +@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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseDetailService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseDetailService.java new file mode 100644 index 0000000..6931554 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseDetailService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.PurchaseDetailEntity; + +import java.util.Map; + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface PurchaseDetailService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseService.java new file mode 100644 index 0000000..cfff641 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/PurchaseService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.PurchaseEntity; + +import java.util.Map; + +/** + * 采购信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface PurchaseService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/UndoLogService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/UndoLogService.java new file mode 100644 index 0000000..6958c14 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/UndoLogService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.UndoLogEntity; + +import java.util.Map; + +/** + * + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface UndoLogService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareInfoService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareInfoService.java new file mode 100644 index 0000000..514f03e --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareInfoService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.WareInfoEntity; + +import java.util.Map; + +/** + * 仓库信息 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface WareInfoService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskDetailService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskDetailService.java new file mode 100644 index 0000000..e2d5913 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskDetailService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.WareOrderTaskDetailEntity; + +import java.util.Map; + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface WareOrderTaskDetailService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskService.java new file mode 100644 index 0000000..ad33ed3 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareOrderTaskService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.WareOrderTaskEntity; + +import java.util.Map; + +/** + * 库存工作单 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:05 + */ +public interface WareOrderTaskService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareSkuService.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareSkuService.java new file mode 100644 index 0000000..e314615 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/WareSkuService.java @@ -0,0 +1,20 @@ +package com.forth.gulimall.ware.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.forth.common.utils.PageUtils; +import com.forth.gulimall.ware.entity.WareSkuEntity; + +import java.util.Map; + +/** + * 商品库存 + * + * @author fourth-miaowei + * @email 2608957980@qq.com + * @date 2020-11-12 09:55:04 + */ +public interface WareSkuService extends IService { + + PageUtils queryPage(Map params); +} + diff --git a/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseDetailServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseDetailServiceImpl.java new file mode 100644 index 0000000..98450b2 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseDetailServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.PurchaseDetailDao; +import com.forth.gulimall.ware.entity.PurchaseDetailEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseServiceImpl.java new file mode 100644 index 0000000..45b3424 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/PurchaseServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.PurchaseDao; +import com.forth.gulimall.ware.entity.PurchaseEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/UndoLogServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/UndoLogServiceImpl.java new file mode 100644 index 0000000..e688d7c --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/UndoLogServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.UndoLogDao; +import com.forth.gulimall.ware.entity.UndoLogEntity; +import com.forth.gulimall.ware.service.UndoLogService; + + +@Service("undoLogService") +public class UndoLogServiceImpl extends ServiceImpl implements UndoLogService { + + @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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareInfoServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareInfoServiceImpl.java new file mode 100644 index 0000000..0a2e500 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareInfoServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.WareInfoDao; +import com.forth.gulimall.ware.entity.WareInfoEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskDetailServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskDetailServiceImpl.java new file mode 100644 index 0000000..d638f49 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskDetailServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.WareOrderTaskDetailDao; +import com.forth.gulimall.ware.entity.WareOrderTaskDetailEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskServiceImpl.java new file mode 100644 index 0000000..b50a8f3 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareOrderTaskServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.WareOrderTaskDao; +import com.forth.gulimall.ware.entity.WareOrderTaskEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareSkuServiceImpl.java b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareSkuServiceImpl.java new file mode 100644 index 0000000..92c2168 --- /dev/null +++ b/gulimall-ware/src/main/java/com/forth/gulimall/ware/service/impl/WareSkuServiceImpl.java @@ -0,0 +1,29 @@ +package com.forth.gulimall.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.forth.common.utils.PageUtils; +import com.forth.common.utils.Query; + +import com.forth.gulimall.ware.dao.WareSkuDao; +import com.forth.gulimall.ware.entity.WareSkuEntity; +import com.forth.gulimall.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/gulimall-ware/src/main/resources/application.properties b/gulimall-ware/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/gulimall-ware/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gulimall-ware/src/main/resources/application.yml b/gulimall-ware/src/main/resources/application.yml new file mode 100644 index 0000000..2a99b0d --- /dev/null +++ b/gulimall-ware/src/main/resources/application.yml @@ -0,0 +1,21 @@ +server: + port: 4004 +spring: + datasource: + username: root + password: root + url: jdbc:mysql://39.97.249.66:3306/gulimall_wms + driver-class-name: com.mysql.cj.jdbc.Driver + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + application: + name: ware +mybatis-plus: + mapper-locations: classpath:/mapper/**/*.xml + global-config: + db-config: + id-type: auto + + diff --git a/gulimall-ware/src/main/resources/mapper/ware/PurchaseDao.xml b/gulimall-ware/src/main/resources/mapper/ware/PurchaseDao.xml new file mode 100644 index 0000000..51fbc14 --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/PurchaseDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml b/gulimall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml new file mode 100644 index 0000000..7b5429b --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/PurchaseDetailDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/UndoLogDao.xml b/gulimall-ware/src/main/resources/mapper/ware/UndoLogDao.xml new file mode 100644 index 0000000..c6f5105 --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/UndoLogDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/WareInfoDao.xml b/gulimall-ware/src/main/resources/mapper/ware/WareInfoDao.xml new file mode 100644 index 0000000..e80ec8f --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/WareInfoDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml b/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml new file mode 100644 index 0000000..9a52b08 --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml b/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml new file mode 100644 index 0000000..dcd047a --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/WareOrderTaskDetailDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/mapper/ware/WareSkuDao.xml b/gulimall-ware/src/main/resources/mapper/ware/WareSkuDao.xml new file mode 100644 index 0000000..474ba8c --- /dev/null +++ b/gulimall-ware/src/main/resources/mapper/ware/WareSkuDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/purchase-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/purchase-add-or-update.vue new file mode 100644 index 0000000..78d6a2a --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/purchase-add-or-update.vue @@ -0,0 +1,156 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/purchase.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/purchase.vue new file mode 100644 index 0000000..7a31ad5 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/purchase.vue @@ -0,0 +1,211 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail-add-or-update.vue new file mode 100644 index 0000000..fd95559 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail.vue new file mode 100644 index 0000000..dd3c6db --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/purchasedetail.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/undolog-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/undolog-add-or-update.vue new file mode 100644 index 0000000..21b036b --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/undolog-add-or-update.vue @@ -0,0 +1,147 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/undolog.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/undolog.vue new file mode 100644 index 0000000..90c9b0d --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/undolog.vue @@ -0,0 +1,205 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo-add-or-update.vue new file mode 100644 index 0000000..d3bcd32 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo-add-or-update.vue @@ -0,0 +1,102 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo.vue new file mode 100644 index 0000000..a468834 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareinfo.vue @@ -0,0 +1,175 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask-add-or-update.vue new file mode 100644 index 0000000..6baca95 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask-add-or-update.vue @@ -0,0 +1,192 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask.vue new file mode 100644 index 0000000..ac648d5 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertask.vue @@ -0,0 +1,235 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail-add-or-update.vue new file mode 100644 index 0000000..bd380ad --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail-add-or-update.vue @@ -0,0 +1,129 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail.vue new file mode 100644 index 0000000..7bf75ab --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/wareordertaskdetail.vue @@ -0,0 +1,193 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/waresku-add-or-update.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/waresku-add-or-update.vue new file mode 100644 index 0000000..06f97fe --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/waresku-add-or-update.vue @@ -0,0 +1,120 @@ + + + diff --git a/gulimall-ware/src/main/resources/src/views/modules/ware/waresku.vue b/gulimall-ware/src/main/resources/src/views/modules/ware/waresku.vue new file mode 100644 index 0000000..bbf1735 --- /dev/null +++ b/gulimall-ware/src/main/resources/src/views/modules/ware/waresku.vue @@ -0,0 +1,187 @@ + + + diff --git a/gulimall-ware/src/test/java/com/forth/gulimall/gulimallware/GulimallWareApplicationTests.java b/gulimall-ware/src/test/java/com/forth/gulimall/gulimallware/GulimallWareApplicationTests.java deleted file mode 100644 index ab36317..0000000 --- a/gulimall-ware/src/test/java/com/forth/gulimall/gulimallware/GulimallWareApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.forth.gulimall.gulimallware; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class GulimallWareApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/gulimall-ware/src/test/java/com/forth/gulimall/ware/GulimallWareApplicationTests.java b/gulimall-ware/src/test/java/com/forth/gulimall/ware/GulimallWareApplicationTests.java new file mode 100644 index 0000000..ded3acd --- /dev/null +++ b/gulimall-ware/src/test/java/com/forth/gulimall/ware/GulimallWareApplicationTests.java @@ -0,0 +1,23 @@ +package com.forth.gulimall.ware; + +import com.forth.gulimall.ware.entity.WareInfoEntity; +import com.forth.gulimall.ware.service.WareInfoService; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GulimallWareApplicationTests { + + @Autowired + WareInfoService wareInfoService; + + @Test + void contextLoads() { + WareInfoEntity wareInfoEntity = new WareInfoEntity(); + wareInfoEntity.setName("测试"); + wareInfoService.save(wareInfoEntity); + System.out.println("success"); + } + +} diff --git a/renren-generator/src/main/resources/application.yml b/renren-generator/src/main/resources/application.yml index 7fee9f7..6e01f4a 100644 --- a/renren-generator/src/main/resources/application.yml +++ b/renren-generator/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.97.249.66:3306/gulimall_pms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://39.97.249.66:3306/gulimall_sms?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: root #oracle配置 diff --git a/renren-generator/src/main/resources/generator.properties b/renren-generator/src/main/resources/generator.properties index c11e793..5fcc1ae 100644 --- a/renren-generator/src/main/resources/generator.properties +++ b/renren-generator/src/main/resources/generator.properties @@ -3,13 +3,13 @@ mainPath=com.forth #\u5305\u540D package=com.forth.gulimall -moduleName=product +moduleName=coupon #\u4F5C\u8005 author=fourth-miaowei #Email email=2608957980@qq.com #\u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00) -tablePrefix=pms_ +tablePrefix=sms_ #\u7C7B\u578B\u8F6C\u6362\uFF0C\u914D\u7F6E\u4FE1\u606F tinyint=Integer -- Gitee