From 0ac8e86472690e8c31f24faa990c2933e6889f27 Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Wed, 28 Jun 2023 13:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAmanager=E5=92=8CH5=E4=B8=A4=E5=A4=A7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 60 +++++++++++++++++++ .../web/core/config/H5MemberInterceptor.java | 4 +- ruoyi-admin/src/main/resources/logback.xml | 6 +- .../com/fjp/lc/test/service/ServiceTest.java | 23 ++++++- .../com/fjp/lc/test/service/WechatTest.java | 2 +- .../com/ruoyi/common/utils/ResponseUtils.java | 26 ++++++++ .../src/test/resources/application.yml | 2 +- .../java/com/cyl/h5/config/SecurityUtil.java | 3 +- .../com/cyl/h5/controller/CartController.java | 19 ++---- .../cyl/h5/controller/CategoryController.java | 4 +- .../cyl/h5/controller/H5CommonController.java | 6 +- .../controller/H5MemberAddressController.java | 6 +- .../cyl/h5/controller/H5MemberController.java | 2 +- .../cyl/h5/controller/H5OrderController.java | 8 +-- .../h5/controller/H5ProductController.java | 8 +-- .../com/cyl/h5/controller/HomeController.java | 2 +- .../com/cyl/h5/controller/UserController.java | 6 +- .../cyl/h5/controller/WechatController.java | 2 +- .../cyl/h5/pojo/dto/OrderProductListDTO.java | 4 +- .../java/com/cyl/h5/pojo/vo/OrderCalcVO.java | 1 - .../com/cyl/h5/pojo/vo/ProductDetail.java | 6 +- .../h5/service/H5MemberAddressService.java | 11 ++-- .../com/cyl/h5/service/H5MemberService.java | 6 +- .../oms/controller/AftersaleController.java | 12 ++-- .../controller/AftersaleItemController.java | 12 ++-- .../oms/controller/OrderController.java | 12 ++-- .../OrderDeliveryHistoryController.java | 12 ++-- .../oms/controller/OrderItemController.java | 12 ++-- .../OrderOperateHistoryController.java | 12 ++-- .../oms/convert/AftersaleConvert.java | 6 +- .../oms/convert/AftersaleItemConvert.java | 6 +- .../oms/convert/OrderConvert.java | 6 +- .../convert/OrderDeliveryHistoryConvert.java | 6 +- .../oms/convert/OrderItemConvert.java | 6 +- .../convert/OrderOperateHistoryConvert.java | 6 +- .../{ => manager}/oms/domain/Aftersale.java | 2 +- .../oms/domain/AftersaleItem.java | 2 +- .../cyl/{ => manager}/oms/domain/Order.java | 2 +- .../oms/domain/OrderDeliveryHistory.java | 2 +- .../{ => manager}/oms/domain/OrderItem.java | 2 +- .../oms/domain/OrderOperateHistory.java | 2 +- .../oms/mapper/AftersaleItemMapper.java | 5 +- .../oms/mapper/AftersaleMapper.java | 5 +- .../mapper/OrderDeliveryHistoryMapper.java | 5 +- .../oms/mapper/OrderItemMapper.java | 5 +- .../{ => manager}/oms/mapper/OrderMapper.java | 5 +- .../oms/mapper/OrderOperateHistoryMapper.java | 5 +- .../oms/pojo/dto/SaveOrderItemDTO.java | 4 ++ .../oms/pojo/query/AftersaleItemQuery.java | 2 +- .../oms/pojo/query/AftersaleQuery.java | 2 +- .../pojo/query/OrderDeliveryHistoryQuery.java | 2 +- .../oms/pojo/query/OrderItemQuery.java | 2 +- .../pojo/query/OrderOperateHistoryQuery.java | 2 +- .../oms/pojo/query/OrderQuery.java | 7 ++- .../oms/pojo/vo/AftersaleItemVO.java | 3 +- .../oms/pojo/vo/AftersaleVO.java | 2 +- .../oms/pojo/vo/OrderDeliveryHistoryVO.java | 3 +- .../oms/pojo/vo/OrderItemVO.java | 3 +- .../oms/pojo/vo/OrderOperateHistoryVO.java | 3 +- .../{ => manager}/oms/pojo/vo/OrderVO.java | 5 +- .../oms/service/AftersaleItemService.java | 10 ++-- .../oms/service/AftersaleService.java | 11 ++-- .../service/OrderDeliveryHistoryService.java | 9 ++- .../oms/service/OrderItemService.java | 11 ++-- .../service/OrderOperateHistoryService.java | 9 ++- .../oms/service/OrderService.java | 54 +++++++---------- .../pms/controller/BrandController.java | 12 ++-- .../controller/ProductCategoryController.java | 17 +++--- .../pms/controller/ProductController.java | 12 ++-- .../pms/controller/SkuController.java | 12 ++-- .../pms/convert/BrandConvert.java | 6 +- .../pms/convert/ProductCategoryConvert.java | 6 +- .../pms/convert/ProductConvert.java | 6 +- .../{ => manager}/pms/convert/SkuConvert.java | 6 +- .../cyl/{ => manager}/pms/domain/Brand.java | 2 +- .../cyl/{ => manager}/pms/domain/Product.java | 2 +- .../pms/domain/ProductCategory.java | 2 +- .../com/cyl/{ => manager}/pms/domain/Sku.java | 2 +- .../{ => manager}/pms/mapper/BrandMapper.java | 5 +- .../pms/mapper/ProductCategoryMapper.java | 5 +- .../pms/mapper/ProductMapper.java | 5 +- .../{ => manager}/pms/mapper/SkuMapper.java | 5 +- .../pms/pojo/dto/MemberCartDTO.java | 4 +- .../pms/pojo/query/BrandQuery.java | 2 +- .../pms/pojo/query/ProductCategoryQuery.java | 2 +- .../pms/pojo/query/ProductQuery.java | 3 +- .../pms/pojo/query/SkuQuery.java | 2 +- .../{ => manager}/pms/pojo/vo/BrandVO.java | 3 +- .../pms/pojo/vo/ProductCategoryVO.java | 5 +- .../{ => manager}/pms/pojo/vo/ProductVO.java | 5 +- .../cyl/{ => manager}/pms/pojo/vo/SkuVO.java | 3 +- .../pms/service/BrandService.java | 9 ++- .../pms/service/ProductCategoryService.java | 18 +++--- .../pms/service/ProductService.java | 23 +++---- .../{ => manager}/pms/service/SkuService.java | 9 ++- .../controller/MemberAddressController.java | 14 ++--- .../ums/controller/MemberCartController.java | 16 ++--- .../ums/controller/MemberController.java | 14 ++--- .../controller/MemberWechatController.java | 12 ++-- .../ums/convert/MemberAddressConvert.java | 6 +- .../ums/convert/MemberCartConvert.java | 12 ++-- .../ums/convert/MemberConvert.java | 6 +- .../ums/convert/MemberWechatConvert.java | 7 +-- .../cyl/{ => manager}/ums/domain/Address.java | 2 +- .../cyl/{ => manager}/ums/domain/Member.java | 2 +- .../ums/domain/MemberAddress.java | 2 +- .../{ => manager}/ums/domain/MemberCart.java | 2 +- .../ums/domain/MemberWechat.java | 2 +- .../ums/mapper/AddressMapper.java | 4 +- .../ums/mapper/MemberAddressMapper.java | 5 +- .../ums/mapper/MemberCartMapper.java | 5 +- .../ums/mapper/MemberMapper.java | 5 +- .../ums/mapper/MemberWechatMapper.java | 5 +- .../ums/pojo/dto/AddressDTO.java | 2 +- .../ums/pojo/dto/ChangeMemberStatusDTO.java | 2 +- .../ums/pojo/dto/MemberAddressDTO.java | 2 +- .../ums/pojo/query/MemberAddressQuery.java | 2 +- .../ums/pojo/query/MemberCartQuery.java | 2 +- .../ums/pojo/query/MemberQuery.java | 2 +- .../ums/pojo/query/MemberWechatQuery.java | 2 +- .../ums/pojo/vo/MemberAddressVO.java | 3 +- .../ums/pojo/vo/MemberCartVO.java | 3 +- .../{ => manager}/ums/pojo/vo/MemberVO.java | 3 +- .../ums/pojo/vo/MemberWechatVO.java | 2 +- .../ums/pojo/vo/form/AddMemberCartForm.java | 4 +- .../pojo/vo/form/UpdateMemberCartForm.java | 2 +- .../ums/service/MemberAddressService.java | 11 ++-- .../ums/service/MemberCartService.java | 27 ++++----- .../ums/service/MemberService.java | 16 ++--- .../ums/service/MemberWechatService.java | 16 ++--- .../cyl/oms/pojo/dto/SaveOrderItemDTO.java | 4 -- .../java/com/cyl/pay/domain/PayOrder.java | 4 -- .../java/com/cyl/pay/pojo/vo/PayOrderVO.java | 4 -- .../sms/{ => controller}/SmsController.java | 2 +- .../mapper/oms/AftersaleItemMapper.xml | 2 +- .../resources/mapper/oms/AftersaleMapper.xml | 2 +- .../mapper/oms/OrderDeliveryHistoryMapper.xml | 2 +- .../resources/mapper/oms/OrderItemMapper.xml | 2 +- .../main/resources/mapper/oms/OrderMapper.xml | 2 +- .../mapper/oms/OrderOperateHistoryMapper.xml | 2 +- .../main/resources/mapper/pms/BrandMapper.xml | 2 +- .../mapper/pms/ProductCategoryMapper.xml | 2 +- .../resources/mapper/pms/ProductMapper.xml | 2 +- .../main/resources/mapper/pms/SkuMapper.xml | 2 +- .../resources/mapper/ums/AddressMapper.xml | 2 +- .../mapper/ums/MemberAddressMapper.xml | 2 +- .../resources/mapper/ums/MemberCartMapper.xml | 2 +- .../resources/mapper/ums/MemberMapper.xml | 2 +- .../mapper/ums/MemberWechatMapper.xml | 2 +- 149 files changed, 489 insertions(+), 481 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/ResponseUtils.java rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/AftersaleController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/AftersaleItemController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/OrderController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/OrderDeliveryHistoryController.java (91%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/OrderItemController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/controller/OrderOperateHistoryController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/AftersaleConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/AftersaleItemConvert.java (65%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/OrderConvert.java (69%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/OrderDeliveryHistoryConvert.java (65%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/OrderItemConvert.java (67%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/convert/OrderOperateHistoryConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/Aftersale.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/AftersaleItem.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/Order.java (99%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/OrderDeliveryHistory.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/OrderItem.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/domain/OrderOperateHistory.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/AftersaleItemMapper.java (78%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/AftersaleMapper.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/OrderDeliveryHistoryMapper.java (79%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/OrderItemMapper.java (80%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/OrderMapper.java (76%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/mapper/OrderOperateHistoryMapper.java (80%) create mode 100644 ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/AftersaleItemQuery.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/AftersaleQuery.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/OrderDeliveryHistoryQuery.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/OrderItemQuery.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/OrderOperateHistoryQuery.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/query/OrderQuery.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/AftersaleItemVO.java (89%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/AftersaleVO.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/OrderDeliveryHistoryVO.java (87%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/OrderItemVO.java (95%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/OrderOperateHistoryVO.java (91%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/pojo/vo/OrderVO.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/AftersaleItemService.java (91%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/AftersaleService.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/OrderDeliveryHistoryService.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/OrderItemService.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/OrderOperateHistoryService.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/oms/service/OrderService.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/controller/BrandController.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/controller/ProductCategoryController.java (86%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/controller/ProductController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/controller/SkuController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/convert/BrandConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/convert/ProductCategoryConvert.java (71%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/convert/ProductConvert.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/convert/SkuConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/domain/Brand.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/domain/Product.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/domain/ProductCategory.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/domain/Sku.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/mapper/BrandMapper.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/mapper/ProductCategoryMapper.java (78%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/mapper/ProductMapper.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/mapper/SkuMapper.java (76%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/dto/MemberCartDTO.java (62%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/query/BrandQuery.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/query/ProductCategoryQuery.java (95%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/query/ProductQuery.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/query/SkuQuery.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/vo/BrandVO.java (87%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/vo/ProductCategoryVO.java (79%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/vo/ProductVO.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/pojo/vo/SkuVO.java (89%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/service/BrandService.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/service/ProductCategoryService.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/service/ProductService.java (88%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/pms/service/SkuService.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/controller/MemberAddressController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/controller/MemberCartController.java (90%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/controller/MemberController.java (91%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/controller/MemberWechatController.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/convert/MemberAddressConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/convert/MemberCartConvert.java (72%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/convert/MemberConvert.java (66%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/convert/MemberWechatConvert.java (70%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/domain/Address.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/domain/Member.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/domain/MemberAddress.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/domain/MemberCart.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/domain/MemberWechat.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/mapper/AddressMapper.java (84%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/mapper/MemberAddressMapper.java (82%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/mapper/MemberCartMapper.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/mapper/MemberMapper.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/mapper/MemberWechatMapper.java (79%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/dto/AddressDTO.java (88%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/dto/ChangeMemberStatusDTO.java (76%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/dto/MemberAddressDTO.java (90%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/query/MemberAddressQuery.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/query/MemberCartQuery.java (95%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/query/MemberQuery.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/query/MemberWechatQuery.java (97%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/MemberAddressVO.java (93%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/MemberCartVO.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/MemberVO.java (96%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/MemberWechatVO.java (98%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/form/AddMemberCartForm.java (77%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/pojo/vo/form/UpdateMemberCartForm.java (91%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/service/MemberAddressService.java (94%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/service/MemberCartService.java (92%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/service/MemberService.java (89%) rename ruoyi-mall/src/main/java/com/cyl/{ => manager}/ums/service/MemberWechatService.java (94%) delete mode 100644 ruoyi-mall/src/main/java/com/cyl/oms/pojo/dto/SaveOrderItemDTO.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/pay/domain/PayOrder.java delete mode 100644 ruoyi-mall/src/main/java/com/cyl/pay/pojo/vo/PayOrderVO.java rename ruoyi-mall/src/main/java/com/cyl/sms/{ => controller}/SmsController.java (94%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 84a5f3c..5d54b4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -1,8 +1,14 @@ package com.ruoyi.web.controller.common; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.cyl.manager.ums.domain.Address; +import com.cyl.manager.ums.mapper.AddressMapper; +import com.cyl.manager.ums.pojo.dto.AddressDTO; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.common.utils.file.FileUtils; @@ -19,6 +25,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.*; +import java.util.stream.Collectors; /** * 通用请求处理 @@ -33,6 +41,12 @@ public class CommonController @Autowired private ServerConfig serverConfig; + @Autowired + private RedisService redisService; + + @Autowired + private AddressMapper addressMapper; + /** * 通用下载请求 * @@ -117,4 +131,50 @@ public class CommonController log.error("下载文件失败", e); } } + + @GetMapping("/common/area") + public AjaxResult getAddressList() { + String addresses = redisService.getAddressList(); + if (org.apache.commons.lang3.StringUtils.isNotEmpty(addresses)) { + return AjaxResult.success(JSON.parseArray(addresses, AddressDTO.class)); + } + QueryWrapper
addressQueryWrapper = new QueryWrapper<>(); + addressQueryWrapper.in("level", Arrays.asList(0,1,2)); + List
addressList = addressMapper.selectList(addressQueryWrapper); + Map> cityMap = addressList.stream().filter(it -> it.getLevel() == 1).collect(Collectors.groupingBy(it -> it.getParentCode())); + Map> districtMap = addressList.stream().filter(it -> it.getLevel() == 2).collect(Collectors.groupingBy(it -> it.getParentCode())); + List result = new ArrayList<>(); + addressList.stream().filter(it -> it.getLevel() == 0).forEach(it -> { + AddressDTO dto = new AddressDTO(); + dto.setId(it.getCode()); + dto.setLevel("province"); + dto.setName(it.getName()); + dto.setPid(0L); + //获取城市列表 + List child = new ArrayList<>(); + if (cityMap.containsKey(it.getCode())) { + cityMap.get(it.getCode()).forEach(city -> { + AddressDTO cityDto = new AddressDTO(); + cityDto.setId(city.getCode()); + cityDto.setLevel("city"); + cityDto.setName(city.getName()); + cityDto.setPid(city.getParentCode()); + cityDto.setChildren(districtMap.containsKey(city.getCode()) ? + districtMap.get(city.getCode()).stream().map(district -> { + AddressDTO districtDto = new AddressDTO(); + districtDto.setId(district.getCode()); + districtDto.setLevel("district"); + districtDto.setName(district.getName()); + districtDto.setPid(district.getParentCode()); + return districtDto; + }).collect(Collectors.toList()) : Collections.EMPTY_LIST); + child.add(cityDto); + }); + } + dto.setChildren(child); + result.add(dto); + }); + redisService.setAddressList(JSON.toJSONString(result)); + return AjaxResult.success(result); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java index 8ad40f2..6759cb6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/H5MemberInterceptor.java @@ -1,7 +1,7 @@ package com.ruoyi.web.core.config; -import com.cyl.ums.domain.Member; -import com.cyl.ums.service.MemberService; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.service.MemberService; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.core.domain.model.LoginMember; diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index a7a7140..22d1822 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -67,9 +67,9 @@ - - - + + + diff --git a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java index 2c7f6f3..0ec77df 100644 --- a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java +++ b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/ServiceTest.java @@ -1,15 +1,18 @@ package com.fjp.lc.test.service; -import com.cyl.ums.service.MemberCartService; +import cn.hutool.core.util.CharsetUtil; +import cn.hutool.crypto.SecureUtil; +import cn.hutool.crypto.symmetric.AES; +import com.cyl.manager.ums.service.MemberCartService; import com.ruoyi.RuoYiApplication; import com.ruoyi.common.config.properties.SmsProperties; import com.ruoyi.common.core.sms.AliyunSmsTemplate; import com.ruoyi.common.core.sms.SmsTemplate; -import com.ruoyi.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @@ -28,11 +31,13 @@ public class ServiceTest { @Autowired private SmsProperties smsProperties; + @Value("${aes.key}") + private String key; + @Test public void test1() { memberCartService.mineCartNum(); } - @Test public void test2(){ System.out.println(smsProperties); @@ -45,4 +50,16 @@ public class ServiceTest { Object send = smsTemplate.send("15706259078", "SMS_146125046", map); log.info("短信发送结果：" + send); } + + @Test + public void test3(){ + String content = "test中文"; + AES aes = SecureUtil.aes(key.getBytes()); + byte[] encrypt = aes.encrypt(content); + byte[] decrypt = aes.decrypt(encrypt); + String encryptHex = aes.encryptHex(content); + System.out.println("加密后16进制：" + encryptHex); + String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8); + System.out.println("解密：" + decryptStr); + } } diff --git a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java index a8ebdf0..cb462a3 100644 --- a/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java +++ b/ruoyi-admin/src/test/java/com/fjp/lc/test/service/WechatTest.java @@ -1,7 +1,7 @@ package com.fjp.lc.test.service; import com.cyl.h5.pojo.vo.form.WechatLoginForm; -import com.cyl.ums.service.MemberWechatService; +import com.cyl.manager.ums.service.MemberWechatService; import com.ruoyi.RuoYiApplication; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ResponseUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ResponseUtils.java new file mode 100644 index 0000000..692ed61 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ResponseUtils.java @@ -0,0 +1,26 @@ +package com.ruoyi.common.utils; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.util.MultiValueMap; + +import java.util.ArrayList; +import java.util.List; + +public class ResponseUtils { + + private static final String MESSAGE = "msg"; + private static final String CODE = "code"; + private static final String DATA = "data"; + + private ResponseUtils(){} + + private static ResponseEntity getEntity(Object body, HttpStatus statusCode){ + MultiValueMap headers = new HttpHeaders(); + List contentType = new ArrayList(); + contentType.add("application/json;charset=utf-8"); + headers.put("Content-Type", contentType); + return new ResponseEntity(body, headers, statusCode); + } +} diff --git a/ruoyi-generator/src/test/resources/application.yml b/ruoyi-generator/src/test/resources/application.yml index 0e1221c..39cedb5 100644 --- a/ruoyi-generator/src/test/resources/application.yml +++ b/ruoyi-generator/src/test/resources/application.yml @@ -27,7 +27,7 @@ gen: # 作者 author: zcc # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.cyl.pms + packageName: com.cyl.manager.pms # 自动去除表前缀，默认是false autoRemovePre: true # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java b/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java index f14cd9e..aacc66a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/config/SecurityUtil.java @@ -1,7 +1,6 @@ package com.cyl.h5.config; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.ums.domain.Member; +import com.cyl.manager.ums.domain.Member; import com.ruoyi.common.constant.Constants; import com.ruoyi.framework.config.LocalDataUtil; import org.springframework.stereotype.Service; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CartController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CartController.java index cd4f519..5c7a144 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CartController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CartController.java @@ -1,25 +1,18 @@ package com.cyl.h5.controller; -import com.cyl.pms.pojo.dto.MemberCartDTO; -import com.cyl.ums.convert.MemberCartConvert; -import com.cyl.ums.domain.Member; -import com.cyl.ums.domain.MemberCart; -import com.cyl.ums.pojo.query.MemberCartQuery; -import com.cyl.ums.pojo.vo.MemberCartVO; -import com.cyl.ums.pojo.vo.form.AddMemberCartForm; -import com.cyl.ums.pojo.vo.form.UpdateMemberCartForm; -import com.cyl.ums.service.MemberCartService; +import com.cyl.manager.ums.convert.MemberCartConvert; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.pojo.query.MemberCartQuery; +import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.service.MemberCartService; import com.ruoyi.common.constant.Constants; import com.ruoyi.framework.config.LocalDataUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.ArrayList; import java.util.List; @RestController diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java index 9a6a080..36e4a1c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/CategoryController.java @@ -1,7 +1,7 @@ package com.cyl.h5.controller; -import com.cyl.pms.domain.ProductCategory; -import com.cyl.pms.service.ProductCategoryService; +import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.service.ProductCategoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java index db54253..24eb6e4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java @@ -2,9 +2,9 @@ package com.cyl.h5.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.ums.domain.Address; -import com.cyl.ums.mapper.AddressMapper; -import com.cyl.ums.pojo.dto.AddressDTO; +import com.cyl.manager.ums.domain.Address; +import com.cyl.manager.ums.mapper.AddressMapper; +import com.cyl.manager.ums.pojo.dto.AddressDTO; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.utils.OssUtils; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java index 26f3414..1587c28 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberAddressController.java @@ -1,10 +1,8 @@ package com.cyl.h5.controller; import com.cyl.h5.service.H5MemberAddressService; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.pojo.dto.MemberAddressDTO; -import com.cyl.ums.pojo.vo.MemberAddressVO; -import com.ruoyi.common.core.domain.AjaxResult; +import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; +import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java index 7849e50..b893050 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5MemberController.java @@ -5,7 +5,7 @@ import com.cyl.h5.pojo.response.RegisterResponse; import com.cyl.h5.pojo.response.ValidatePhoneResponse; import com.cyl.h5.pojo.response.H5LoginResponse; import com.cyl.h5.service.H5MemberService; -import com.cyl.ums.pojo.vo.MemberVO; +import com.cyl.manager.ums.pojo.vo.MemberVO; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java index ae8a9b4..65763f1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5OrderController.java @@ -4,9 +4,9 @@ import com.cyl.h5.pojo.dto.OrderCreateDTO; import com.cyl.h5.pojo.vo.OrderCalcVO; import com.cyl.h5.pojo.vo.form.OrderSubmitForm; import com.cyl.h5.pojo.vo.query.OrderH5Query; -import com.cyl.oms.pojo.vo.OrderVO; -import com.cyl.oms.service.OrderService; -import com.cyl.ums.domain.Member; +import com.cyl.manager.oms.pojo.vo.OrderVO; +import com.cyl.manager.oms.service.OrderService; +import com.cyl.manager.ums.domain.Member; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.framework.config.LocalDataUtil; @@ -21,8 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - @RestController @RequestMapping("/h5/order") @Slf4j diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java index f12f47a..ac302aa 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5ProductController.java @@ -2,10 +2,10 @@ package com.cyl.h5.controller; import com.cyl.h5.pojo.dto.ProductDTO; import com.cyl.h5.pojo.vo.ProductDetail; -import com.cyl.pms.convert.ProductConvert; -import com.cyl.pms.domain.Product; -import com.cyl.pms.pojo.query.ProductQuery; -import com.cyl.pms.service.ProductService; +import com.cyl.manager.pms.convert.ProductConvert; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.service.ProductService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java index 37a45ef..b3de72f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/HomeController.java @@ -1,7 +1,7 @@ package com.cyl.h5.controller; import com.cyl.h5.pojo.vo.HomeConfigVO; -import com.cyl.pms.service.ProductCategoryService; +import com.cyl.manager.pms.service.ProductCategoryService; import com.ruoyi.system.service.ISysConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java index 219e8dc..061b231 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/UserController.java @@ -1,8 +1,8 @@ package com.cyl.h5.controller; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.pojo.query.MemberAddressQuery; -import com.cyl.ums.service.MemberAddressService; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.pojo.query.MemberAddressQuery; +import com.cyl.manager.ums.service.MemberAddressService; import com.ruoyi.common.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java index 6b9e70a..95a53aa 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/WechatController.java @@ -2,7 +2,7 @@ package com.cyl.h5.controller; import com.cyl.external.WechatUtil; import com.cyl.h5.pojo.vo.form.WechatLoginForm; -import com.cyl.ums.service.MemberWechatService; +import com.cyl.manager.ums.service.MemberWechatService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java index ee0d9d3..0f96d07 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/dto/OrderProductListDTO.java @@ -1,7 +1,7 @@ package com.cyl.h5.pojo.dto; - import com.cyl.pms.domain.Product; - import com.cyl.pms.domain.Sku; + import com.cyl.manager.pms.domain.Product; + import com.cyl.manager.pms.domain.Sku; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java index a656ea2..31cf021 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/OrderCalcVO.java @@ -1,6 +1,5 @@ package com.cyl.h5.pojo.vo; -import com.cyl.pms.pojo.vo.SkuVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java index a80f798..26314cf 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/ProductDetail.java @@ -1,8 +1,8 @@ package com.cyl.h5.pojo.vo; -import com.cyl.pms.domain.Brand; -import com.cyl.pms.domain.Product; -import com.cyl.pms.domain.Sku; +import com.cyl.manager.pms.domain.Brand; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.domain.Sku; import lombok.Data; import java.util.List; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java index c7be2b8..6172678 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberAddressService.java @@ -1,11 +1,11 @@ package com.cyl.h5.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.ums.domain.Member; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.mapper.MemberAddressMapper; -import com.cyl.ums.pojo.dto.MemberAddressDTO; -import com.cyl.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.mapper.MemberAddressMapper; +import com.cyl.manager.ums.pojo.dto.MemberAddressDTO; +import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.PhoneUtils; @@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java index 41f6802..52e77a8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberService.java @@ -9,9 +9,9 @@ import com.cyl.h5.pojo.request.RegisterRequest; import com.cyl.h5.pojo.response.RegisterResponse; import com.cyl.h5.pojo.response.ValidatePhoneResponse; import com.cyl.h5.pojo.response.H5LoginResponse; -import com.cyl.ums.domain.Member; -import com.cyl.ums.mapper.MemberMapper; -import com.cyl.ums.pojo.vo.MemberVO; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.mapper.MemberMapper; +import com.cyl.manager.ums.pojo.vo.MemberVO; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.model.LoginMember; import com.ruoyi.common.core.redis.RedisCache; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java index 34759de..0dde72a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.AftersaleConvert; -import com.cyl.oms.domain.Aftersale; -import com.cyl.oms.pojo.query.AftersaleQuery; -import com.cyl.oms.service.AftersaleService; -import com.cyl.oms.pojo.vo.AftersaleVO; +import com.cyl.manager.oms.convert.AftersaleConvert; +import com.cyl.manager.oms.domain.Aftersale; +import com.cyl.manager.oms.pojo.query.AftersaleQuery; +import com.cyl.manager.oms.service.AftersaleService; +import com.cyl.manager.oms.pojo.vo.AftersaleVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单售后Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleItemController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleItemController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java index f5046ba..8dcd656 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/AftersaleItemController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/AftersaleItemController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.AftersaleItemConvert; -import com.cyl.oms.domain.AftersaleItem; -import com.cyl.oms.pojo.query.AftersaleItemQuery; -import com.cyl.oms.service.AftersaleItemService; -import com.cyl.oms.pojo.vo.AftersaleItemVO; +import com.cyl.manager.oms.convert.AftersaleItemConvert; +import com.cyl.manager.oms.domain.AftersaleItem; +import com.cyl.manager.oms.pojo.query.AftersaleItemQuery; +import com.cyl.manager.oms.service.AftersaleItemService; +import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单售后Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java index 8d534e2..31c52d4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.OrderConvert; -import com.cyl.oms.domain.Order; -import com.cyl.oms.pojo.query.OrderQuery; -import com.cyl.oms.service.OrderService; -import com.cyl.oms.pojo.vo.OrderVO; +import com.cyl.manager.oms.convert.OrderConvert; +import com.cyl.manager.oms.domain.Order; +import com.cyl.manager.oms.pojo.query.OrderQuery; +import com.cyl.manager.oms.service.OrderService; +import com.cyl.manager.oms.pojo.vo.OrderVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单表Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderDeliveryHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderDeliveryHistoryController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java index dd6cec9..312d08d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderDeliveryHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderDeliveryHistoryController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.OrderDeliveryHistoryConvert; -import com.cyl.oms.domain.OrderDeliveryHistory; -import com.cyl.oms.pojo.query.OrderDeliveryHistoryQuery; -import com.cyl.oms.service.OrderDeliveryHistoryService; -import com.cyl.oms.pojo.vo.OrderDeliveryHistoryVO; +import com.cyl.manager.oms.convert.OrderDeliveryHistoryConvert; +import com.cyl.manager.oms.domain.OrderDeliveryHistory; +import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery; +import com.cyl.manager.oms.service.OrderDeliveryHistoryService; +import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单发货记录Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderItemController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderItemController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java index 6460591..0943b77 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderItemController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderItemController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.OrderItemConvert; -import com.cyl.oms.domain.OrderItem; -import com.cyl.oms.pojo.query.OrderItemQuery; -import com.cyl.oms.service.OrderItemService; -import com.cyl.oms.pojo.vo.OrderItemVO; +import com.cyl.manager.oms.convert.OrderItemConvert; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.pojo.query.OrderItemQuery; +import com.cyl.manager.oms.service.OrderItemService; +import com.cyl.manager.oms.pojo.vo.OrderItemVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单中所包含的商品Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderOperateHistoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderOperateHistoryController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java index 0dc9af3..1496cd8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/controller/OrderOperateHistoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/controller/OrderOperateHistoryController.java @@ -1,4 +1,4 @@ -package com.cyl.oms.controller; +package com.cyl.manager.oms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.oms.convert.OrderOperateHistoryConvert; -import com.cyl.oms.domain.OrderOperateHistory; -import com.cyl.oms.pojo.query.OrderOperateHistoryQuery; -import com.cyl.oms.service.OrderOperateHistoryService; -import com.cyl.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.convert.OrderOperateHistoryConvert; +import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery; +import com.cyl.manager.oms.service.OrderOperateHistoryService; +import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 订单操作历史记录Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java index 3543329..49646d4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.Aftersale; -import com.cyl.oms.pojo.vo.AftersaleVO; +import com.cyl.manager.oms.domain.Aftersale; +import com.cyl.manager.oms.pojo.vo.AftersaleVO; import java.util.List; /** * 订单售后 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleItemConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java similarity index 65% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleItemConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java index dae2958..b26772b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/AftersaleItemConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/AftersaleItemConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.AftersaleItem; -import com.cyl.oms.pojo.vo.AftersaleItemVO; +import com.cyl.manager.oms.domain.AftersaleItem; +import com.cyl.manager.oms.pojo.vo.AftersaleItemVO; import java.util.List; /** * 订单售后 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java similarity index 69% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java index 1874554..dd1a51f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.Order; -import com.cyl.oms.pojo.vo.OrderVO; +import com.cyl.manager.oms.domain.Order; +import com.cyl.manager.oms.pojo.vo.OrderVO; import java.util.List; /** * 订单表 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderDeliveryHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java similarity index 65% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderDeliveryHistoryConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java index caae4e7..d7aa110 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderDeliveryHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderDeliveryHistoryConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.OrderDeliveryHistory; -import com.cyl.oms.pojo.vo.OrderDeliveryHistoryVO; +import com.cyl.manager.oms.domain.OrderDeliveryHistory; +import com.cyl.manager.oms.pojo.vo.OrderDeliveryHistoryVO; import java.util.List; /** * 订单发货记录 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderItemConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java similarity index 67% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderItemConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java index 2b6c32b..ed05be5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderItemConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderItemConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.OrderItem; -import com.cyl.oms.pojo.vo.OrderItemVO; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.pojo.vo.OrderItemVO; import java.util.List; /** * 订单中所包含的商品 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderOperateHistoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderOperateHistoryConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java index a840561..f1ee3a2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/convert/OrderOperateHistoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/convert/OrderOperateHistoryConvert.java @@ -1,8 +1,8 @@ -package com.cyl.oms.convert; +package com.cyl.manager.oms.convert; import org.mapstruct.Mapper; -import com.cyl.oms.domain.OrderOperateHistory; -import com.cyl.oms.pojo.vo.OrderOperateHistoryVO; +import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO; import java.util.List; /** * 订单操作历史记录 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Aftersale.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/Aftersale.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java index 288ce0b..f506de9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Aftersale.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Aftersale.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/AftersaleItem.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/AftersaleItem.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java index ce971ae..66b7dee 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/AftersaleItem.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/AftersaleItem.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Order.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java similarity index 99% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/Order.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java index 0bc4cc9..c90fd46 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/Order.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/Order.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderDeliveryHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderDeliveryHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java index 386a652..efefcca 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderDeliveryHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderDeliveryHistory.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderItem.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderItem.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java index 5fff192..461f0fa 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderItem.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderItem.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import java.math.BigDecimal; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderOperateHistory.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderOperateHistory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java index e49c1b3..d554bc4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/domain/OrderOperateHistory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OrderOperateHistory.java @@ -1,4 +1,4 @@ -package com.cyl.oms.domain; +package com.cyl.manager.oms.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleItemMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java similarity index 78% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleItemMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java index 36f24d3..b4f850e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleItemMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleItemMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.AftersaleItem; +import com.cyl.manager.oms.domain.AftersaleItem; /** * 订单售后Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java index 4cbc8b4..0c2e9d2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/AftersaleMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/AftersaleMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.Aftersale; +import com.cyl.manager.oms.domain.Aftersale; /** * 订单售后Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderDeliveryHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java similarity index 79% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderDeliveryHistoryMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java index 7a34026..a4003f0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderDeliveryHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderDeliveryHistoryMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.OrderDeliveryHistory; +import com.cyl.manager.oms.domain.OrderDeliveryHistory; /** * 订单发货记录Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderItemMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java similarity index 80% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderItemMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java index 9371f13..f8ee2c4 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderItemMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderItemMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.OrderItem; +import com.cyl.manager.oms.domain.OrderItem; /** * 订单中所包含的商品Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java similarity index 76% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java index 6bdeaf1..80f498d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.Order; +import com.cyl.manager.oms.domain.Order; /** * 订单表Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderOperateHistoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java similarity index 80% rename from ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderOperateHistoryMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java index 3934ac2..e17ece1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/mapper/OrderOperateHistoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderOperateHistoryMapper.java @@ -1,9 +1,8 @@ -package com.cyl.oms.mapper; +package com.cyl.manager.oms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.domain.OrderOperateHistory; /** * 订单操作历史记录Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java new file mode 100644 index 0000000..0d99ae8 --- /dev/null +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java @@ -0,0 +1,4 @@ +package com.cyl.manager.oms.pojo.dto; + +public class SaveOrderItemDTO { +} diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleItemQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleItemQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java index a927705..a1359b9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleItemQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleItemQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java index 1558c17..f9c4183 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/AftersaleQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/AftersaleQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderDeliveryHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderDeliveryHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java index 2317bf1..94ca109 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderDeliveryHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderDeliveryHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderItemQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderItemQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java index e41ebf7..52c5dbe 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderItemQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderItemQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderOperateHistoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderOperateHistoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java index adfeadb..962c342 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderOperateHistoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderOperateHistoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java index 0a51f80..09d9cbb 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/query/OrderQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/query/OrderQuery.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.query; +package com.cyl.manager.oms.pojo.query; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -98,4 +98,9 @@ public class OrderQuery { @ApiModelProperty("确认收货时间 精确匹配") private LocalDateTime receiveTime; + @ApiModelProperty("创建订单开始时间") + private LocalDateTime startTime; + + @ApiModelProperty("创建订单结束时间") + private LocalDateTime endTime; } diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleItemVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleItemVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java index 4cd5c3c..75db0ab 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleItemVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleItemVO.java @@ -1,8 +1,7 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java index 561a4d6..7b0d1d7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/AftersaleVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/AftersaleVO.java @@ -1,4 +1,4 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import java.math.BigDecimal; import java.time.LocalDateTime; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderDeliveryHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderDeliveryHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java index a80edb3..532d94c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderDeliveryHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderDeliveryHistoryVO.java @@ -1,7 +1,6 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderItemVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderItemVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java index e9e527f..543dd9c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderItemVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderItemVO.java @@ -1,8 +1,7 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderOperateHistoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderOperateHistoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java index f5d7693..1eb5d9b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderOperateHistoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderOperateHistoryVO.java @@ -1,7 +1,6 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java index 6bf29cc..3fa4436 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/vo/OrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/OrderVO.java @@ -1,11 +1,10 @@ -package com.cyl.oms.pojo.vo; +package com.cyl.manager.oms.pojo.vo; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; -import com.cyl.oms.domain.OrderItem; -import com.cyl.pay.domain.PayOrder; +import com.cyl.manager.oms.domain.OrderItem; import com.cyl.pay.pojo.vo.PayOrderVO; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleItemService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleItemService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java index 35f1f05..641396f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleItemService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleItemService.java @@ -1,18 +1,16 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; import java.math.BigDecimal; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.AftersaleItemMapper; -import com.cyl.oms.domain.AftersaleItem; -import com.cyl.oms.pojo.query.AftersaleItemQuery; +import com.cyl.manager.oms.mapper.AftersaleItemMapper; +import com.cyl.manager.oms.domain.AftersaleItem; +import com.cyl.manager.oms.pojo.query.AftersaleItemQuery; /** * 订单售后Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java index d65d892..ebd92fd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/AftersaleService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/AftersaleService.java @@ -1,19 +1,18 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.AftersaleMapper; -import com.cyl.oms.domain.Aftersale; -import com.cyl.oms.pojo.query.AftersaleQuery; +import com.cyl.manager.oms.mapper.AftersaleMapper; +import com.cyl.manager.oms.domain.Aftersale; +import com.cyl.manager.oms.pojo.query.AftersaleQuery; /** * 订单售后Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderDeliveryHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/OrderDeliveryHistoryService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java index 741f56a..28ee548 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderDeliveryHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderDeliveryHistoryService.java @@ -1,6 +1,5 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.OrderDeliveryHistoryMapper; -import com.cyl.oms.domain.OrderDeliveryHistory; -import com.cyl.oms.pojo.query.OrderDeliveryHistoryQuery; +import com.cyl.manager.oms.mapper.OrderDeliveryHistoryMapper; +import com.cyl.manager.oms.domain.OrderDeliveryHistory; +import com.cyl.manager.oms.pojo.query.OrderDeliveryHistoryQuery; /** * 订单发货记录Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderItemService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/OrderItemService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java index 122f639..2e3e5f5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderItemService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderItemService.java @@ -1,23 +1,22 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.cyl.h5.pojo.dto.OrderProductListDTO; -import com.cyl.ums.domain.Member; +import com.cyl.manager.ums.domain.Member; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.IDGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.OrderItemMapper; -import com.cyl.oms.domain.OrderItem; -import com.cyl.oms.pojo.query.OrderItemQuery; +import com.cyl.manager.oms.mapper.OrderItemMapper; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.pojo.query.OrderItemQuery; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderOperateHistoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/OrderOperateHistoryService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java index 53af983..575cb14 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderOperateHistoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderOperateHistoryService.java @@ -1,6 +1,5 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.OrderOperateHistoryMapper; -import com.cyl.oms.domain.OrderOperateHistory; -import com.cyl.oms.pojo.query.OrderOperateHistoryQuery; +import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper; +import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.pojo.query.OrderOperateHistoryQuery; /** * 订单操作历史记录Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/oms/service/OrderService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 79d55c4..4102a48 100644 --- a/ruoyi-mall/src/main/java/com/cyl/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -1,15 +1,12 @@ -package com.cyl.oms.service; +package com.cyl.manager.oms.service; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; -import java.time.LocalDateTime; import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.SecureUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -21,47 +18,38 @@ import com.cyl.h5.pojo.vo.OrderCalcVO; import com.cyl.h5.pojo.vo.SkuViewDTO; import com.cyl.h5.pojo.vo.form.OrderSubmitForm; import com.cyl.h5.pojo.vo.query.OrderH5Query; -import com.cyl.oms.convert.OrderConvert; -import com.cyl.oms.domain.OrderItem; -import com.cyl.oms.domain.OrderOperateHistory; -import com.cyl.oms.mapper.OrderItemMapper; -import com.cyl.oms.mapper.OrderOperateHistoryMapper; -import com.cyl.oms.pojo.vo.OrderVO; -import com.cyl.pms.convert.SkuConvert; -import com.cyl.pms.domain.Product; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.mapper.ProductMapper; -import com.cyl.pms.mapper.SkuMapper; -import com.cyl.pms.pojo.vo.SkuVO; -import com.cyl.ums.domain.Member; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.domain.MemberCart; -import com.cyl.ums.mapper.MemberAddressMapper; -import com.cyl.ums.mapper.MemberCartMapper; +import com.cyl.manager.oms.convert.OrderConvert; +import com.cyl.manager.oms.domain.OrderItem; +import com.cyl.manager.oms.domain.OrderOperateHistory; +import com.cyl.manager.oms.mapper.OrderItemMapper; +import com.cyl.manager.oms.mapper.OrderOperateHistoryMapper; +import com.cyl.manager.oms.pojo.vo.OrderVO; +import com.cyl.manager.pms.convert.SkuConvert; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.mapper.ProductMapper; +import com.cyl.manager.pms.mapper.SkuMapper; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.mapper.MemberAddressMapper; +import com.cyl.manager.ums.mapper.MemberCartMapper; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.IDGenerator; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.config.LocalDataUtil; -import com.ruoyi.system.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.oms.mapper.OrderMapper; -import com.cyl.oms.domain.Order; -import com.cyl.oms.pojo.query.OrderQuery; +import com.cyl.manager.oms.mapper.OrderMapper; +import com.cyl.manager.oms.domain.Order; +import com.cyl.manager.oms.pojo.query.OrderQuery; import org.springframework.transaction.annotation.Transactional; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - /** * 订单表Service业务层处理 * @@ -320,7 +308,7 @@ public class OrderService { order.setStatus(Constants.OrderStatus.SEND); order.setAftersaleStatus(1); order.setReceiverName(memberAddress.getName()); - order.setReceiverPhone(memberAddress.getPhone()); +// order.setReceiverPhone(memberAddress.getPhone()); order.setReceiverPostCode(memberAddress.getPostCode()); order.setReceiverProvince(memberAddress.getProvince()); order.setReceiverCity(memberAddress.getCity()); diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java index c36e09b..6a4b07a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/BrandController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/BrandController.java @@ -1,4 +1,4 @@ -package com.cyl.pms.controller; +package com.cyl.manager.pms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.pms.convert.BrandConvert; -import com.cyl.pms.domain.Brand; -import com.cyl.pms.pojo.query.BrandQuery; -import com.cyl.pms.service.BrandService; -import com.cyl.pms.pojo.vo.BrandVO; +import com.cyl.manager.pms.convert.BrandConvert; +import com.cyl.manager.pms.domain.Brand; +import com.cyl.manager.pms.pojo.query.BrandQuery; +import com.cyl.manager.pms.service.BrandService; +import com.cyl.manager.pms.pojo.vo.BrandVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 品牌管理Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java similarity index 86% rename from ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java index 47272bf..1459644 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductCategoryController.java @@ -1,12 +1,9 @@ -package com.cyl.pms.controller; +package com.cyl.manager.pms.controller; import java.util.List; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -21,12 +18,12 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.pms.convert.ProductCategoryConvert; -import com.cyl.pms.domain.ProductCategory; -import com.cyl.pms.pojo.query.ProductCategoryQuery; -import com.cyl.pms.service.ProductCategoryService; -import com.cyl.pms.pojo.vo.ProductCategoryVO; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.cyl.manager.pms.convert.ProductCategoryConvert; +import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.pojo.query.ProductCategoryQuery; +import com.cyl.manager.pms.service.ProductCategoryService; +import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; + /** * 商品分类Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java index d68d890..2d4230d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/ProductController.java @@ -1,4 +1,4 @@ -package com.cyl.pms.controller; +package com.cyl.manager.pms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.pms.convert.ProductConvert; -import com.cyl.pms.domain.Product; -import com.cyl.pms.pojo.query.ProductQuery; -import com.cyl.pms.service.ProductService; -import com.cyl.pms.pojo.vo.ProductVO; +import com.cyl.manager.pms.convert.ProductConvert; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.service.ProductService; +import com.cyl.manager.pms.pojo.vo.ProductVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 商品信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java index 53b62d4..463223f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/SkuController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/controller/SkuController.java @@ -1,4 +1,4 @@ -package com.cyl.pms.controller; +package com.cyl.manager.pms.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.pms.convert.SkuConvert; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.pojo.query.SkuQuery; -import com.cyl.pms.service.SkuService; -import com.cyl.pms.pojo.vo.SkuVO; +import com.cyl.manager.pms.convert.SkuConvert; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.pojo.query.SkuQuery; +import com.cyl.manager.pms.service.SkuService; +import com.cyl.manager.pms.pojo.vo.SkuVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * sku信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/convert/BrandConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/pms/convert/BrandConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java index 0fe7772..7d31c4c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/convert/BrandConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/BrandConvert.java @@ -1,8 +1,8 @@ -package com.cyl.pms.convert; +package com.cyl.manager.pms.convert; import org.mapstruct.Mapper; -import com.cyl.pms.domain.Brand; -import com.cyl.pms.pojo.vo.BrandVO; +import com.cyl.manager.pms.domain.Brand; +import com.cyl.manager.pms.pojo.vo.BrandVO; import java.util.List; /** * 品牌管理 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductCategoryConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java similarity index 71% rename from ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductCategoryConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java index d92457f..0e04f73 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductCategoryConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductCategoryConvert.java @@ -1,9 +1,9 @@ -package com.cyl.pms.convert; +package com.cyl.manager.pms.convert; import com.cyl.h5.pojo.dto.CategoryDTO; import org.mapstruct.Mapper; -import com.cyl.pms.domain.ProductCategory; -import com.cyl.pms.pojo.vo.ProductCategoryVO; +import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; import java.util.List; /** * 商品分类 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java index 4754f63..0650167 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/convert/ProductConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/ProductConvert.java @@ -1,9 +1,9 @@ -package com.cyl.pms.convert; +package com.cyl.manager.pms.convert; import com.cyl.h5.pojo.dto.ProductDTO; import org.mapstruct.Mapper; -import com.cyl.pms.domain.Product; -import com.cyl.pms.pojo.vo.ProductVO; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.pojo.vo.ProductVO; import java.util.List; /** * 商品信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/convert/SkuConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/pms/convert/SkuConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java index 4b1460f..b2c5104 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/convert/SkuConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/convert/SkuConvert.java @@ -1,8 +1,8 @@ -package com.cyl.pms.convert; +package com.cyl.manager.pms.convert; import org.mapstruct.Mapper; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.pojo.vo.SkuVO; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.pojo.vo.SkuVO; import java.util.List; /** * sku信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java index d359920..ce7a0dd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Brand.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Brand.java @@ -1,4 +1,4 @@ -package com.cyl.pms.domain; +package com.cyl.manager.pms.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java index 82d04b0..d3b8059 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Product.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Product.java @@ -1,4 +1,4 @@ -package com.cyl.pms.domain; +package com.cyl.manager.pms.domain; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java index 067c2da..2efa4f1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/ProductCategory.java @@ -1,4 +1,4 @@ -package com.cyl.pms.domain; +package com.cyl.manager.pms.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java index 81fbc47..0047865 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/Sku.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/domain/Sku.java @@ -1,4 +1,4 @@ -package com.cyl.pms.domain; +package com.cyl.manager.pms.domain; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java index 75abf69..23fa853 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/BrandMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/BrandMapper.java @@ -1,9 +1,8 @@ -package com.cyl.pms.mapper; +package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.pms.domain.Brand; +import com.cyl.manager.pms.domain.Brand; /** * 品牌管理Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java similarity index 78% rename from ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java index 2d95b2f..8a6db5e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductCategoryMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductCategoryMapper.java @@ -1,9 +1,8 @@ -package com.cyl.pms.mapper; +package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.pms.domain.ProductCategory; +import com.cyl.manager.pms.domain.ProductCategory; /** * 商品分类Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java index 751acec..44d9a64 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/ProductMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/ProductMapper.java @@ -1,9 +1,8 @@ -package com.cyl.pms.mapper; +package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.pms.domain.Product; +import com.cyl.manager.pms.domain.Product; /** * 商品信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java similarity index 76% rename from ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java index 691d172..66a5702 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/mapper/SkuMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/mapper/SkuMapper.java @@ -1,9 +1,8 @@ -package com.cyl.pms.mapper; +package com.cyl.manager.pms.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.pms.domain.Sku; +import com.cyl.manager.pms.domain.Sku; /** * sku信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/dto/MemberCartDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java similarity index 62% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/dto/MemberCartDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java index eaf6676..cdc41e6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/dto/MemberCartDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java @@ -1,6 +1,6 @@ -package com.cyl.pms.pojo.dto; +package com.cyl.manager.pms.pojo.dto; -import com.cyl.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.MemberCart; import lombok.Data; import java.math.BigDecimal; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/BrandQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/BrandQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java index 8b4316d..052559e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/BrandQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/BrandQuery.java @@ -1,4 +1,4 @@ -package com.cyl.pms.pojo.query; +package com.cyl.manager.pms.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java index 0aadaf8..df96e2a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductCategoryQuery.java @@ -1,4 +1,4 @@ -package com.cyl.pms.pojo.query; +package com.cyl.manager.pms.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java index cd4d692..f3421cd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/ProductQuery.java @@ -1,8 +1,7 @@ -package com.cyl.pms.pojo.query; +package com.cyl.manager.pms.pojo.query; import java.math.BigDecimal; -import com.ruoyi.common.annotation.Excel; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/SkuQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/SkuQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java index 676e5aa..daa66a7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/SkuQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/query/SkuQuery.java @@ -1,4 +1,4 @@ -package com.cyl.pms.pojo.query; +package com.cyl.manager.pms.pojo.query; import java.math.BigDecimal; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/BrandVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java similarity index 87% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/BrandVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java index f3ac386..8c725be 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/BrandVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/BrandVO.java @@ -1,7 +1,6 @@ -package com.cyl.pms.pojo.vo; +package com.cyl.manager.pms.pojo.vo; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java similarity index 79% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java index b9ab95c..7cabdfa 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductCategoryVO.java @@ -1,8 +1,5 @@ -package com.cyl.pms.pojo.vo; +package com.cyl.manager.pms.pojo.vo; -import com.cyl.pms.domain.ProductCategory; -import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java index 4cc3501..8a75f30 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/ProductVO.java @@ -1,11 +1,10 @@ -package com.cyl.pms.pojo.vo; +package com.cyl.manager.pms.pojo.vo; import java.math.BigDecimal; import java.util.List; -import com.cyl.pms.domain.Sku; +import com.cyl.manager.pms.domain.Sku; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/SkuVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/SkuVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java index 895bf38..30ff119 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/SkuVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/vo/SkuVO.java @@ -1,8 +1,7 @@ -package com.cyl.pms.pojo.vo; +package com.cyl.manager.pms.pojo.vo; import java.math.BigDecimal; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java index 0c5adcb..d60217d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/BrandService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/BrandService.java @@ -1,6 +1,5 @@ -package com.cyl.pms.service; +package com.cyl.manager.pms.service; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.pms.mapper.BrandMapper; -import com.cyl.pms.domain.Brand; -import com.cyl.pms.pojo.query.BrandQuery; +import com.cyl.manager.pms.mapper.BrandMapper; +import com.cyl.manager.pms.domain.Brand; +import com.cyl.manager.pms.pojo.query.BrandQuery; /** * 品牌管理Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java index 5baeab6..6a5d6d9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductCategoryService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductCategoryService.java @@ -1,4 +1,4 @@ -package com.cyl.pms.service; +package com.cyl.manager.pms.service; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cyl.h5.pojo.dto.CategoryDTO; -import com.cyl.pms.convert.ProductCategoryConvert; -import com.cyl.pms.convert.ProductConvert; -import com.cyl.pms.domain.Product; -import com.cyl.pms.domain.ProductCategory; -import com.cyl.pms.mapper.ProductCategoryMapper; -import com.cyl.pms.mapper.ProductMapper; -import com.cyl.pms.pojo.query.ProductCategoryQuery; -import com.cyl.pms.pojo.vo.ProductCategoryVO; +import com.cyl.manager.pms.convert.ProductCategoryConvert; +import com.cyl.manager.pms.convert.ProductConvert; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.domain.ProductCategory; +import com.cyl.manager.pms.mapper.ProductCategoryMapper; +import com.cyl.manager.pms.mapper.ProductMapper; +import com.cyl.manager.pms.pojo.query.ProductCategoryQuery; +import com.cyl.manager.pms.pojo.vo.ProductCategoryVO; import com.github.pagehelper.PageHelper; import com.ruoyi.common.exception.base.BaseException; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java similarity index 88% rename from ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java index e0e4678..b47ba19 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/ProductService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/ProductService.java @@ -1,29 +1,24 @@ -package com.cyl.pms.service; +package com.cyl.manager.pms.service; -import java.math.BigDecimal; import java.util.*; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.cyl.h5.pojo.vo.ProductDetail; -import com.cyl.pms.convert.ProductConvert; -import com.cyl.pms.domain.Brand; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.mapper.BrandMapper; -import com.cyl.pms.mapper.SkuMapper; -import com.cyl.pms.pojo.vo.ProductVO; +import com.cyl.manager.pms.convert.ProductConvert; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.mapper.BrandMapper; +import com.cyl.manager.pms.mapper.SkuMapper; +import com.cyl.manager.pms.pojo.vo.ProductVO; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; -import org.springframework.security.core.parameters.P; import org.springframework.stereotype.Service; -import com.cyl.pms.mapper.ProductMapper; -import com.cyl.pms.domain.Product; -import com.cyl.pms.pojo.query.ProductQuery; +import com.cyl.manager.pms.mapper.ProductMapper; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.pojo.query.ProductQuery; import org.springframework.transaction.annotation.Transactional; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java index 3bf8b9e..8a38e9f 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/service/SkuService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/pms/service/SkuService.java @@ -1,7 +1,6 @@ -package com.cyl.pms.service; +package com.cyl.manager.pms.service; import java.math.BigDecimal; -import java.util.Arrays; import java.util.List; import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.pms.mapper.SkuMapper; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.pojo.query.SkuQuery; +import com.cyl.manager.pms.mapper.SkuMapper; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.pojo.query.SkuQuery; /** * sku信息Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java index 66d706b..fc40518 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberAddressController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberAddressController.java @@ -1,4 +1,4 @@ -package com.cyl.ums.controller; +package com.cyl.manager.ums.controller; import java.util.List; @@ -21,12 +21,12 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.ums.convert.MemberAddressConvert; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.pojo.query.MemberAddressQuery; -import com.cyl.ums.service.MemberAddressService; -import com.cyl.ums.pojo.vo.MemberAddressVO; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.cyl.manager.ums.convert.MemberAddressConvert; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.pojo.query.MemberAddressQuery; +import com.cyl.manager.ums.service.MemberAddressService; +import com.cyl.manager.ums.pojo.vo.MemberAddressVO; + /** * 会员收货地址Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberCartController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java similarity index 90% rename from ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberCartController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java index ce45d72..23ed06c 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberCartController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberCartController.java @@ -1,10 +1,7 @@ -package com.cyl.ums.controller; - -import java.util.List; +package com.cyl.manager.ums.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; @@ -21,12 +18,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.ums.convert.MemberCartConvert; -import com.cyl.ums.domain.MemberCart; -import com.cyl.ums.pojo.query.MemberCartQuery; -import com.cyl.ums.service.MemberCartService; -import com.cyl.ums.pojo.vo.MemberCartVO; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.cyl.manager.ums.convert.MemberCartConvert; +import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.pojo.query.MemberCartQuery; +import com.cyl.manager.ums.service.MemberCartService; + /** * 购物车Controller * diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java index 877f5b8..fc86a75 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java @@ -1,8 +1,8 @@ -package com.cyl.ums.controller; +package com.cyl.manager.ums.controller; import java.util.List; -import com.cyl.ums.pojo.dto.ChangeMemberStatusDTO; +import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.PageImpl; @@ -22,11 +22,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.ums.convert.MemberConvert; -import com.cyl.ums.domain.Member; -import com.cyl.ums.pojo.query.MemberQuery; -import com.cyl.ums.service.MemberService; -import com.cyl.ums.pojo.vo.MemberVO; +import com.cyl.manager.ums.convert.MemberConvert; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.pojo.query.MemberQuery; +import com.cyl.manager.ums.service.MemberService; +import com.cyl.manager.ums.pojo.vo.MemberVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 会员信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java index 90a2c79..5df331a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/controller/MemberWechatController.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberWechatController.java @@ -1,4 +1,4 @@ -package com.cyl.ums.controller; +package com.cyl.manager.ums.controller; import java.util.List; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.enums.BusinessType; -import com.cyl.ums.convert.MemberWechatConvert; -import com.cyl.ums.domain.MemberWechat; -import com.cyl.ums.pojo.query.MemberWechatQuery; -import com.cyl.ums.service.MemberWechatService; -import com.cyl.ums.pojo.vo.MemberWechatVO; +import com.cyl.manager.ums.convert.MemberWechatConvert; +import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.manager.ums.pojo.query.MemberWechatQuery; +import com.cyl.manager.ums.service.MemberWechatService; +import com.cyl.manager.ums.pojo.vo.MemberWechatVO; import com.ruoyi.common.utils.poi.ExcelUtil; /** * 用户微信信息Controller diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberAddressConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberAddressConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java index aa147ee..344215a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberAddressConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberAddressConvert.java @@ -1,8 +1,8 @@ -package com.cyl.ums.convert; +package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import java.util.List; /** * 会员收货地址 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberCartConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java similarity index 72% rename from ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberCartConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java index f03b092..cbfc0ae 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberCartConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java @@ -1,12 +1,12 @@ -package com.cyl.ums.convert; +package com.cyl.manager.ums.convert; -import com.cyl.pms.domain.Product; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.pojo.dto.MemberCartDTO; +import com.cyl.manager.pms.domain.Product; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.pojo.dto.MemberCartDTO; import org.mapstruct.BeanMapping; import org.mapstruct.Mapper; -import com.cyl.ums.domain.MemberCart; -import com.cyl.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.pojo.vo.MemberCartVO; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java similarity index 66% rename from ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java index 89ceaee..9a89d4e 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberConvert.java @@ -1,8 +1,8 @@ -package com.cyl.ums.convert; +package com.cyl.manager.ums.convert; import org.mapstruct.Mapper; -import com.cyl.ums.domain.Member; -import com.cyl.ums.pojo.vo.MemberVO; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.pojo.vo.MemberVO; import java.util.List; /** * 会员信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberWechatConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java similarity index 70% rename from ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberWechatConvert.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java index a33ccfd..a1db14b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/convert/MemberWechatConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberWechatConvert.java @@ -1,10 +1,9 @@ -package com.cyl.ums.convert; +package com.cyl.manager.ums.convert; import com.cyl.external.resp.AccessTokenResp; -import com.cyl.external.resp.UserInfoResp; import org.mapstruct.Mapper; -import com.cyl.ums.domain.MemberWechat; -import com.cyl.ums.pojo.vo.MemberWechatVO; +import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.manager.ums.pojo.vo.MemberWechatVO; import java.util.List; /** * 用户微信信息 DO <=> DTO <=> VO / BO / Query diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Address.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/ums/domain/Address.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java index 3d8f74f..3e955b3 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Address.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Address.java @@ -1,4 +1,4 @@ -package com.cyl.ums.domain; +package com.cyl.manager.ums.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java index 03059e9..ca16e17 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/Member.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java @@ -1,4 +1,4 @@ -package com.cyl.ums.domain; +package com.cyl.manager.ums.domain; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java index d0496ba..4537d02 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberAddress.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberAddress.java @@ -1,4 +1,4 @@ -package com.cyl.ums.domain; +package com.cyl.manager.ums.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java index 3c2d73d..a8a53cd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberCart.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberCart.java @@ -1,4 +1,4 @@ -package com.cyl.ums.domain; +package com.cyl.manager.ums.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java index 106995f..7a0cea9 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/domain/MemberWechat.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/MemberWechat.java @@ -1,4 +1,4 @@ -package com.cyl.ums.domain; +package com.cyl.manager.ums.domain; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/AddressMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java similarity index 84% rename from ruoyi-mall/src/main/java/com/cyl/ums/mapper/AddressMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java index d187b6e..6c8de80 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/AddressMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/AddressMapper.java @@ -1,7 +1,7 @@ -package com.cyl.ums.mapper; +package com.cyl.manager.ums.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cyl.ums.domain.Address; +import com.cyl.manager.ums.domain.Address; import java.util.List; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java similarity index 82% rename from ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java index 2762e78..ee7b859 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberAddressMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberAddressMapper.java @@ -1,9 +1,8 @@ -package com.cyl.ums.mapper; +package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.ums.domain.MemberAddress; +import com.cyl.manager.ums.domain.MemberAddress; /** * 会员收货地址Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberCartMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberCartMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java index 8a0ffa6..5dcec8d 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberCartMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberCartMapper.java @@ -1,9 +1,8 @@ -package com.cyl.ums.mapper; +package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.ums.domain.MemberCart; +import com.cyl.manager.ums.domain.MemberCart; /** * 购物车Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java index c238f5c..97abb8b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberMapper.java @@ -1,9 +1,8 @@ -package com.cyl.ums.mapper; +package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.ums.domain.Member; +import com.cyl.manager.ums.domain.Member; /** * 会员信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java similarity index 79% rename from ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java index 6bd2873..4de45c6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/mapper/MemberWechatMapper.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/mapper/MemberWechatMapper.java @@ -1,9 +1,8 @@ -package com.cyl.ums.mapper; +package com.cyl.manager.ums.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import com.cyl.ums.domain.MemberWechat; +import com.cyl.manager.ums.domain.MemberWechat; /** * 用户微信信息Mapper接口 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/AddressDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java similarity index 88% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/AddressDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java index 8a7e121..97a62dc 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/AddressDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/AddressDTO.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.dto; +package com.cyl.manager.ums.pojo.dto; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java similarity index 76% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java index b454385..2fdd1e1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/ChangeMemberStatusDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/ChangeMemberStatusDTO.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.dto; +package com.cyl.manager.ums.pojo.dto; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/MemberAddressDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java similarity index 90% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/MemberAddressDTO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java index 68bbb60..484dc81 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/dto/MemberAddressDTO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/dto/MemberAddressDTO.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.dto; +package com.cyl.manager.ums.pojo.dto; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java index f6dece8..50ea9f0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberAddressQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberAddressQuery.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.query; +package com.cyl.manager.ums.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java similarity index 95% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java index 85bae6d..f1635a0 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberCartQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberCartQuery.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.query; +package com.cyl.manager.ums.pojo.query; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java index 9208f8e..20943af 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.query; +package com.cyl.manager.ums.pojo.query; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberWechatQuery.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java similarity index 97% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberWechatQuery.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java index 5f2a356..66d1c51 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/query/MemberWechatQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberWechatQuery.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.query; +package com.cyl.manager.ums.pojo.query; import java.time.LocalDateTime; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java similarity index 93% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java index 43f0e0e..9fd10f7 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberAddressVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberAddressVO.java @@ -1,7 +1,6 @@ -package com.cyl.ums.pojo.vo; +package com.cyl.manager.ums.pojo.vo; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; /** diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java index 483bf9e..fa72123 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberCartVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberCartVO.java @@ -1,7 +1,6 @@ -package com.cyl.ums.pojo.vo; +package com.cyl.manager.ums.pojo.vo; import com.ruoyi.common.annotation.Excel; -import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java similarity index 96% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java index 10ab9ef..14e132b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberVO.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.vo; +package com.cyl.manager.ums.pojo.vo; import java.math.BigDecimal; import java.time.LocalDate; @@ -6,7 +6,6 @@ import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseAudit; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * 会员信息 数据视图对象 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java similarity index 98% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java index 60b5a11..1309efd 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/MemberWechatVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberWechatVO.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.vo; +package com.cyl.manager.ums.pojo.vo; import java.time.LocalDateTime; import com.ruoyi.common.annotation.Excel; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/AddMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java similarity index 77% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/AddMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java index 55f545d..bc89550 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/AddMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/AddMemberCartForm.java @@ -1,9 +1,7 @@ -package com.cyl.ums.pojo.vo.form; +package com.cyl.manager.ums.pojo.vo.form; import lombok.Data; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @Data diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/UpdateMemberCartForm.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java similarity index 91% rename from ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/UpdateMemberCartForm.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java index 760ee38..52c3d2a 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/pojo/vo/form/UpdateMemberCartForm.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/form/UpdateMemberCartForm.java @@ -1,4 +1,4 @@ -package com.cyl.ums.pojo.vo.form; +package com.cyl.manager.ums.pojo.vo.form; import lombok.Data; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java index c8d02b6..97b45be 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberAddressService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberAddressService.java @@ -1,12 +1,11 @@ -package com.cyl.ums.service; +package com.cyl.manager.ums.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.cyl.ums.convert.MemberAddressConvert; -import com.cyl.ums.domain.MemberAddress; -import com.cyl.ums.mapper.MemberAddressMapper; -import com.cyl.ums.pojo.query.MemberAddressQuery; -import com.cyl.ums.pojo.vo.MemberAddressVO; +import com.cyl.manager.ums.convert.MemberAddressConvert; +import com.cyl.manager.ums.domain.MemberAddress; +import com.cyl.manager.ums.mapper.MemberAddressMapper; +import com.cyl.manager.ums.pojo.query.MemberAddressQuery; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.SecurityUtils; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java similarity index 92% rename from ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java index 419d3c8..29eeec5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java @@ -1,30 +1,27 @@ -package com.cyl.ums.service; +package com.cyl.manager.ums.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.cyl.h5.config.SecurityUtil; -import com.cyl.pms.domain.Product; -import com.cyl.pms.domain.Sku; -import com.cyl.pms.mapper.ProductMapper; -import com.cyl.pms.mapper.SkuMapper; -import com.cyl.pms.pojo.dto.MemberCartDTO; -import com.cyl.ums.convert.MemberCartConvert; -import com.cyl.ums.domain.Member; -import com.cyl.ums.domain.MemberCart; -import com.cyl.ums.mapper.MemberCartMapper; -import com.cyl.ums.pojo.query.MemberCartQuery; -import com.cyl.ums.pojo.vo.MemberCartVO; -import com.cyl.ums.pojo.vo.form.AddMemberCartForm; -import com.cyl.ums.pojo.vo.form.UpdateMemberCartForm; +import com.cyl.manager.pms.domain.Sku; +import com.cyl.manager.pms.mapper.ProductMapper; +import com.cyl.manager.pms.mapper.SkuMapper; +import com.cyl.manager.pms.pojo.dto.MemberCartDTO; +import com.cyl.manager.ums.convert.MemberCartConvert; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.domain.MemberCart; +import com.cyl.manager.ums.mapper.MemberCartMapper; +import com.cyl.manager.ums.pojo.query.MemberCartQuery; +import com.cyl.manager.ums.pojo.vo.MemberCartVO; +import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SortUtil; import com.ruoyi.framework.config.LocalDataUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java similarity index 89% rename from ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java index f56b4c8..dd262f2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberService.java @@ -1,15 +1,11 @@ -package com.cyl.ums.service; +package com.cyl.manager.ums.service; -import java.math.BigDecimal; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Arrays; import java.util.List; -import java.time.LocalDate; -import java.time.LocalDateTime; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.cyl.ums.pojo.dto.ChangeMemberStatusDTO; +import com.cyl.manager.ums.pojo.dto.ChangeMemberStatusDTO; import com.github.pagehelper.PageHelper; import com.ruoyi.common.utils.AesCryptoUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -17,9 +13,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.ums.mapper.MemberMapper; -import com.cyl.ums.domain.Member; -import com.cyl.ums.pojo.query.MemberQuery; +import com.cyl.manager.ums.mapper.MemberMapper; +import com.cyl.manager.ums.domain.Member; +import com.cyl.manager.ums.pojo.query.MemberQuery; /** * 会员信息Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java rename to ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java index b51a33b..4f1c1b2 100644 --- a/ruoyi-mall/src/main/java/com/cyl/ums/service/MemberWechatService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberWechatService.java @@ -1,13 +1,9 @@ -package com.cyl.ums.service; +package com.cyl.manager.ums.service; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; -import java.util.Arrays; import java.util.List; -import java.time.LocalDateTime; -import java.util.concurrent.TimeUnit; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -16,23 +12,21 @@ import com.cyl.external.WechatUtil; import com.cyl.external.resp.AccessTokenResp; import com.cyl.external.resp.UserInfoResp; import com.cyl.h5.pojo.vo.form.WechatLoginForm; -import com.cyl.ums.convert.MemberWechatConvert; +import com.cyl.manager.ums.convert.MemberWechatConvert; import com.github.pagehelper.PageHelper; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.ExtraUserBody; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysUserService; -import lombok.extern.java.Log; -import lombok.extern.log4j.Log4j; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.cyl.ums.mapper.MemberWechatMapper; -import com.cyl.ums.domain.MemberWechat; -import com.cyl.ums.pojo.query.MemberWechatQuery; +import com.cyl.manager.ums.mapper.MemberWechatMapper; +import com.cyl.manager.ums.domain.MemberWechat; +import com.cyl.manager.ums.pojo.query.MemberWechatQuery; /** * 用户微信信息Service业务层处理 diff --git a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/dto/SaveOrderItemDTO.java b/ruoyi-mall/src/main/java/com/cyl/oms/pojo/dto/SaveOrderItemDTO.java deleted file mode 100644 index a6b25d9..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/oms/pojo/dto/SaveOrderItemDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.cyl.oms.pojo.dto; - -public class SaveOrderItemDTO { -} diff --git a/ruoyi-mall/src/main/java/com/cyl/pay/domain/PayOrder.java b/ruoyi-mall/src/main/java/com/cyl/pay/domain/PayOrder.java deleted file mode 100644 index 5b384b8..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/pay/domain/PayOrder.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.cyl.pay.domain; - -public class PayOrder { -} diff --git a/ruoyi-mall/src/main/java/com/cyl/pay/pojo/vo/PayOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/pay/pojo/vo/PayOrderVO.java deleted file mode 100644 index 0a51c00..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/pay/pojo/vo/PayOrderVO.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.cyl.pay.pojo.vo; - -public class PayOrderVO { -} diff --git a/ruoyi-mall/src/main/java/com/cyl/sms/SmsController.java b/ruoyi-mall/src/main/java/com/cyl/sms/controller/SmsController.java similarity index 94% rename from ruoyi-mall/src/main/java/com/cyl/sms/SmsController.java rename to ruoyi-mall/src/main/java/com/cyl/sms/controller/SmsController.java index 1e32169..ffc2870 100644 --- a/ruoyi-mall/src/main/java/com/cyl/sms/SmsController.java +++ b/ruoyi-mall/src/main/java/com/cyl/sms/controller/SmsController.java @@ -1,4 +1,4 @@ -package com.cyl.sms; +package com.cyl.sms.controller; import com.cyl.sms.service.SmsService; import com.ruoyi.common.core.domain.model.SmsResult; diff --git a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleItemMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleItemMapper.xml index 1d1033b..4bc38f4 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleItemMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml index e00b5a8..0ae4417 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/AftersaleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderDeliveryHistoryMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderDeliveryHistoryMapper.xml index ea23795..e1d2b61 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderDeliveryHistoryMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderDeliveryHistoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderItemMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderItemMapper.xml index f6aa70e..1b647a7 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderItemMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml index e9c9413..d63d996 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderOperateHistoryMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderOperateHistoryMapper.xml index 554d54d..71c87ea 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderOperateHistoryMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderOperateHistoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml index a2d796d..aff89d0 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/BrandMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml index c68f07c..c5cb90b 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/ProductCategoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml index 48ecab9..1dfdbbe 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/ProductMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml b/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml index 8196986..ca6dc10 100644 --- a/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/pms/SkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/ums/AddressMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/AddressMapper.xml index 9d5a70c..e19506e 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/AddressMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/AddressMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml index b71180c..e53837c 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberAddressMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml index f55d92a..bffe889 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberCartMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml index 5e39d49..d0ce8e1 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml b/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml index 5be3ed7..61d29f6 100644 --- a/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/ums/MemberWechatMapper.xml @@ -2,7 +2,7 @@ - +