From 42c6389023bdd44263d0973cf1a7ca6c07c4735f Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 22 Aug 2020 18:33:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E7=9A=84=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order}/order-service-impl/pom.xml | 0 .../biz/constants/OrderDeliveryTypeEnum.java | 0 .../constants/OrderExchangeReasonEnum.java | 0 .../biz/constants/OrderRecipientTypeEnum.java | 0 .../biz/constants/OrderReturnReasonEnum.java | 0 .../biz/convert/OrderCommentConvert.java | 0 .../biz/convert/OrderCommentReplyConvert.java | 0 .../mall/order/biz/convert/OrderConvert.java | 0 .../order/biz/convert/OrderItemConvert.java | 0 .../biz/convert/OrderLogisticsConvert.java | 0 .../convert/OrderLogisticsDetailConvert.java | 0 .../biz/convert/OrderRecipientConvert.java | 0 .../order/biz/convert/OrderReturnConvert.java | 0 .../mall/order/biz/dao/OrderCancelMapper.java | 0 .../order/biz/dao/OrderCommentMapper.java | 0 .../biz/dao/OrderCommentReplayMapper.java | 0 .../mall/order/biz/dao/OrderItemMapper.java | 0 .../biz/dao/OrderLogisticsDetailMapper.java | 0 .../order/biz/dao/OrderLogisticsMapper.java | 0 .../mall/order/biz/dao/OrderMapper.java | 0 .../order/biz/dao/OrderRecipientMapper.java | 0 .../mall/order/biz/dao/OrderReturnMapper.java | 0 .../order/biz/dataobject/OrderCancelDO.java | 0 .../order/biz/dataobject/OrderCommentDO.java | 0 .../biz/dataobject/OrderCommentReplyDO.java | 0 .../mall/order/biz/dataobject/OrderDO.java | 0 .../order/biz/dataobject/OrderExchangeDO.java | 0 .../order/biz/dataobject/OrderItemDO.java | 0 .../biz/dataobject/OrderLogisticsDO.java | 0 .../dataobject/OrderLogisticsDetailDO.java | 0 .../biz/dataobject/OrderPreferentialDO.java | 0 .../biz/dataobject/OrderRecipientDO.java | 0 .../order/biz/dataobject/OrderReturnDO.java | 0 .../mall/order/biz/dataobject/README.md | 0 .../order/biz/job/AutomaticCommentJob.java | 0 .../service/OrderCommentReplyServiceImpl.java | 0 .../biz/service/OrderCommentServiceImpl.java | 0 .../service/OrderLogisticsServiceImpl.java | 0 .../biz/service/OrderReturnServiceImpl.java | 0 .../order/biz/service/OrderServiceImpl.java | 0 .../main/resources/config/application.yaml | 0 .../src/main/resources/mapper/CartMapper.xml | 0 .../resources/mapper/OrderCancelMapper.xml | 0 .../resources/mapper/OrderCommentMapper.xml | 0 .../mapper/OrderCommentReplayMapper.xml | 0 .../main/resources/mapper/OrderItemMapper.xml | 0 .../mapper/OrderLogisticsDetailMapper.xml | 0 .../resources/mapper/OrderLogisticsMapper.xml | 0 .../src/main/resources/mapper/OrderMapper.xml | 0 .../resources/mapper/OrderRecipientMapper.xml | 0 .../resources/mapper/OrderReturnMapper.xml | 0 .../src/main/resources/sql/mall_order.sql | 0 .../biz/service/OrderCommentJobTest.java | 0 .../mall/order/biz/OrderApplicationTest.java | 13 --- .../order/biz/mapper/OrderMapperTest.java | 35 -------- .../biz/service/OrderServiceImplTest.java | 51 ------------ .../users/UsersCouponController.java | 71 ---------------- .../vo/users/UsersCouponTemplateVO.java | 54 ------------- .../promotion/CouponTemplateController.java | 34 ++++++++ .../coupon/template/CouponTemplateRespVO.java | 80 +++++++++++++++++++ .../promotion/CouponTemplateConvert.java | 15 ++++ .../promotion/CouponTemplateManager.java | 25 ++++++ 62 files changed, 154 insertions(+), 224 deletions(-) rename {order => moved/order}/order-service-impl/pom.xml (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderDeliveryTypeEnum.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderExchangeReasonEnum.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderRecipientTypeEnum.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderReturnReasonEnum.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentReplyConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderItemConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsDetailConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCancelMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentReplayMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderItemMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsDetailMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplyDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderPreferentialDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/README.md (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/job/AutomaticCommentJob.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java (100%) rename {order => moved/order}/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java (100%) rename {order => moved/order}/order-service-impl/src/main/resources/config/application.yaml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/CartMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderCancelMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderCommentMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderCommentReplayMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderLogisticsDetailMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml (100%) rename {order => moved/order}/order-service-impl/src/main/resources/sql/mall_order.sql (100%) rename {order => moved/order}/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderCommentJobTest.java (100%) delete mode 100644 order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/OrderApplicationTest.java delete mode 100644 order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/mapper/OrderMapperTest.java delete mode 100644 order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java delete mode 100644 promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java delete mode 100644 promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponTemplateVO.java create mode 100644 shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/CouponTemplateController.java create mode 100644 shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/vo/coupon/template/CouponTemplateRespVO.java create mode 100644 shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/promotion/CouponTemplateConvert.java create mode 100644 shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/promotion/CouponTemplateManager.java diff --git a/order/order-service-impl/pom.xml b/moved/order/order-service-impl/pom.xml similarity index 100% rename from order/order-service-impl/pom.xml rename to moved/order/order-service-impl/pom.xml diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderDeliveryTypeEnum.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderDeliveryTypeEnum.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderDeliveryTypeEnum.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderDeliveryTypeEnum.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderExchangeReasonEnum.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderExchangeReasonEnum.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderExchangeReasonEnum.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderExchangeReasonEnum.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderRecipientTypeEnum.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderRecipientTypeEnum.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderRecipientTypeEnum.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderRecipientTypeEnum.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderReturnReasonEnum.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderReturnReasonEnum.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderReturnReasonEnum.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/constants/OrderReturnReasonEnum.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentReplyConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentReplyConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentReplyConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderCommentReplyConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderItemConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderItemConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderItemConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderItemConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsDetailConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsDetailConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsDetailConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderLogisticsDetailConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderRecipientConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCancelMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCancelMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCancelMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCancelMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentReplayMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentReplayMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentReplayMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderCommentReplayMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderItemMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderItemMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderItemMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderItemMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsDetailMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsDetailMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsDetailMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsDetailMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderLogisticsMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderRecipientMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCancelDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplyDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplyDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplyDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderCommentReplyDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderExchangeDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderItemDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderLogisticsDetailDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderPreferentialDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderPreferentialDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderPreferentialDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderPreferentialDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderRecipientDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/OrderReturnDO.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/README.md b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/README.md similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/README.md rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dataobject/README.md diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/job/AutomaticCommentJob.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/job/AutomaticCommentJob.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/job/AutomaticCommentJob.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/job/AutomaticCommentJob.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentReplyServiceImpl.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderCommentServiceImpl.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderLogisticsServiceImpl.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java diff --git a/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java b/moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java similarity index 100% rename from order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java rename to moved/order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderServiceImpl.java diff --git a/order/order-service-impl/src/main/resources/config/application.yaml b/moved/order/order-service-impl/src/main/resources/config/application.yaml similarity index 100% rename from order/order-service-impl/src/main/resources/config/application.yaml rename to moved/order/order-service-impl/src/main/resources/config/application.yaml diff --git a/order/order-service-impl/src/main/resources/mapper/CartMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/CartMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/CartMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/CartMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderCancelMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderCancelMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderCancelMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderCancelMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderCommentMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderCommentMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderCommentMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderCommentMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderCommentReplayMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderCommentReplayMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderCommentReplayMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderCommentReplayMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderItemMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderLogisticsDetailMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderLogisticsDetailMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderLogisticsDetailMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderLogisticsDetailMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderLogisticsMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderRecipientMapper.xml diff --git a/order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml b/moved/order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml similarity index 100% rename from order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml rename to moved/order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml diff --git a/order/order-service-impl/src/main/resources/sql/mall_order.sql b/moved/order/order-service-impl/src/main/resources/sql/mall_order.sql similarity index 100% rename from order/order-service-impl/src/main/resources/sql/mall_order.sql rename to moved/order/order-service-impl/src/main/resources/sql/mall_order.sql diff --git a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderCommentJobTest.java b/moved/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderCommentJobTest.java similarity index 100% rename from order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderCommentJobTest.java rename to moved/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderCommentJobTest.java diff --git a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/OrderApplicationTest.java b/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/OrderApplicationTest.java deleted file mode 100644 index 3cce3b6b..00000000 --- a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/OrderApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.iocoder.mall.order.biz; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication(scanBasePackages = "cn.iocoder.mall.order") -public class OrderApplicationTest { - - public static void main(String[] args) { - SpringApplication.run(OrderApplicationTest.class, args); - } - -} \ No newline at end of file diff --git a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/mapper/OrderMapperTest.java b/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/mapper/OrderMapperTest.java deleted file mode 100644 index d30fdaa9..00000000 --- a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/mapper/OrderMapperTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.iocoder.mall.order.biz.mapper; - -import cn.iocoder.mall.order.biz.OrderApplicationTest; -import cn.iocoder.mall.order.biz.dao.OrderMapper; -import cn.iocoder.mall.order.biz.dataobject.OrderDO; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; - -/** - * mapper test - * - * @author Sin - * @time 2019/5/13 10:45 PM - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = OrderApplicationTest.class) -@Transactional -public class OrderMapperTest { - - @Autowired - private OrderMapper orderMapper; - - @Test - public void updateByIdTest() { - int id = 47; -// int updateStatus = 99; -// int res = orderMapper.update(new OrderDO().setStatus(id), new UpdateWrapper().eq("id", updateStatus)); - OrderDO orderDO = orderMapper.selectById(id); -// Assert.assertTrue(orderDO.getStatus() == updateStatus); - } -} diff --git a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java b/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java deleted file mode 100644 index a92cb9ff..00000000 --- a/order/order-service-impl/src/test/java/cn/iocoder/mall/order/biz/service/OrderServiceImplTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.iocoder.mall.order.biz.service; - -import cn.iocoder.mall.order.biz.OrderApplicationTest; -import cn.iocoder.mall.order.api.OrderService; -import cn.iocoder.mall.order.biz.dao.OrderMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.transaction.annotation.Transactional; - -/** - * 订单 service test - * - * @author Sin - * @time 2019-03-17 10:34 - */ -@RunWith(SpringRunner.class) -@SpringBootTest(classes = OrderApplicationTest.class) -@Transactional -public class OrderServiceImplTest { - - @Autowired - private OrderService orderService; - @Autowired - private OrderMapper orderMapper; - - @Test - public void createOrderTest() { -// -// Integer userId = 1; -// OrderCreateItemDTO orderCreateItemDTO -// = new OrderCreateItemDTO() -// .setSkuId(1) -// .setQuantity(1); -// -// CommonResult result = orderService.createOrder( -// userId, -// new OrderCreateDTO() -// .setRemark("") -// .setName("张三") -// .setMobile("13301926050") -// .setAddress("深圳市福田区") -// .setAreaNo("1000100") -// .setOrderItems(Arrays.asList(orderCreateItemDTO))); -// -// OrderDO orderDO = orderMapper.selectById(result.getData().getId()); -// Assert.assertNotNull("创建的订单不存在!", orderDO); - } -} diff --git a/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java b/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java deleted file mode 100644 index cb4f095c..00000000 --- a/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/controller/users/UsersCouponController.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.mall.promotion.application.controller.users; - -import cn.iocoder.common.framework.vo.CommonResult; -import cn.iocoder.mall.promotion.api.CouponService; -import cn.iocoder.mall.promotion.api.bo.CouponCardBO; -import cn.iocoder.mall.promotion.api.bo.CouponCardPageBO; -import cn.iocoder.mall.promotion.api.bo.CouponTemplateBO; -import cn.iocoder.mall.promotion.api.dto.CouponCardPageDTO; -import cn.iocoder.mall.promotion.application.convert.CouponCardConvert; -import cn.iocoder.mall.promotion.application.convert.CouponTemplateConvert; -import cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardPageVO; -import cn.iocoder.mall.promotion.application.vo.users.UsersCouponCardVO; -import cn.iocoder.mall.promotion.application.vo.users.UsersCouponTemplateVO; -import cn.iocoder.mall.security.core.context.UserSecurityContextHolder; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.apache.dubbo.config.annotation.Reference; -import org.springframework.web.bind.annotation.*; - -import static cn.iocoder.common.framework.vo.CommonResult.success; - -@RestController -@RequestMapping("users/coupon") -@Api("优惠劵（码）模块") -public class UsersCouponController { - - @Reference(validation = "true", version = "${dubbo.provider.CouponService.version}") - private CouponService couponService; - - // ========== 优惠劵（码）模板 ========== - - @GetMapping("/template/get") - @ApiOperation(value = "优惠劵（码）模板信息") - @ApiImplicitParam(name = "id", value = "优惠劵（码）模板编号", required = true, example = "10") - public CommonResult templateGet(@RequestParam("id") Integer id) { - CouponTemplateBO template = couponService.getCouponTemplate(id); - return success(CouponTemplateConvert.USERS.convert2(template)); - } - - // ========== 优惠劵 ========== - - @GetMapping("/card/page") - @ApiOperation(value = "优惠劵分页") - @ApiImplicitParams({ - @ApiImplicitParam(name = "status", value = "状态", example = "参考 CouponCardStatusEnum 枚举"), - @ApiImplicitParam(name = "pageNo", value = "页码，从 1 开始", example = "1"), - @ApiImplicitParam(name = "pageSize", value = "每页条数", required = true, example = "10"), - }) - public CommonResult cardPage(@RequestParam(value = "status", required = false) Integer status, - @RequestParam(value = "pageNo", defaultValue = "0") Integer pageNo, - @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { - CouponCardPageBO result = couponService.getCouponCardPage(new CouponCardPageDTO() - .setStatus(status).setUserId(UserSecurityContextHolder.getContext().getUserId()) - .setPageNo(pageNo).setPageSize(pageSize)); - return success(CouponCardConvert.INSTANCE.convert2(result)); - } - - @PostMapping("/card/add") - @ApiOperation(value = "领取优惠劵") - @ApiImplicitParam(name = "templateId", value = "优惠劵（码）模板编号", required = true, example = "10") - public CommonResult cardAdd(@RequestParam("templateId") Integer templateId) { - CouponCardBO result = couponService.addCouponCard(UserSecurityContextHolder.getContext().getUserId(), templateId); - return success(CouponCardConvert.INSTANCE.convert(result)); - } - - // ========== 优惠码 ========== - - -} diff --git a/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponTemplateVO.java b/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponTemplateVO.java deleted file mode 100644 index c664d348..00000000 --- a/promotion/promotion-start/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersCouponTemplateVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package cn.iocoder.mall.promotion.application.vo.users; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.Date; - -@ApiModel("CouponTemplate VO") -@Data -@Accessors(chain = true) -public class UsersCouponTemplateVO { - - // ========== 基本信息 BEGIN ========== - @ApiModelProperty(value = "模板编号，自增唯一", required = true, example = "1") - private Integer id; - @ApiModelProperty(value = "标题", required = true, example = "优惠劵牛逼") - private String title; - @ApiModelProperty(value = "优惠码状态", required = true, example = "参见 CouponTemplateStatusEnum 枚举") - private Integer status; - // ========== 领取规则 END ========== - - // ========== 使用规则 BEGIN ========== - @ApiModelProperty(value = "是否设置满多少金额可用，单位：分", required = true, example = "0-不限制；大于0-多少金额可用") - private Integer priceAvailable; - @ApiModelProperty(value = "可用范围的类型", required = true, example = "参见 CouponTemplateRangeTypeEnum 枚举") - private Integer rangeType; - @ApiModelProperty(value = "指定商品 / 分类列表，使用逗号分隔商品编号", example = "参见 CouponTemplateRangeTypeEnum 枚举") - private String rangeValues; - @ApiModelProperty(value = "生效日期类型", example = "参见 CouponTemplateDateTypeEnum 枚举") - private Integer dateType; - @ApiModelProperty(value = "固定日期-生效开始时间") - private Date validStartTime; - @ApiModelProperty(value = "固定日期-生效结束时间") - private Date validEndTime; - @ApiModelProperty(value = "领取日期-开始天数", example = "例如，0-当天；1-次天") - private Integer fixedStartTerm; - @ApiModelProperty(value = "领取日期-结束天数") - private Integer fixedEndTerm; - // ========== 使用规则 END ========== - - // ========== 使用效果 BEGIN ========== - @ApiModelProperty(value = "优惠类型", required = true, example = "参见 CouponTemplatePreferentialTypeEnum 枚举") - private Integer preferentialType; - @ApiModelProperty(value = "折扣百分比") - private Integer percentOff; - @ApiModelProperty(value = "优惠金额，单位：分") - private Integer priceOff; - @ApiModelProperty(value = "折扣上限") - private Integer discountPriceLimit; - // ========== 使用效果 END ========== - -} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/CouponTemplateController.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/CouponTemplateController.java new file mode 100644 index 00000000..1bc141d4 --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/CouponTemplateController.java @@ -0,0 +1,34 @@ +package cn.iocoder.mall.shopweb.controller.promotion; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.shopweb.controller.promotion.vo.coupon.template.CouponTemplateRespVO; +import cn.iocoder.mall.shopweb.manager.promotion.CouponTemplateManager; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import static cn.iocoder.common.framework.vo.CommonResult.success; + +@RestController +@RequestMapping("/promotion/coupon-template") +@Api(tags = "优惠劵（码）模板 API") +@Validated +public class CouponTemplateController { + + @Autowired + private CouponTemplateManager couponTemplateManager; + + @GetMapping("/get") + @ApiOperation(value = "优惠劵（码）模板信息") + @ApiImplicitParam(name = "id", value = "优惠劵（码）模板编号", required = true, example = "10") + public CommonResult getCouponTemplate(@RequestParam("id") Integer id) { + return success(couponTemplateManager.getCouponTemplate(id)); + } + +} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/vo/coupon/template/CouponTemplateRespVO.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/vo/coupon/template/CouponTemplateRespVO.java new file mode 100644 index 00000000..f45d5912 --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/promotion/vo/coupon/template/CouponTemplateRespVO.java @@ -0,0 +1,80 @@ +package cn.iocoder.mall.shopweb.controller.promotion.vo.coupon.template; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.Date; +import java.util.List; + +@ApiModel("优惠劵（码）模板 VO") +@Data +@Accessors(chain = true) +public class CouponTemplateRespVO { + + // ========== 基本信息 BEGIN ========== + @ApiModelProperty(value = "模板编号，自增唯一", required = true, example = "1") + private Integer id; + @ApiModelProperty(value = "标题", required = true, example = "优惠劵牛逼") + private String title; + @ApiModelProperty(value = "使用说明", required = true, example = "我只是描述") + private String description; + @ApiModelProperty(value = "优惠劵类型", required = true, example = "1", notes = "参见 CouponTemplateTypeEnum 枚举") + private Integer type; + /** + * 码类型 + * + * 1-一卡一码（UNIQUE） + * 2-通用码（GENERAL） + * + * 【优惠码独有】 @see CouponCodeDO + */ + private Integer codeType; + @ApiModelProperty(value = "优惠码状态", required = true, example = "1", notes = "参见 CouponTemplateStatusEnum 枚举") + private Integer status; + @ApiModelProperty(value = "每人限领个数", example = "1", notes = "null - 则表示不限制") + private Integer quota; + @ApiModelProperty(value = "发放总量", example = "100") + private Integer total; + // ========== 领取规则 END ========== + + // ========== 使用规则 BEGIN ========== + @ApiModelProperty(value = "是否设置满多少金额可用，单位：分", required = true, example = "0", notes = "0-不限制；大于0-多少金额可用") + private Integer priceAvailable; + @ApiModelProperty(value = "可用范围的类型", required = true, example = "10", notes = "参见 RangeTypeEnum 枚举") + private Integer rangeType; + @ApiModelProperty(value = "指定商品 / 分类列表，使用逗号分隔商品编号", example = "1,3,5") + private List rangeValues; + @ApiModelProperty(value = "生效日期类型", example = "1", notes = "参见 CouponTemplateDateTypeEnum 枚举") + private Integer dateType; + @ApiModelProperty(value = "固定日期-生效开始时间", notes = "当 dateType 为固定日期时，非空") + private Date validStartTime; + @ApiModelProperty(value = "固定日期-生效结束时间", notes = "当 dateType 为固定日期时，非空") + private Date validEndTime; + @ApiModelProperty(value = "领取日期-开始天数", example = "0", notes = "例如，0-当天；1-次天") + private Integer fixedStartTerm; + @ApiModelProperty(value = "领取日期-结束天数", example = "1", notes = "当 dateType 为领取日期时，非空") + private Integer fixedEndTerm; + // ========== 使用规则 END ========== + + // ========== 使用效果 BEGIN ========== + @ApiModelProperty(value = "优惠类型", required = true, example = "1", notes = "参见 PreferentialTypeEnum 枚举") + private Integer preferentialType; + @ApiModelProperty(value = "折扣百分比", example = "80", notes = "当 preferentialType 为现金券时，非空") + private Integer percentOff; + @ApiModelProperty(value = "优惠金额，单位：分", example = "100", notes = "当 preferentialType 为折扣卷时，非空") + private Integer priceOff; + @ApiModelProperty(value = "折扣上限", example = "100", notes = "当 preferentialType 为折扣卷时，非空") + private Integer discountPriceLimit; + // ========== 使用效果 END ========== + + // ========== 统计信息 BEGIN ========== + @ApiModelProperty(value = "领取优惠券的次数", required = true) + private Integer statFetchNum; + // ========== 统计信息 END ========== + + @ApiModelProperty(value = "创建时间", required = true) + private Date createTime; + +} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/promotion/CouponTemplateConvert.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/promotion/CouponTemplateConvert.java new file mode 100644 index 00000000..b098ea73 --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/promotion/CouponTemplateConvert.java @@ -0,0 +1,15 @@ +package cn.iocoder.mall.shopweb.convert.promotion; + +import cn.iocoder.mall.promotion.api.rpc.coupon.dto.template.CouponTemplateRespDTO; +import cn.iocoder.mall.shopweb.controller.promotion.vo.coupon.template.CouponTemplateRespVO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface CouponTemplateConvert { + + CouponTemplateConvert INSTANCE = Mappers.getMapper(CouponTemplateConvert.class); + + CouponTemplateRespVO convert(CouponTemplateRespDTO bean); + +} diff --git a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/promotion/CouponTemplateManager.java b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/promotion/CouponTemplateManager.java new file mode 100644 index 00000000..30fb8015 --- /dev/null +++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/manager/promotion/CouponTemplateManager.java @@ -0,0 +1,25 @@ +package cn.iocoder.mall.shopweb.manager.promotion; + +import cn.iocoder.common.framework.vo.CommonResult; +import cn.iocoder.mall.promotion.api.rpc.coupon.CouponTemplateRpc; +import cn.iocoder.mall.promotion.api.rpc.coupon.dto.template.CouponTemplateRespDTO; +import cn.iocoder.mall.shopweb.controller.promotion.vo.coupon.template.CouponTemplateRespVO; +import cn.iocoder.mall.shopweb.convert.promotion.CouponTemplateConvert; +import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.stereotype.Service; + +/** + * 优惠劵（码）模板 Manager + */ +@Service +public class CouponTemplateManager { + + @DubboReference(version = "${dubbo.consumer.CouponTemplateRpc.version}") + private CouponTemplateRpc couponTemplateRpc; + + public CouponTemplateRespVO getCouponTemplate(Integer id) { + CommonResult getCouponTemplateResult = couponTemplateRpc.getCouponTemplate(id); + getCouponTemplateResult.checkError(); + return CouponTemplateConvert.INSTANCE.convert(getCouponTemplateResult.getData()); + } +}